From 93a3d833ff57ef8304cb547dd1e3664b6b276ec4 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Tue, 26 May 2020 01:55:24 +0200 Subject: [PATCH] fix merge --- radiant/mainframe.cpp | 3 --- radiant/select.cpp | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 4dd87b71..cf0525aa 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -3582,9 +3582,6 @@ void MainFrame_Construct(){ GlobalCommands_insert( "ArbitraryRotation", makeCallbackF(DoRotateDlg), Accelerator( 'R', (GdkModifierType)GDK_SHIFT_MASK ) ); GlobalCommands_insert( "ArbitraryScale", makeCallbackF(DoScaleDlg), Accelerator( 'S', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) ); - GlobalCommands_insert( "ArbitraryRotation", makeCallbackF(DoRotateDlg) ); - GlobalCommands_insert( "ArbitraryScale", makeCallbackF(DoScaleDlg) ); - GlobalCommands_insert( "BuildMenuCustomize", makeCallbackF(DoBuildMenu) ); GlobalCommands_insert( "Build_runRecentExecutedBuild", makeCallbackF(Build_runRecentExecutedBuild), Accelerator( GDK_F5 ) ); diff --git a/radiant/select.cpp b/radiant/select.cpp index 1c97e9ee..1e4a4170 100644 --- a/radiant/select.cpp +++ b/radiant/select.cpp @@ -878,21 +878,21 @@ void Selection_RotateAnticlockwise(){ void Select_registerCommands(){ - GlobalCommands_insert( "ShowHidden", FreeCaller(), Accelerator( 'H', (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalToggles_insert( "HideSelected", FreeCaller(), ToggleItem::AddCallbackCaller( g_hidden_item ), Accelerator( 'H' ) ); + GlobalCommands_insert( "ShowHidden", makeCallbackF( Select_ShowAllHidden ), Accelerator( 'H', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalToggles_insert( "HideSelected", makeCallbackF( HideSelected ), ToggleItem::AddCallbackCaller( g_hidden_item ), Accelerator( 'H' ) ); - GlobalCommands_insert( "MirrorSelectionX", FreeCaller() ); - GlobalCommands_insert( "RotateSelectionX", FreeCaller() ); - GlobalCommands_insert( "MirrorSelectionY", FreeCaller() ); - GlobalCommands_insert( "RotateSelectionY", FreeCaller() ); - GlobalCommands_insert( "MirrorSelectionZ", FreeCaller() ); - GlobalCommands_insert( "RotateSelectionZ", FreeCaller() ); + GlobalCommands_insert( "MirrorSelectionX", makeCallbackF( Selection_Flipx ) ); + GlobalCommands_insert( "RotateSelectionX", makeCallbackF( Selection_Rotatex ) ); + GlobalCommands_insert( "MirrorSelectionY", makeCallbackF( Selection_Flipy ) ); + GlobalCommands_insert( "RotateSelectionY", makeCallbackF( Selection_Rotatey ) ); + GlobalCommands_insert( "MirrorSelectionZ", makeCallbackF( Selection_Flipz ) ); + GlobalCommands_insert( "RotateSelectionZ", makeCallbackF( Selection_Rotatez ) ); - GlobalCommands_insert( "MirrorSelectionHorizontally", FreeCaller() ); - GlobalCommands_insert( "MirrorSelectionVertically", FreeCaller() ); + GlobalCommands_insert( "MirrorSelectionHorizontally", makeCallbackF( Selection_FlipHorizontally ) ); + GlobalCommands_insert( "MirrorSelectionVertically", makeCallbackF( Selection_FlipVertically ) ); - GlobalCommands_insert( "RotateSelectionClockwise", FreeCaller() ); - GlobalCommands_insert( "RotateSelectionAnticlockwise", FreeCaller() ); + GlobalCommands_insert( "RotateSelectionClockwise", makeCallbackF( Selection_RotateClockwise ) ); + GlobalCommands_insert( "RotateSelectionAnticlockwise", makeCallbackF( Selection_RotateAnticlockwise ) ); } -- 2.39.2