X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fmap.cpp;h=5523f431c60a114de44e52e5e372a9fb8fe04d04;hb=18d60f90d7603cb420150739251cf98519c57406;hp=33dcebe9a51a79301430ad559015486f421fe331;hpb=0110e3a8f3ab54c17a1785e17c7246adf8e13a46;p=xonotic%2Fnetradiant.git

diff --git a/radiant/map.cpp b/radiant/map.cpp
index 33dcebe9..5523f431 100644
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -124,7 +124,7 @@ void nameChanged( const char* name ){
 	m_name = name;
 	construct();
 }
-typedef MemberCaller1<NameObserver, const char*, &NameObserver::nameChanged> NameChangedCaller;
+typedef MemberCaller<NameObserver, void(const char*), &NameObserver::nameChanged> NameChangedCaller;
 };
 
 class BasicNamespace : public Namespace
@@ -776,19 +776,17 @@ void DoMapInfo(){
 		window.add(vbox);
 
 		{
-			GtkHBox* hbox = create_dialog_hbox( 4 );
-			gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hbox ), FALSE, TRUE, 0 );
+			auto hbox = create_dialog_hbox( 4 );
+			vbox.pack_start( hbox, FALSE, TRUE, 0 );
 
 			{
-				GtkTable* table = create_dialog_table( 2, 2, 4, 4 );
-				gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( table ), TRUE, TRUE, 0 );
+				auto table = create_dialog_table( 2, 2, 4, 4 );
+				hbox.pack_start( table, TRUE, TRUE, 0 );
 
 				{
 					auto entry = ui::Entry(ui::New);
 					entry.show();
-					gtk_table_attach( table, GTK_WIDGET( entry ), 1, 2, 0, 1,
-									  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-									  (GtkAttachOptions) ( 0 ), 0, 0 );
+                    table.attach(entry, {1, 2, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
 					gtk_editable_set_editable( GTK_EDITABLE(entry), FALSE );
 
 					brushes_entry = entry;
@@ -796,9 +794,7 @@ void DoMapInfo(){
 				{
 					auto entry = ui::Entry(ui::New);
 					entry.show();
-					gtk_table_attach( table, GTK_WIDGET( entry ), 1, 2, 1, 2,
-									  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-									  (GtkAttachOptions) ( 0 ), 0, 0 );
+                    table.attach(entry, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
 					gtk_editable_set_editable( GTK_EDITABLE(entry), FALSE );
 
 					entities_entry = entry;
@@ -806,57 +802,53 @@ void DoMapInfo(){
 				{
 					ui::Widget label = ui::Label( "Total Brushes" );
 					label.show();
-					gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
-									  (GtkAttachOptions) ( GTK_FILL ),
-									  (GtkAttachOptions) ( 0 ), 0, 0 );
+                    table.attach(label, {0, 1, 0, 1}, {GTK_FILL, 0});
 					gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
 				}
 				{
 					ui::Widget label = ui::Label( "Total Entities" );
 					label.show();
-					gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
-									  (GtkAttachOptions) ( GTK_FILL ),
-									  (GtkAttachOptions) ( 0 ), 0, 0 );
+                    table.attach(label, {0, 1, 1, 2}, {GTK_FILL, 0});
 					gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
 				}
 			}
 			{
-				GtkVBox* vbox2 = create_dialog_vbox( 4 );
-				gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox2 ), FALSE, FALSE, 0 );
+				auto vbox2 = create_dialog_vbox( 4 );
+				hbox.pack_start( vbox2, FALSE, FALSE, 0 );
 
 				{
-					GtkButton* button = create_dialog_button( "Close", G_CALLBACK( dialog_button_ok ), &dialog );
-					gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
+					auto button = create_dialog_button( "Close", G_CALLBACK( dialog_button_ok ), &dialog );
+					vbox2.pack_start( button, FALSE, FALSE, 0 );
 				}
 			}
 		}
 		{
 			ui::Widget label = ui::Label( "Entity breakdown" );
 			label.show();
-			gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( label ), FALSE, TRUE, 0 );
+			vbox.pack_start( label, FALSE, TRUE, 0 );
 			gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
 		}
 		{
 			auto scr = create_scrolled_window( ui::Policy::NEVER, ui::Policy::AUTOMATIC, 4 );
-			gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( scr ), TRUE, TRUE, 0 );
+			vbox.pack_start( scr, TRUE, TRUE, 0 );
 
 			{
 				ui::ListStore store = ui::ListStore(gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_STRING ));
 
