m_item.update();
setGridPower( m_id );
}
-typedef MemberCaller<GridMenuItem, &GridMenuItem::set> SetCaller;
-void active( const BoolImportCallback& importCallback ){
+typedef MemberCaller<GridMenuItem, void(), &GridMenuItem::set> SetCaller;
+void active( const Callback<void(bool)> &importCallback ){
importCallback( g_grid_power == m_id );
}
-typedef MemberCaller1<GridMenuItem, const BoolImportCallback&, &GridMenuItem::active> ExportCaller;
+typedef MemberCaller<GridMenuItem, void(const Callback<void(bool)>&), &GridMenuItem::active> ExportCaller;
};
GridMenuItem g_gridMenu0125( GRIDPOWER_0125 );
}
void Grid_registerCommands(){
- GlobalCommands_insert( "GridDown", FreeCaller<GridPrev>(), Accelerator( '[' ) );
- GlobalCommands_insert( "GridUp", FreeCaller<GridNext>(), Accelerator( ']' ) );
+ GlobalCommands_insert( "GridDown", makeCallbackF(GridPrev), Accelerator( '[' ) );
+ GlobalCommands_insert( "GridUp", makeCallbackF(GridNext), Accelerator( ']' ) );
- GlobalCommands_insert( "ToggleGridSnap", FreeCaller<ToggleGridSnap>() );
+ GlobalCommands_insert( "ToggleGridSnap", makeCallbackF(ToggleGridSnap) );
GlobalToggles_insert( "SetGrid0.125", GridMenuItem::SetCaller( g_gridMenu0125 ), ToggleItem::AddCallbackCaller( g_gridMenu0125.m_item ) );
GlobalToggles_insert( "SetGrid0.25", GridMenuItem::SetCaller( g_gridMenu025 ), ToggleItem::AddCallbackCaller( g_gridMenu025.m_item ) );
}
-void Grid_constructMenu( GtkMenu* menu ){
+void Grid_constructMenu( ui::Menu menu ){
create_check_menu_item_with_mnemonic( menu, "Grid0.125", "SetGrid0.125" );
create_check_menu_item_with_mnemonic( menu, "Grid0.25", "SetGrid0.25" );
create_check_menu_item_with_mnemonic( menu, "Grid0.5", "SetGrid0.5" );
Grid_constructPreferences( page );
}
void Grid_registerPreferencesPage(){
- PreferencesDialog_addSettingsPage( FreeCaller1<PreferenceGroup&, Grid_constructPage>() );
+ PreferencesDialog_addSettingsPage( makeCallbackF(Grid_constructPage) );
}
void Grid_construct(){
g_grid_default = GridDefault_forGridPower( GRIDPOWER_8 );
- GlobalPreferenceSystem().registerPreference( "GridDefault", IntImportStringCaller( g_grid_default ), IntExportStringCaller( g_grid_default ) );
+ GlobalPreferenceSystem().registerPreference( "GridDefault", make_property_string( g_grid_default ) );
g_grid_power = GridPower_forGridDefault( g_grid_default );
g_gridsize = GridSize_forGridPower( g_grid_power );