X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=contrib%2Fhydratoolz%2Fplugin.cpp;h=b1dfcfe3248a5f0163666086bf319c8bec86f404;hb=e050a83cd52858eb64e2750ac440c9c554e2367c;hp=5ca4fad153519b147f1832f441140feb4ede136d;hpb=465884e260039bad1a333c51b6013edd361a63cd;p=xonotic%2Fnetradiant.git

diff --git a/contrib/hydratoolz/plugin.cpp b/contrib/hydratoolz/plugin.cpp
index 5ca4fad1..b1dfcfe3 100644
--- a/contrib/hydratoolz/plugin.cpp
+++ b/contrib/hydratoolz/plugin.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "plugin.h"
-#include "version.h"
 
 /*! \file plugin.cpp
     \brief HydraToolz!
@@ -58,11 +57,10 @@ void *g_pMainWnd;
 // =============================================================================
 // Ripped from TexTool.cpp
 
-static void dialog_button_callback( GtkWidget *widget, gpointer data ){
-	GtkWidget *parent;
+static void dialog_button_callback( ui::Widget widget, gpointer data ){
 	int *loop, *ret;
 
-	parent = gtk_widget_get_toplevel( widget );
+	auto parent = widget.window();
 	loop = (int*)gtk_object_get_data( GTK_OBJECT( parent ), "loop" );
 	ret = (int*)gtk_object_get_data( GTK_OBJECT( parent ), "ret" );
 
@@ -89,7 +87,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
 						G_CALLBACK( dialog_delete_callback ), NULL );
 	window.connect( "destroy",
 						G_CALLBACK( gtk_widget_destroy ), NULL );
-	gtk_window_set_title( GTK_WINDOW( window ), lpCaption );
+	gtk_window_set_title( window, lpCaption );
 	gtk_container_set_border_width( GTK_CONTAINER( window ), 10 );
 	gtk_object_set_data( GTK_OBJECT( window ), "loop", &loop );
 	gtk_object_set_data( GTK_OBJECT( window ), "ret", &ret );
@@ -100,92 +98,92 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
 	vbox.show();
 
 	w = ui::Label( lpText );
-	gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 2 );
+	vbox.pack_start( w, FALSE, FALSE, 2 );
 	gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
-	gtk_widget_show( w );
+	w.show();
 
 	w = gtk_hseparator_new();
-	gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 2 );
-	gtk_widget_show( w );
+	vbox.pack_start( w, FALSE, FALSE, 2 );
+	w.show();
 
 	hbox = ui::HBox( FALSE, 10 );
-	gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 2 );
-	gtk_widget_show( hbox );
+	vbox.pack_start( hbox, FALSE, FALSE, 2 );
+	hbox.show();
 
 	if ( mode == MB_OK ) {
 		w = ui::Button( "Ok" );
-		gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
+		hbox.pack_start( w, TRUE, TRUE, 0 );
 		w.connect( "clicked",
 							G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
 		gtk_widget_set_can_default( w, true );
 		gtk_widget_grab_default( w );
-		gtk_widget_show( w );
+		w.show();
 		ret = IDOK;
 	}
 	else if ( mode ==  MB_OKCANCEL ) {
 		w = ui::Button( "Ok" );
-		gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
+		hbox.pack_start( w, TRUE, TRUE, 0 );
 		w.connect( "clicked",
 							G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
 		gtk_widget_set_can_default( w, true );
 		gtk_widget_grab_default( w );
-		gtk_widget_show( w );
+		w.show();
 
 		w = ui::Button( "Cancel" );
-		gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
+		hbox.pack_start( w, TRUE, TRUE, 0 );
 		w.connect( "clicked",
 							G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
-		gtk_widget_show( w );
+		w.show();
 		ret = IDCANCEL;
 	}
 	else if ( mode == MB_YESNOCANCEL ) {
 		w = ui::Button( "Yes" );
-		gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
+		hbox.pack_start( w, TRUE, TRUE, 0 );
 		w.connect( "clicked",
 							G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDYES ) );
 		gtk_widget_set_can_default( w, true );
 		gtk_widget_grab_default( w );
-		gtk_widget_show( w );
+		w.show();
 
 		w = ui::Button( "No" );
-		gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
+		hbox.pack_start( w, TRUE, TRUE, 0 );
 		w.connect( "clicked",
 							G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDNO ) );
-		gtk_widget_show( w );
+		w.show();
 
 		w = ui::Button( "Cancel" );
-		gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
+		hbox.pack_start( w, TRUE, TRUE, 0 );
 		w.connect( "clicked",
 							G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
-		gtk_widget_show( w );
+		w.show();
 		ret = IDCANCEL;
 	}
 	else /* if (mode == MB_YESNO) */
 	{
 		w = ui::Button( "Yes" );
-		gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
+		hbox.pack_start( w, TRUE, TRUE, 0 );
 		w.connect( "clicked",
 							G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDYES ) );
 		gtk_widget_set_can_default( w, true );
 		gtk_widget_grab_default( w );
-		gtk_widget_show( w );
+		w.show();
 
 		w = ui::Button( "No" );
-		gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
+		hbox.pack_start( w, TRUE, TRUE, 0 );
 		w.connect( "clicked",
 							G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDNO ) );
-		gtk_widget_show( w );
+		w.show();
 		ret = IDNO;
 	}
 
-	gtk_widget_show( window );
+	window.show();
 	gtk_grab_add( window );
 
 	while ( loop )
 		gtk_main_iteration();
 
 	gtk_grab_remove( window );
-	gtk_widget_destroy( window );
+	window.destroy();
 
 	return ret;
 }