X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=libs%2Fgtkutil%2Fmessagebox.cpp;h=28e29a147a35f0939f1e5fc41d54c9a87a435860;hb=69b4f74e6c95e22d6c6ce10d0e137c875fd83cc4;hp=3913d11bf4f239198e1e5729240a1aca36c088ae;hpb=225950494a606af9aac2bc2f06ece70cb2146481;p=xonotic%2Fnetradiant.git

diff --git a/libs/gtkutil/messagebox.cpp b/libs/gtkutil/messagebox.cpp
index 3913d11b..28e29a14 100644
--- a/libs/gtkutil/messagebox.cpp
+++ b/libs/gtkutil/messagebox.cpp
@@ -27,9 +27,9 @@
 #include "dialog.h"
 #include "widget.h"
 
-GtkWidget* create_padding( int width, int height ){
+ui::Widget create_padding( int width, int height ){
 	ui::Alignment widget = ui::Alignment( 0.0, 0.0, 0.0, 0.0 );
-	gtk_widget_show( widget );
+	widget.show();
 	gtk_widget_set_size_request( widget, width, height );
 	return widget;
 }
@@ -63,55 +63,55 @@ EMessageBoxReturn gtk_MessageBox( ui::Widget parent, const char* text, const cha
 	ui::Window window = create_fixedsize_modal_dialog_window( parentWindow, title, dialog, 400, 100 );
 
 	if ( parentWindow ) {
-		//g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(floating_window_delete_present), parent);
+		//window.connect( "delete_event", G_CALLBACK(floating_window_delete_present), parent);
 		gtk_window_deiconify( parentWindow );
 	}
 
-	auto accel = ui::AccelGroup();
+	auto accel = ui::AccelGroup(ui::New);
 	window.add_accel_group( accel );
 
 	auto vbox = create_dialog_vbox( 8, 8 );
 	window.add(vbox);
 
 
-	GtkHBox* hboxDummy = create_dialog_hbox( 0, 0 );
-	gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hboxDummy ), FALSE, FALSE, 0 );
+	auto hboxDummy = create_dialog_hbox( 0, 0 );
+	vbox.pack_start( hboxDummy, FALSE, FALSE, 0 );
 
-	gtk_box_pack_start( GTK_BOX( hboxDummy ), create_padding( 0, 50 ), FALSE, FALSE, 0 ); // HACK to force minimum height
+	hboxDummy.pack_start( create_padding( 0, 50 ), FALSE, FALSE, 0 ); // HACK to force minimum height
 
-	GtkHBox* iconBox = create_dialog_hbox( 16, 0 );
-	gtk_box_pack_start( GTK_BOX( hboxDummy ), GTK_WIDGET( iconBox ), FALSE, FALSE, 0 );
+	auto iconBox = create_dialog_hbox( 16, 0 );
+	hboxDummy.pack_start( iconBox, FALSE, FALSE, 0 );
 
-	GtkImage* image = GTK_IMAGE( gtk_image_new_from_stock( messagebox_stock_icon( icon ), GTK_ICON_SIZE_DIALOG ) );
-	gtk_widget_show( GTK_WIDGET( image ) );
-	gtk_box_pack_start( GTK_BOX( iconBox ), GTK_WIDGET( image ), FALSE, FALSE, 0 );
+	auto image = ui::Image(GTK_IMAGE( gtk_image_new_from_stock( messagebox_stock_icon( icon ), GTK_ICON_SIZE_DIALOG ) ));
+	image.show();
+	iconBox.pack_start( image, FALSE, FALSE, 0 );
 
-	GtkLabel* label = GTK_LABEL( ui::Label( text ) );
-	gtk_widget_show( GTK_WIDGET( label ) );
+	auto label = ui::Label( text );
+	label.show();
 	gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
 	gtk_label_set_justify( label, GTK_JUSTIFY_LEFT );
 	gtk_label_set_line_wrap( label, TRUE );
-	gtk_box_pack_start( GTK_BOX( iconBox ), GTK_WIDGET( label ), TRUE, TRUE, 0 );
+	iconBox.pack_start( label, TRUE, TRUE, 0 );
 
 
-	GtkVBox* vboxDummy = create_dialog_vbox( 0, 0 );
-	gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( vboxDummy ), FALSE, FALSE, 0 );
+	auto vboxDummy = create_dialog_vbox( 0, 0 );
+	vbox.pack_start( vboxDummy, FALSE, FALSE, 0 );
 
 	auto alignment = ui::Alignment( 0.5, 0.0, 0.0, 0.0 );