-				ui::Widget view = ui::TreeView(ui::TreeModel( GTK_TREE_MODEL( store ) ));
-				gtk_tree_view_set_headers_clickable( GTK_TREE_VIEW( view ), TRUE );
+				auto view = ui::TreeView(ui::TreeModel(store ));
+				gtk_tree_view_set_headers_clickable(view, TRUE );
 
 				{
 					auto renderer = ui::CellRendererText(ui::New);
-					GtkTreeViewColumn* column = ui::TreeViewColumn( "Entity", renderer, {{"text", 0}} );
-					gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column );
+					auto column = ui::TreeViewColumn( "Entity", renderer, {{"text", 0}} );
+					gtk_tree_view_append_column(view, column );
 					gtk_tree_view_column_set_sort_column_id( column, 0 );
 				}
 
 				{
 					auto renderer = ui::CellRendererText(ui::New);
-					GtkTreeViewColumn* column = ui::TreeViewColumn( "Count", renderer, {{"text", 1}} );
-					gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column );
+					auto column = ui::TreeViewColumn( "Count", renderer, {{"text", 1}} );
+					gtk_tree_view_append_column(view, column );
 					gtk_tree_view_column_set_sort_column_id( column, 1 );
 				}
 
@@ -879,9 +871,7 @@ void DoMapInfo(){
 		{
 			char tmp[16];
 			sprintf( tmp, "%u", Unsigned( ( *i ).second ) );
-			GtkTreeIter iter;
-			gtk_list_store_append( GTK_LIST_STORE( EntityBreakdownWalker ), &iter );
-			gtk_list_store_set( GTK_LIST_STORE( EntityBreakdownWalker ), &iter, 0, ( *i ).first.c_str(), 1, tmp, -1 );
+			EntityBreakdownWalker.append(0, (*i).first.c_str(), 1, tmp);
 		}
 	}
 
@@ -898,7 +888,7 @@ void DoMapInfo(){
 	// save before exit
 	window_get_position( window, g_posMapInfoWnd );
 
-	gtk_widget_destroy( GTK_WIDGET( window ) );
+    window.destroy();
 }
 
 
