X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fselect.cpp;h=0ac4467deb5e18784737dda335b8c4953f84e11b;hb=8505e24b7f9831e0c01860ed50b835aae4e856a2;hp=0586d417029bd62e6d149cee7b4afd0639a3736f;hpb=c52a4bd4da209e657018e8d799dcb488cd848e4c;p=xonotic%2Fnetradiant.git

diff --git a/radiant/select.cpp b/radiant/select.cpp
index 0586d417..0ac4467d 100644
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -830,7 +830,6 @@ void Selection_destroy(){
 
 
 #include "gtkdlgs.h"
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 
@@ -867,7 +866,7 @@ struct RotateDialog
 	GtkSpinButton* x;
 	GtkSpinButton* y;
 	GtkSpinButton* z;
-	ui::Window window;
+	ui::Window window{ui::null};
 };
 
 static gboolean rotatedlg_apply( ui::Widget widget, RotateDialog* rotateDialog ){
@@ -911,40 +910,40 @@ void DoRotateDlg(){
 	if ( !g_rotate_dialog.window ) {
 		g_rotate_dialog.window = MainFrame_getWindow().create_dialog_window("Arbitrary rotation", G_CALLBACK(rotatedlg_delete ), &g_rotate_dialog );
 
-		GtkAccelGroup* accel = ui::AccelGroup();
-		gtk_window_add_accel_group( g_rotate_dialog.window, accel );
+		auto accel = ui::AccelGroup();
+		g_rotate_dialog.window.add_accel_group( accel );
 
 		{
-			GtkHBox* hbox = create_dialog_hbox( 4, 4 );
-			gtk_container_add( GTK_CONTAINER( g_rotate_dialog.window ), GTK_WIDGET( hbox ) );
+			auto hbox = create_dialog_hbox( 4, 4 );
+			g_rotate_dialog.window.add(hbox);
 			{
 				GtkTable* table = create_dialog_table( 3, 2, 4, 4 );
 				gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( table ), TRUE, TRUE, 0 );
 				{
 					ui::Widget label = ui::Label( "  X  " );
-					gtk_widget_show( label );
+					label.show();
 					gtk_table_attach( table, label, 0, 1, 0, 1,
 									  (GtkAttachOptions) ( 0 ),
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
 				}
 				{
 					ui::Widget label = ui::Label( "  Y  " );
-					gtk_widget_show( label );
+					label.show();
 					gtk_table_attach( table, label, 0, 1, 1, 2,
 									  (GtkAttachOptions) ( 0 ),
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
 				}
 				{
 					ui::Widget label = ui::Label( "  Z  " );
-					gtk_widget_show( label );
+					label.show();
 					gtk_table_attach( table, label, 0, 1, 2, 3,
 									  (GtkAttachOptions) ( 0 ),
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
 				}
 				{
 					auto adj = ui::Adjustment( 0, -359, 359, 1, 10, 0 );
-					GtkSpinButton* spin = ui::SpinButton( adj, 1, 0 );
-					gtk_widget_show( GTK_WIDGET( spin ) );
+					auto spin = ui::SpinButton( adj, 1, 0 );
+					spin.show();
 					gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 0, 1,
 									  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
@@ -957,8 +956,8 @@ void DoRotateDlg(){
 				}
 				{
 					auto adj = ui::Adjustment( 0, -359, 359, 1, 10, 0 );
-					GtkSpinButton* spin = ui::SpinButton( adj, 1, 0 );
-					gtk_widget_show( GTK_WIDGET( spin ) );
+					auto spin = ui::SpinButton( adj, 1, 0 );
+					spin.show();
 					gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 1, 2,
 									  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
@@ -969,8 +968,8 @@ void DoRotateDlg(){
 				}
 				{
 					auto adj = ui::Adjustment( 0, -359, 359, 1, 10, 0 );
-					GtkSpinButton* spin = ui::SpinButton( adj, 1, 0 );
-					gtk_widget_show( GTK_WIDGET( spin ) );
+					auto spin = ui::SpinButton( adj, 1, 0 );
+					spin.show();
 					gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 2, 3,
 									  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
@@ -984,9 +983,9 @@ void DoRotateDlg(){
 				GtkVBox* vbox = create_dialog_vbox( 4 );
 				gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 );
 				{
-					GtkButton* button = create_dialog_button( "OK", G_CALLBACK( rotatedlg_ok ), &g_rotate_dialog );
+					auto button = create_dialog_button( "OK", G_CALLBACK( rotatedlg_ok ), &g_rotate_dialog );
 					gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
-					widget_make_default( GTK_WIDGET( button ) );
+					widget_make_default( button );
 					gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
 				}
 				{
@@ -1002,7 +1001,7 @@ void DoRotateDlg(){
 		}
 	}
 
-	gtk_widget_show( GTK_WIDGET( g_rotate_dialog.window ) );
+	g_rotate_dialog.window.show();
 }
 
 
@@ -1018,7 +1017,7 @@ struct ScaleDialog
 	ui::Widget x;
 	ui::Widget y;
 	ui::Widget z;
-	ui::Window window;
+	ui::Window window{ui::null};
 };
 
 static gboolean scaledlg_apply( ui::Widget widget, ScaleDialog* scaleDialog ){
@@ -1064,32 +1063,32 @@ void DoScaleDlg(){
 	if ( !g_scale_dialog.window ) {
 		g_scale_dialog.window = MainFrame_getWindow().create_dialog_window("Arbitrary scale", G_CALLBACK(scaledlg_delete ), &g_scale_dialog );
 
-		GtkAccelGroup* accel = ui::AccelGroup();
-		gtk_window_add_accel_group( g_scale_dialog.window, accel );
+		auto accel = ui::AccelGroup();
+		g_scale_dialog.window.add_accel_group( accel );
 
 		{
-			GtkHBox* hbox = create_dialog_hbox( 4, 4 );
-			gtk_container_add( GTK_CONTAINER( g_scale_dialog.window ), GTK_WIDGET( hbox ) );
+			auto hbox = create_dialog_hbox( 4, 4 );
+			g_scale_dialog.window.add(hbox);
 			{
 				GtkTable* table = create_dialog_table( 3, 2, 4, 4 );
 				gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( table ), TRUE, TRUE, 0 );
 				{
 					ui::Widget label = ui::Label( "  X  " );
-					gtk_widget_show( label );
+					label.show();
 					gtk_table_attach( table, label, 0, 1, 0, 1,
 									  (GtkAttachOptions) ( 0 ),
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
 				}
 				{
 					ui::Widget label = ui::Label( "  Y  " );
-					gtk_widget_show( label );
+					label.show();
 					gtk_table_attach( table, label, 0, 1, 1, 2,
 									  (GtkAttachOptions) ( 0 ),
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
 				}
 				{
 					ui::Widget label = ui::Label( "  Z  " );
-					gtk_widget_show( label );
+					label.show();
 					gtk_table_attach( table, label, 0, 1, 2, 3,
 									  (GtkAttachOptions) ( 0 ),
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
@@ -1097,7 +1096,7 @@ void DoScaleDlg(){
 				{
 					ui::Widget entry = ui::Entry();
 					gtk_entry_set_text( GTK_ENTRY( entry ), "1.0" );
-					gtk_widget_show( entry );
+					entry.show();
 					gtk_table_attach( table, entry, 1, 2, 0, 1,
 									  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
@@ -1107,7 +1106,7 @@ void DoScaleDlg(){
 				{
 					ui::Widget entry = ui::Entry();
 					gtk_entry_set_text( GTK_ENTRY( entry ), "1.0" );
-					gtk_widget_show( entry );
+					entry.show();
 					gtk_table_attach( table, entry, 1, 2, 1, 2,
 									  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
@@ -1117,7 +1116,7 @@ void DoScaleDlg(){
 				{
 					ui::Widget entry = ui::Entry();
 					gtk_entry_set_text( GTK_ENTRY( entry ), "1.0" );
-					gtk_widget_show( entry );
+					entry.show();
 					gtk_table_attach( table, entry, 1, 2, 2, 3,
 									  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
@@ -1129,9 +1128,9 @@ void DoScaleDlg(){
 				GtkVBox* vbox = create_dialog_vbox( 4 );
 				gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 );
 				{
-					GtkButton* button = create_dialog_button( "OK", G_CALLBACK( scaledlg_ok ), &g_scale_dialog );
+					auto button = create_dialog_button( "OK", G_CALLBACK( scaledlg_ok ), &g_scale_dialog );
 					gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
-					widget_make_default( GTK_WIDGET( button ) );
+					widget_make_default( button );
 					gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
 				}
 				{
@@ -1147,5 +1146,5 @@ void DoScaleDlg(){
 		}
 	}
 
-	gtk_widget_show( GTK_WIDGET( g_scale_dialog.window ) );
+	g_scale_dialog.window.show();
 }