-	gtk_widget_show( GTK_WIDGET( alignment ) );
-	gtk_box_pack_start( GTK_BOX( vboxDummy ), GTK_WIDGET( alignment ), FALSE, FALSE, 0 );
+	alignment.show();
+	vboxDummy.pack_start( alignment, FALSE, FALSE, 0 );
 
 	auto hbox = create_dialog_hbox( 8, 0 );
 	alignment.add(hbox);
 
-	gtk_box_pack_start( GTK_BOX( vboxDummy ), create_padding( 400, 0 ), FALSE, FALSE, 0 ); // HACK to force minimum width
+	vboxDummy.pack_start( create_padding( 400, 0 ), FALSE, FALSE, 0 ); // HACK to force minimum width
 
 
 	if ( type == eMB_OK ) {
 		auto button = create_modal_dialog_button( "OK", ok_button );
-		gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, 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_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
+		hbox.pack_start( button, TRUE, FALSE, 0 );
+		gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
+		gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
 		widget_make_default( button );
 		button.show();
 
@@ -120,17 +120,17 @@ EMessageBoxReturn gtk_MessageBox( ui::Widget parent, const char* text, const cha
 	else if ( type ==  eMB_OKCANCEL ) {
 		{
 			auto button = create_modal_dialog_button( "OK", ok_button );
-			gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
-			gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
+			hbox.pack_start( button, TRUE, FALSE, 0 );
+			gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
 			widget_make_default( button );
 			button.show();
 		}
 
 		{
-			GtkButton* button = create_modal_dialog_button( "OK", cancel_button );
-			gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
-			gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
-			gtk_widget_show( GTK_WIDGET( button ) );
+			auto button = create_modal_dialog_button( "OK", cancel_button );
+			hbox.pack_start( button, TRUE, FALSE, 0 );
+			gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
+			button.show();
 		}
 
 		dialog.ret = eIDCANCEL;
@@ -138,20 +138,20 @@ EMessageBoxReturn gtk_MessageBox( ui::Widget parent, const char* text, const cha
 	else if ( type == eMB_YESNOCANCEL ) {
 		{
 			auto button = create_modal_dialog_button( "Yes", yes_button );
-			gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
+			hbox.pack_start( button, TRUE, FALSE, 0 );
 			widget_make_default( button );
 			button.show();
 		}
 
 		{
-			GtkButton* button = create_modal_dialog_button( "No", no_button );
-			gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
-			gtk_widget_show( GTK_WIDGET( button ) );
+			auto button = create_modal_dialog_button( "No", no_button );
+			hbox.pack_start( button, TRUE, FALSE, 0 );
+			button.show();
 		}
 		{
-			GtkButton* button = create_modal_dialog_button( "Cancel", cancel_button );
-			gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
-			gtk_widget_show( GTK_WIDGET( button ) );
+			auto button = create_modal_dialog_button( "Cancel", cancel_button );
+			hbox.pack_start( button, TRUE, FALSE, 0 );
+			button.show();
 		}
 
 		dialog.ret = eIDCANCEL;
@@ -159,14 +159,14 @@ EMessageBoxReturn gtk_MessageBox( ui::Widget parent, const char* text, const cha
 	else if ( type == eMB_NOYES ) {
 		{
 			auto button = create_modal_dialog_button( "No", no_button );
-			gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
+			hbox.pack_start( button, TRUE, FALSE, 0 );
 			widget_make_default( button );
 			button.show();
 		}
 		{
-			GtkButton* button = create_modal_dialog_button( "Yes", yes_button );
-			gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
-			gtk_widget_show( GTK_WIDGET( button ) );
+			auto button = create_modal_dialog_button( "Yes", yes_button );
+			hbox.pack_start( button, TRUE, FALSE, 0 );
+			button.show();
 		}
 
 		dialog.ret = eIDNO;
@@ -175,22 +175,22 @@ EMessageBoxReturn gtk_MessageBox( ui::Widget parent, const char* text, const cha
 	{
 		{
 			auto button = create_modal_dialog_button( "Yes", yes_button );
-			gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
+			hbox.pack_start( button, TRUE, FALSE, 0 );
 			widget_make_default( button );
-			gtk_widget_show( GTK_WIDGET( button ) );
+			button.show();
 		}
 
 		{
-			GtkButton* button = create_modal_dialog_button( "No", no_button );
-			gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
-			gtk_widget_show( GTK_WIDGET( button ) );
+			auto button = create_modal_dialog_button( "No", no_button );
+			hbox.pack_start( button, TRUE, FALSE, 0 );
+			button.show();
 		}
 		dialog.ret = eIDNO;
 	}
 
 	modal_dialog_show( window, dialog );
 
-	gtk_widget_destroy( GTK_WIDGET( window ) );
+	window.destroy();
 
 	return dialog.ret;
 }