@@ -2048,54 +2038,46 @@ void DoFind(){
 		auto vbox = create_dialog_vbox( 4, 4 );
 		window.add(vbox);
 		{
-			GtkTable* table = create_dialog_table( 2, 2, 4, 4 );
-			gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( table ), TRUE, TRUE, 0 );
+			auto table = create_dialog_table( 2, 2, 4, 4 );
+			vbox.pack_start( table, TRUE, TRUE, 0 );
 			{
 				ui::Widget label = ui::Label( "Entity number" );
 				label.show();
-				gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
-								  (GtkAttachOptions) ( 0 ),
-								  (GtkAttachOptions) ( 0 ), 0, 0 );
+                (table).attach(label, {0, 1, 0, 1}, {0, 0});
 			}
 			{
 				ui::Widget label = ui::Label( "Brush number" );
 				label.show();
-				gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
-								  (GtkAttachOptions) ( 0 ),
-								  (GtkAttachOptions) ( 0 ), 0, 0 );
+                (table).attach(label, {0, 1, 1, 2}, {0, 0});
 			}
 			{
 				auto entry = ui::Entry(ui::New);
 				entry.show();
-				gtk_table_attach( table, GTK_WIDGET( entry ), 1, 2, 0, 1,
-								  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-								  (GtkAttachOptions) ( 0 ), 0, 0 );
-				gtk_widget_grab_focus( GTK_WIDGET( entry ) );
+                table.attach(entry, {1, 2, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
+				gtk_widget_grab_focus( entry  );
 				entity = entry;
 			}
 			{
 				auto entry = ui::Entry(ui::New);
 				entry.show();
-				gtk_table_attach( table, GTK_WIDGET( entry ), 1, 2, 1, 2,
-								  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-								  (GtkAttachOptions) ( 0 ), 0, 0 );
+                table.attach(entry, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
 
 				brush = entry;
 			}
 		}
 		{
-			GtkHBox* hbox = create_dialog_hbox( 4 );
-			gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hbox ), TRUE, TRUE, 0 );
+			auto hbox = create_dialog_hbox( 4 );
+			vbox.pack_start( hbox, TRUE, TRUE, 0 );
 			{
 				auto button = create_dialog_button( "Find", G_CALLBACK( dialog_button_ok ), &dialog );
-				gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
+				hbox.pack_start( button, FALSE, FALSE, 0 );
 				widget_make_default( button );
-				gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
+				gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
 			}
 			{
-				GtkButton* button = create_dialog_button( "Close", G_CALLBACK( dialog_button_cancel ), &dialog );
-				gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
-				gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
+				auto button = create_dialog_button( "Close", G_CALLBACK( dialog_button_cancel ), &dialog );
+				hbox.pack_start( button, FALSE, FALSE, 0 );
+				gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
 			}
 		}
 	}
@@ -2116,7 +2098,7 @@ void DoFind(){
 		SelectBrush( atoi( entstr ), atoi( brushstr ) );
 	}
 
-	gtk_widget_destroy( GTK_WIDGET( window ) );
+    window.destroy();
 }
 
 void Map_constructPreferences( PreferencesPage& page ){
@@ -2179,16 +2161,16 @@ CopiedString g_strLastMap;
 bool g_bLoadLastMap = false;
 
 void Map_Construct(){
-	GlobalCommands_insert( "RegionOff", FreeCaller<RegionOff>() );
-	GlobalCommands_insert( "RegionSetXY", FreeCaller<RegionXY>() );
-	GlobalCommands_insert( "RegionSetBrush", FreeCaller<RegionBrush>() );
-	GlobalCommands_insert( "RegionSetSelection", FreeCaller<RegionSelected>(), Accelerator( 'R', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
+	GlobalCommands_insert( "RegionOff", FreeCaller<void(), RegionOff>() );
+	GlobalCommands_insert( "RegionSetXY", FreeCaller<void(), RegionXY>() );
+	GlobalCommands_insert( "RegionSetBrush", FreeCaller<void(), RegionBrush>() );
+	GlobalCommands_insert( "RegionSetSelection", FreeCaller<void(), RegionSelected>(), Accelerator( 'R', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
 
 	GlobalPreferenceSystem().registerPreference( "LastMap", CopiedStringImportStringCaller( g_strLastMap ), CopiedStringExportStringCaller( g_strLastMap ) );
 	GlobalPreferenceSystem().registerPreference( "LoadLastMap", BoolImportStringCaller( g_bLoadLastMap ), BoolExportStringCaller( g_bLoadLastMap ) );
 	GlobalPreferenceSystem().registerPreference( "MapInfoDlg", WindowPositionImportStringCaller( g_posMapInfoWnd ), WindowPositionExportStringCaller( g_posMapInfoWnd ) );
 
-	PreferencesDialog_addSettingsPreferences( FreeCaller1<PreferencesPage&, Map_constructPreferences>() );
+	PreferencesDialog_addSettingsPreferences( FreeCaller<void(PreferencesPage&), Map_constructPreferences>() );
 
 	GlobalEntityClassManager().attach( g_MapEntityClasses );
 	Radiant_attachHomePathsObserver( g_MapModuleObserver );