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

diff --git a/radiant/select.cpp b/radiant/select.cpp
index d2cfed61..5a36f5a4 100644
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -21,6 +21,8 @@
 
 #include "select.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 
 #include "ientity.h"
@@ -866,7 +868,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 ){
@@ -914,8 +916,8 @@ void DoRotateDlg(){
 		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 );
@@ -986,12 +988,12 @@ void DoRotateDlg(){
 					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( button );
-					gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
+					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 );
-					gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)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 );
@@ -1014,10 +1016,10 @@ void DoRotateDlg(){
 
 struct ScaleDialog
 {
-	ui::Widget x;
-	ui::Widget y;
-	ui::Widget z;
-	ui::Window window;
+	ui::Entry x;
+	ui::Entry y;
+	ui::Entry z;
+	ui::Window window{ui::null};
 };
 
 static gboolean scaledlg_apply( ui::Widget widget, ScaleDialog* scaleDialog ){
@@ -1039,9 +1041,9 @@ 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 ) );
 
-	gtk_entry_set_text( GTK_ENTRY( scaleDialog->x ), "1.0" );
-	gtk_entry_set_text( GTK_ENTRY( scaleDialog->y ), "1.0" );
-	gtk_entry_set_text( GTK_ENTRY( scaleDialog->z ), "1.0" );
+	scaleDialog->x.text("1.0");
+	scaleDialog->y.text("1.0");
+	scaleDialog->z.text("1.0");
 
 	return TRUE;
 }
@@ -1067,8 +1069,8 @@ void DoScaleDlg(){
 		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 );
@@ -1094,8 +1096,8 @@ void DoScaleDlg(){
 									  (GtkAttachOptions) ( 0 ), 0, 0 );
 				}
 				{
-					ui::Widget entry = ui::Entry();
-					gtk_entry_set_text( GTK_ENTRY( entry ), "1.0" );
+					auto entry = ui::Entry();
+					entry.text("1.0");
 					entry.show();
 					gtk_table_attach( table, entry, 1, 2, 0, 1,
 									  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
@@ -1104,8 +1106,8 @@ void DoScaleDlg(){
 					g_scale_dialog.x = entry;
 				}
 				{
-					ui::Widget entry = ui::Entry();
-					gtk_entry_set_text( GTK_ENTRY( entry ), "1.0" );
+					auto entry = ui::Entry();
+					entry.text("1.0");
 					entry.show();
 					gtk_table_attach( table, entry, 1, 2, 1, 2,
 									  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
@@ -1114,8 +1116,8 @@ void DoScaleDlg(){
 					g_scale_dialog.y = entry;
 				}
 				{
-					ui::Widget entry = ui::Entry();
-					gtk_entry_set_text( GTK_ENTRY( entry ), "1.0" );
+					auto entry = ui::Entry();
+					entry.text("1.0");
 					entry.show();
 					gtk_table_attach( table, entry, 1, 2, 2, 3,
 									  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
@@ -1131,12 +1133,12 @@ void DoScaleDlg(){
 					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( button );
-					gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
+					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 );
-					gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)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 );