- GlobalToggles_insert("TogTexLock", FreeCaller<Texdef_ToggleMoveLock>(), ToggleItem::AddCallbackCaller(g_texdef_movelock_item), Accelerator('T', (GdkModifierType)GDK_SHIFT_MASK));
-
- GlobalCommands_insert("BrushPrism", BrushPrefab::SetCaller(g_brushprism));
- GlobalCommands_insert("BrushCone", BrushPrefab::SetCaller(g_brushcone));
- GlobalCommands_insert("BrushSphere", BrushPrefab::SetCaller(g_brushsphere));
-
- GlobalCommands_insert("Brush3Sided", BrushMakeSided::SetCaller(g_brushmakesided3), Accelerator('3', (GdkModifierType)GDK_CONTROL_MASK));
- GlobalCommands_insert("Brush4Sided", BrushMakeSided::SetCaller(g_brushmakesided4), Accelerator('4', (GdkModifierType)GDK_CONTROL_MASK));
- GlobalCommands_insert("Brush5Sided", BrushMakeSided::SetCaller(g_brushmakesided5), Accelerator('5', (GdkModifierType)GDK_CONTROL_MASK));
- GlobalCommands_insert("Brush6Sided", BrushMakeSided::SetCaller(g_brushmakesided6), Accelerator('6', (GdkModifierType)GDK_CONTROL_MASK));
- GlobalCommands_insert("Brush7Sided", BrushMakeSided::SetCaller(g_brushmakesided7), Accelerator('7', (GdkModifierType)GDK_CONTROL_MASK));
- GlobalCommands_insert("Brush8Sided", BrushMakeSided::SetCaller(g_brushmakesided8), Accelerator('8', (GdkModifierType)GDK_CONTROL_MASK));
- GlobalCommands_insert("Brush9Sided", BrushMakeSided::SetCaller(g_brushmakesided9), Accelerator('9', (GdkModifierType)GDK_CONTROL_MASK));
-
- GlobalCommands_insert("ClipSelected", FreeCaller<ClipSelected>(), Accelerator(GDK_Return));
- GlobalCommands_insert("SplitSelected", FreeCaller<SplitSelected>(), Accelerator(GDK_Return, (GdkModifierType)GDK_SHIFT_MASK));
- GlobalCommands_insert("FlipClip", FreeCaller<FlipClipper>(), Accelerator(GDK_Return, (GdkModifierType)GDK_CONTROL_MASK));
-
- GlobalCommands_insert("MakeDetail", FreeCaller<Select_MakeDetail>(), Accelerator('M', (GdkModifierType)GDK_CONTROL_MASK));
- GlobalCommands_insert("MakeStructural", FreeCaller<Select_MakeStructural>(), Accelerator('S', (GdkModifierType)(GDK_SHIFT_MASK|GDK_CONTROL_MASK)));
+ GlobalToggles_insert("TogTexLock", makeCallbackF(Texdef_ToggleMoveLock),
+ ToggleItem::AddCallbackCaller(g_texdef_movelock_item),
+ Accelerator('T', (GdkModifierType) GDK_SHIFT_MASK));
+
+ GlobalCommands_insert("BrushPrism", BrushPrefab::SetCaller(g_brushprism));
+ GlobalCommands_insert("BrushCone", BrushPrefab::SetCaller(g_brushcone));
+ GlobalCommands_insert("BrushSphere", BrushPrefab::SetCaller(g_brushsphere));
+ GlobalCommands_insert("BrushRock", BrushPrefab::SetCaller(g_brushrock));
+
+ GlobalCommands_insert("Brush3Sided", BrushMakeSided::SetCaller(g_brushmakesided3),
+ Accelerator('3', (GdkModifierType) GDK_CONTROL_MASK));
+ GlobalCommands_insert("Brush4Sided", BrushMakeSided::SetCaller(g_brushmakesided4),
+ Accelerator('4', (GdkModifierType) GDK_CONTROL_MASK));
+ GlobalCommands_insert("Brush5Sided", BrushMakeSided::SetCaller(g_brushmakesided5),
+ Accelerator('5', (GdkModifierType) GDK_CONTROL_MASK));
+ GlobalCommands_insert("Brush6Sided", BrushMakeSided::SetCaller(g_brushmakesided6),
+ Accelerator('6', (GdkModifierType) GDK_CONTROL_MASK));
+ GlobalCommands_insert("Brush7Sided", BrushMakeSided::SetCaller(g_brushmakesided7),
+ Accelerator('7', (GdkModifierType) GDK_CONTROL_MASK));
+ GlobalCommands_insert("Brush8Sided", BrushMakeSided::SetCaller(g_brushmakesided8),
+ Accelerator('8', (GdkModifierType) GDK_CONTROL_MASK));
+ GlobalCommands_insert("Brush9Sided", BrushMakeSided::SetCaller(g_brushmakesided9),
+ Accelerator('9', (GdkModifierType) GDK_CONTROL_MASK));
+
+ GlobalCommands_insert("ClipSelected", makeCallbackF(ClipSelected), Accelerator(GDK_KEY_Return));
+ GlobalCommands_insert("SplitSelected", makeCallbackF(SplitSelected),
+ Accelerator(GDK_KEY_Return, (GdkModifierType) GDK_SHIFT_MASK));
+ GlobalCommands_insert("FlipClip", makeCallbackF(FlipClipper),
+ Accelerator(GDK_KEY_Return, (GdkModifierType) GDK_CONTROL_MASK));
+
+ GlobalCommands_insert("MakeDetail", makeCallbackF(Select_MakeDetail),
+ Accelerator('M', (GdkModifierType) GDK_CONTROL_MASK));
+ GlobalCommands_insert("MakeStructural", makeCallbackF(Select_MakeStructural),
+ Accelerator('S', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK)));