X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fselect.cpp;h=33813fdb64af933aaafdf7d19417af9226eea0ad;hp=5a36f5a49994a7768bdc767e71f22cc271f24c72;hb=2951e448a7f008f2438be4bd5feba2e4f4400eef;hpb=66dab04732db09384c0031d3271a78533811a184

diff --git a/radiant/select.cpp b/radiant/select.cpp
index 5a36f5a4..33813fdb 100644
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -887,7 +887,7 @@ static gboolean rotatedlg_apply( ui::Widget widget, RotateDialog* rotateDialog )
 }
 
 static gboolean rotatedlg_cancel( ui::Widget widget, RotateDialog* rotateDialog ){
-	gtk_widget_hide( GTK_WIDGET( rotateDialog->window ) );
+	rotateDialog->window.hide();
 
 	gtk_spin_button_set_value( rotateDialog->x, 0.0f ); // reset to 0 on close
 	gtk_spin_button_set_value( rotateDialog->y, 0.0f );
@@ -898,7 +898,7 @@ static gboolean rotatedlg_cancel( ui::Widget widget, RotateDialog* rotateDialog
 
 static gboolean rotatedlg_ok( ui::Widget widget, RotateDialog* rotateDialog ){
 	rotatedlg_apply( widget, rotateDialog );
-	gtk_widget_hide( GTK_WIDGET( rotateDialog->window ) );
+	rotateDialog->window.hide();
 	return TRUE;
 }
 
@@ -912,15 +912,15 @@ 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 );
 
-		auto accel = ui::AccelGroup();
+		auto accel = ui::AccelGroup(ui::New);
 		g_rotate_dialog.window.add_accel_group( accel );
 
 		{
 			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 );
+				auto table = create_dialog_table( 3, 2, 4, 4 );
+				hbox.pack_start( table, TRUE, TRUE, 0 );
 				{
 					ui::Widget label = ui::Label( "  X  " );
 					label.show();
@@ -982,22 +982,22 @@ void DoRotateDlg(){
 				}
 			}
 			{
-				GtkVBox* vbox = create_dialog_vbox( 4 );
-				gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 );
+				auto vbox = create_dialog_vbox( 4 );
+				hbox.pack_start( vbox, TRUE, TRUE, 0 );
 				{
 					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 );
+					vbox.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 );
 				}
 				{
-					GtkButton* button = create_dialog_button( "Cancel", G_CALLBACK( rotatedlg_cancel ), &g_rotate_dialog );
-					gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
+					auto button = create_dialog_button( "Cancel", G_CALLBACK( rotatedlg_cancel ), &g_rotate_dialog );
+					vbox.pack_start( button, FALSE, FALSE, 0 );
 					gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
 				}
 				{
-					GtkButton* button = create_dialog_button( "Apply", G_CALLBACK( rotatedlg_apply ), &g_rotate_dialog );
-					gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
+					auto button = create_dialog_button( "Apply", G_CALLBACK( rotatedlg_apply ), &g_rotate_dialog );
+					vbox.pack_start( button, FALSE, FALSE, 0 );
 				}
 			}
 		}
@@ -1016,9 +1016,9 @@ void DoRotateDlg(){
 
 struct ScaleDialog
 {
-	ui::Entry x;
-	ui::Entry y;
-	ui::Entry z;
+	ui::Entry x{ui::null};
+	ui::Entry y{ui::null};
+	ui::Entry z{ui::null};
 	ui::Window window{ui::null};
 };
 
@@ -1039,7 +1039,7 @@ static gboolean scaledlg_apply( ui::Widget widget, ScaleDialog* scaleDialog ){
 }
 
 static gboolean scaledlg_cancel( ui::Widget widget, ScaleDialog* scaleDialog ){
-	gtk_widget_hide( GTK_WIDGET( scaleDialog->window ) );
+	scaleDialog->window.hide();
 
 	scaleDialog->x.text("1.0");
 	scaleDialog->y.text("1.0");
@@ -1050,7 +1050,7 @@ static gboolean scaledlg_cancel( ui::Widget widget, ScaleDialog* scaleDialog ){
 
 static gboolean scaledlg_ok( ui::Widget widget, ScaleDialog* scaleDialog ){
 	scaledlg_apply( widget, scaleDialog );
-	gtk_widget_hide( GTK_WIDGET( scaleDialog->window ) );
+	scaleDialog->window.hide();
 	return TRUE;
 }
 
@@ -1065,15 +1065,15 @@ 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 );
 
-		auto accel = ui::AccelGroup();
+		auto accel = ui::AccelGroup(ui::New);
 		g_scale_dialog.window.add_accel_group( accel );
 
 		{
 			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 );
+				auto table = create_dialog_table( 3, 2, 4, 4 );
+				hbox.pack_start( table, TRUE, TRUE, 0 );
 				{
 					ui::Widget label = ui::Label( "  X  " );
 					label.show();
@@ -1096,7 +1096,7 @@ void DoScaleDlg(){
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
 				}
 				{
-					auto entry = ui::Entry();
+					auto entry = ui::Entry(ui::New);
 					entry.text("1.0");
 					entry.show();
 					gtk_table_attach( table, entry, 1, 2, 0, 1,
@@ -1106,7 +1106,7 @@ void DoScaleDlg(){
 					g_scale_dialog.x = entry;
 				}
 				{
-					auto entry = ui::Entry();
+					auto entry = ui::Entry(ui::New);
 					entry.text("1.0");
 					entry.show();
 					gtk_table_attach( table, entry, 1, 2, 1, 2,
@@ -1116,7 +1116,7 @@ void DoScaleDlg(){
 					g_scale_dialog.y = entry;
 				}
 				{
-					auto entry = ui::Entry();
+					auto entry = ui::Entry(ui::New);
 					entry.text("1.0");
 					entry.show();
 					gtk_table_attach( table, entry, 1, 2, 2, 3,
@@ -1127,22 +1127,22 @@ void DoScaleDlg(){
 				}
 			}
 			{
-				GtkVBox* vbox = create_dialog_vbox( 4 );
-				gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 );
+				auto vbox = create_dialog_vbox( 4 );
+				hbox.pack_start( vbox, TRUE, TRUE, 0 );
 				{
 					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 );
+					vbox.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 );
 				}
 				{
-					GtkButton* button = create_dialog_button( "Cancel", G_CALLBACK( scaledlg_cancel ), &g_scale_dialog );
-					gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
+					auto button = create_dialog_button( "Cancel", G_CALLBACK( scaledlg_cancel ), &g_scale_dialog );
+					vbox.pack_start( button, FALSE, FALSE, 0 );
 					gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
 				}
 				{
-					GtkButton* button = create_dialog_button( "Apply", G_CALLBACK( scaledlg_apply ), &g_scale_dialog );
-					gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
+					auto button = create_dialog_button( "Apply", G_CALLBACK( scaledlg_apply ), &g_scale_dialog );
+					vbox.pack_start( button, FALSE, FALSE, 0 );
 				}
 			}
 		}