X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=contrib%2Fprtview%2FConfigDialog.cpp;h=0d3a39206969e99587b03ef97d461365fcc78393;hp=a91a6a2b8e4b618ccdebc5f267e33c6ffe09a98e;hb=a9e5bfdf2a458e89978ee52ebbd3711884b54b29;hpb=3c73487420fde8d4a3b5360d8b99e48132517900

diff --git a/contrib/prtview/ConfigDialog.cpp b/contrib/prtview/ConfigDialog.cpp
index a91a6a2b..0d3a3920 100644
--- a/contrib/prtview/ConfigDialog.cpp
+++ b/contrib/prtview/ConfigDialog.cpp
@@ -20,6 +20,7 @@
 #include "ConfigDialog.h"
 #include <stdio.h>
 #include <gtk/gtk.h>
+#include <uilib/uilib.h>
 #include "gtkutil/pointer.h"
 
 #include "iscenegraph.h"
@@ -27,11 +28,10 @@
 #include "prtview.h"
 #include "portals.h"
 
-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*)g_object_get_data( G_OBJECT( parent ), "loop" );
 	ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" );
 
@@ -39,13 +39,10 @@ static void dialog_button_callback( GtkWidget *widget, gpointer data ){
 	*ret = gpointer_to_int( data );
 }
 
-static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){
-	int *loop;
-
-	gtk_widget_hide( widget );
-	loop = (int*)g_object_get_data( G_OBJECT( widget ), "loop" );
+static gint dialog_delete_callback( ui::Widget widget, GdkEvent* event, gpointer data ){
+	widget.hide();
+	int *loop = (int *) g_object_get_data(G_OBJECT(widget), "loop");
 	*loop = 0;
-
 	return TRUE;
 }
 
@@ -53,40 +50,39 @@ static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer
 // Color selection dialog
 
 static int DoColor( PackedColour *c ){
-	GtkWidget* dlg;
-	double clr[4];
+	GdkColor clr;
 	int loop = 1, ret = IDCANCEL;
 
-	clr[0] = ( (double)GetRValue( *c ) ) / 255.0;
-	clr[1] = ( (double)GetGValue( *c ) ) / 255.0;
-	clr[2] = ( (double)GetBValue( *c ) ) / 255.0;
-
-	dlg = gtk_color_selection_dialog_new( "Choose Color" );
-	gtk_color_selection_set_color( GTK_COLOR_SELECTION( GTK_COLOR_SELECTION_DIALOG( dlg )->colorsel ), clr );
-	gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event",
-						GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
-	gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
-						GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
-	gtk_signal_connect( GTK_OBJECT( GTK_COLOR_SELECTION_DIALOG( dlg )->ok_button ), "clicked",
-						GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
-	gtk_signal_connect( GTK_OBJECT( GTK_COLOR_SELECTION_DIALOG( dlg )->cancel_button ), "clicked",
-						GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
+	clr.red = (guint16) (GetRValue(*c) * (65535 / 255));
+	clr.blue = (guint16) (GetGValue(*c) * (65535 / 255));
+	clr.green = (guint16) (GetBValue(*c) * (65535 / 255));
+
+	auto dlg = ui::Widget(gtk_color_selection_dialog_new( "Choose Color" ));
+	gtk_color_selection_set_current_color( GTK_COLOR_SELECTION( gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dlg)) ), &clr );
+	dlg.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
+	dlg.connect( "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
+
+	GtkWidget *ok_button, *cancel_button;
+	g_object_get(dlg, "ok-button", &ok_button, "cancel-button", &cancel_button, nullptr);
+
+	ui::Widget(ok_button).connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
+	ui::Widget(cancel_button).connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
 	g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
 	g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
 
-	gtk_widget_show( dlg );
+	dlg.show();
 	gtk_grab_add( dlg );
 
 	while ( loop )
 		gtk_main_iteration();
 
-	gtk_color_selection_get_color( GTK_COLOR_SELECTION( GTK_COLOR_SELECTION_DIALOG( dlg )->colorsel ), clr );
+	gtk_color_selection_get_current_color( GTK_COLOR_SELECTION( gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dlg)) ), &clr );
 
 	gtk_grab_remove( dlg );
-	gtk_widget_destroy( dlg );
+	dlg.destroy();
 
 	if ( ret == IDOK ) {
-		*c = RGB( clr[0] * 255, clr[1] * 255, clr[2] * 255 );
+		*c = RGB( clr.red / (65535 / 255), clr.green / (65535 / 255), clr.blue / (65535 / 255));
 	}
 
 	return ret;
@@ -125,30 +121,30 @@ static void SetClipText( GtkWidget* label ){
 }
 
 static void OnScroll2d( GtkAdjustment *adj, gpointer data ){
-	portals.width_2d = static_cast<float>( adj->value );
-	Set2DText( GTK_WIDGET( data ) );
+	portals.width_2d = static_cast<float>( gtk_adjustment_get_value(adj) );
+	Set2DText( ui::Widget::from(data) );
 
 	Portals_shadersChanged();
 	SceneChangeNotify();
 }
 
 static void OnScroll3d( GtkAdjustment *adj, gpointer data ){
-	portals.width_3d = static_cast<float>( adj->value );
-	Set3DText( GTK_WIDGET( data ) );
+	portals.width_3d = static_cast<float>( gtk_adjustment_get_value(adj) );
+	Set3DText( ui::Widget::from( data ) );
 
 	SceneChangeNotify();
 }
 
 static void OnScrollTrans( GtkAdjustment *adj, gpointer data ){
-	portals.trans_3d = static_cast<float>( adj->value );
-	Set3DTransText( GTK_WIDGET( data ) );
+	portals.trans_3d = static_cast<float>( gtk_adjustment_get_value(adj) );
+	Set3DTransText( ui::Widget::from( data ) );
 
 	SceneChangeNotify();
 }
 
 static void OnScrollClip( GtkAdjustment *adj, gpointer data ){
-	portals.clip_range = static_cast<float>( adj->value );
-	SetClipText( GTK_WIDGET( data ) );
+	portals.clip_range = static_cast<float>( gtk_adjustment_get_value(adj) );
+	SetClipText( ui::Widget::from( data ) );
 
 	SceneChangeNotify();
 }
@@ -238,236 +234,196 @@ static void OnClip( GtkWidget *widget, gpointer data ){
 }
 
 void DoConfigDialog(){
-	GtkWidget *dlg, *hbox, *vbox, *vbox2, *button, *table, *frame;
-	GtkWidget *lw3slider, *lw3label, *lw2slider, *lw2label, *zlist, *menu, *item;
-	GtkWidget *aa2check, *aa3check, *depthcheck, *linescheck, *polyscheck;
-	GtkWidget *transslider, *translabel, *clipslider, *cliplabel;
-	GtkWidget *show2check, *show3check, *portalcheck;
 	int loop = 1, ret = IDCANCEL;
-	GtkObject *adj;
-
-	dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-	gtk_window_set_title( GTK_WINDOW( dlg ), "Portal Viewer Configuration" );
-	gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event",
-						GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
-	gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
-						GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
+
+	auto dlg = ui::Window( ui::window_type::TOP );
+	gtk_window_set_title( dlg, "Portal Viewer Configuration" );
+	dlg.connect( "delete_event",
+						G_CALLBACK( dialog_delete_callback ), NULL );
+	dlg.connect( "destroy",
+						G_CALLBACK( gtk_widget_destroy ), NULL );
 	g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
 	g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
 
-	vbox = gtk_vbox_new( FALSE, 5 );
-	gtk_widget_show( vbox );
-	gtk_container_add( GTK_CONTAINER( dlg ), vbox );
+	auto vbox = ui::VBox( FALSE, 5 );
+	vbox.show();
+	dlg.add(vbox);
 	gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
 
-	frame = gtk_frame_new( "3D View" );
-	gtk_widget_show( frame );
-	gtk_box_pack_start( GTK_BOX( vbox ), frame, TRUE, TRUE, 0 );
+	auto frame = ui::Frame( "3D View" );
+	frame.show();
+	vbox.pack_start( frame, TRUE, TRUE, 0 );
 
-	vbox2 = gtk_vbox_new( FALSE, 5 );
-	gtk_widget_show( vbox2 );
-	gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
+	auto vbox2 = ui::VBox( FALSE, 5 );
+	vbox2.show();
+	frame.add(vbox2);
 	gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
 
-	hbox = gtk_hbox_new( FALSE, 5 );
-	gtk_widget_show( hbox );
-	gtk_box_pack_start( GTK_BOX( vbox2 ), hbox, TRUE, TRUE, 0 );
+	auto hbox = ui::HBox( FALSE, 5 );
+	hbox.show();
+	vbox2.pack_start( hbox, TRUE, TRUE, 0 );
 
-	adj = gtk_adjustment_new( portals.width_3d, 2, 40, 1, 1, 0 );
-	lw3slider = gtk_hscale_new( GTK_ADJUSTMENT( adj ) );
-	gtk_widget_show( lw3slider );
-	gtk_box_pack_start( GTK_BOX( hbox ), lw3slider, TRUE, TRUE, 0 );
+	auto adj = ui::Adjustment( portals.width_3d, 2, 40, 1, 1, 0 );
+	auto lw3slider = ui::HScale( adj );
+	lw3slider.show();
+	hbox.pack_start( lw3slider, TRUE, TRUE, 0 );
 	gtk_scale_set_draw_value( GTK_SCALE( lw3slider ), FALSE );
 
-	lw3label = gtk_label_new( "" );
-	gtk_widget_show( lw3label );
-	gtk_box_pack_start( GTK_BOX( hbox ), lw3label, FALSE, TRUE, 0 );
-	gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScroll3d ), lw3label );
-
-	table = gtk_table_new( 2, 4, FALSE );
-	gtk_widget_show( table );
-	gtk_box_pack_start( GTK_BOX( vbox2 ), table, TRUE, TRUE, 0 );
-	gtk_table_set_row_spacings( GTK_TABLE( table ), 5 );
-	gtk_table_set_col_spacings( GTK_TABLE( table ), 5 );
-
-	button = gtk_button_new_with_label( "Color" );
-	gtk_widget_show( button );
-	gtk_table_attach( GTK_TABLE( table ), button, 0, 1, 0, 1,
-					  (GtkAttachOptions) ( GTK_FILL ),
-					  (GtkAttachOptions) ( 0 ), 0, 0 );
-	gtk_signal_connect( GTK_OBJECT( button ), "clicked", GTK_SIGNAL_FUNC( OnColor3d ), NULL );
-
-	button = gtk_button_new_with_label( "Depth Color" );
-	gtk_widget_show( button );
-	gtk_table_attach( GTK_TABLE( table ), button, 0, 1, 1, 2,
-					  (GtkAttachOptions) ( GTK_FILL ),
-					  (GtkAttachOptions) ( 0 ), 0, 0 );
-	gtk_signal_connect( GTK_OBJECT( button ), "clicked", GTK_SIGNAL_FUNC( OnColorFog ), NULL );
-
-	aa3check = gtk_check_button_new_with_label( "Anti-Alias (May not work on some video cards)" );
-	gtk_widget_show( aa3check );
-	gtk_table_attach( GTK_TABLE( table ), aa3check, 1, 4, 0, 1,
-					  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-					  (GtkAttachOptions) ( 0 ), 0, 0 );
-	gtk_signal_connect( GTK_OBJECT( aa3check ), "toggled", GTK_SIGNAL_FUNC( OnAntiAlias3d ), NULL );
-
-	depthcheck = gtk_check_button_new_with_label( "Depth Cue" );
-	gtk_widget_show( depthcheck );
-	gtk_table_attach( GTK_TABLE( table ), depthcheck, 1, 2, 1, 2,
-					  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-					  (GtkAttachOptions) ( 0 ), 0, 0 );
-	gtk_signal_connect( GTK_OBJECT( depthcheck ), "toggled", GTK_SIGNAL_FUNC( OnFog ), NULL );
-
-	linescheck = gtk_check_button_new_with_label( "Lines" );
-	gtk_widget_show( linescheck );
-	gtk_table_attach( GTK_TABLE( table ), linescheck, 2, 3, 1, 2,
-					  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-					  (GtkAttachOptions) ( 0 ), 0, 0 );
-	gtk_signal_connect( GTK_OBJECT( linescheck ), "toggled", GTK_SIGNAL_FUNC( OnLines ), NULL );
-
-	polyscheck = gtk_check_button_new_with_label( "Polygons" );
-	gtk_widget_show( polyscheck );
-	gtk_table_attach( GTK_TABLE( table ), polyscheck, 3, 4, 1, 2,
-					  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-					  (GtkAttachOptions) ( 0 ), 0, 0 );
-	gtk_signal_connect( GTK_OBJECT( polyscheck ), "toggled", GTK_SIGNAL_FUNC( OnPoly ), NULL );
-
-	zlist = gtk_option_menu_new();
-	gtk_widget_show( zlist );
-	gtk_box_pack_start( GTK_BOX( vbox2 ), zlist, TRUE, FALSE, 0 );
-
-	menu = gtk_menu_new();
-	gtk_widget_show( menu );
-	gtk_option_menu_set_menu( GTK_OPTION_MENU( zlist ), menu );
-
-	item = gtk_menu_item_new_with_label( "Z-Buffer Test and Write (recommended for solid or no polygons)" );
-	gtk_widget_show( item );
-	gtk_signal_connect( GTK_OBJECT( item ), "activate",
-						GTK_SIGNAL_FUNC( OnSelchangeZbuffer ), GINT_TO_POINTER( 0 ) );
-	gtk_menu_append( GTK_MENU( menu ), item );
-
-	item = gtk_menu_item_new_with_label( "Z-Buffer Test Only (recommended for transparent polygons)" );
-	gtk_widget_show( item );
-	gtk_signal_connect( GTK_OBJECT( item ), "activate",
-						GTK_SIGNAL_FUNC( OnSelchangeZbuffer ), GINT_TO_POINTER( 1 ) );
-	gtk_menu_append( GTK_MENU( menu ), item );
-
-	item = gtk_menu_item_new_with_label( "Z-Buffer Off" );
-	gtk_widget_show( item );
-	gtk_signal_connect( GTK_OBJECT( item ), "activate",
-						GTK_SIGNAL_FUNC( OnSelchangeZbuffer ), GINT_TO_POINTER( 2 ) );
-	gtk_menu_append( GTK_MENU( menu ), item );
-
-	table = gtk_table_new( 2, 2, FALSE );
-	gtk_widget_show( table );
-	gtk_box_pack_start( GTK_BOX( vbox2 ), table, TRUE, TRUE, 0 );
-	gtk_table_set_row_spacings( GTK_TABLE( table ), 5 );
-	gtk_table_set_col_spacings( GTK_TABLE( table ), 5 );
-
-	adj = gtk_adjustment_new( portals.trans_3d, 0, 100, 1, 1, 0 );
-	transslider = gtk_hscale_new( GTK_ADJUSTMENT( adj ) );
-	gtk_widget_show( transslider );
-	gtk_table_attach( GTK_TABLE( table ), transslider, 0, 1, 0, 1,
-					  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-					  (GtkAttachOptions) ( 0 ), 0, 0 );
+	auto lw3label = ui::Label( "" );
+	lw3label.show();
+	hbox.pack_start( lw3label, FALSE, TRUE, 0 );
+	adj.connect( "value_changed", G_CALLBACK( OnScroll3d ), lw3label );
+
+	auto table = ui::Table( 2, 4, FALSE );
+	table.show();
+	vbox2.pack_start( table, TRUE, TRUE, 0 );
+    gtk_table_set_row_spacings(table, 5);
+    gtk_table_set_col_spacings(table, 5);
+
+	auto button = ui::Button( "Color" );
+	button.show();
+    table.attach(button, {0, 1, 0, 1}, {GTK_FILL, 0});
+	button.connect( "clicked", G_CALLBACK( OnColor3d ), NULL );
+
+	button = ui::Button( "Depth Color" );
+	button.show();
+    table.attach(button, {0, 1, 1, 2}, {GTK_FILL, 0});
+	button.connect( "clicked", G_CALLBACK( OnColorFog ), NULL );
+
+	auto aa3check = ui::CheckButton( "Anti-Alias (May not work on some video cards)" );
+	aa3check.show();
+    table.attach(aa3check, {1, 4, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
+	aa3check.connect( "toggled", G_CALLBACK( OnAntiAlias3d ), NULL );
+
+	auto depthcheck = ui::CheckButton( "Depth Cue" );
+	depthcheck.show();
+    table.attach(depthcheck, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
+	depthcheck.connect( "toggled", G_CALLBACK( OnFog ), NULL );
+
+	auto linescheck = ui::CheckButton( "Lines" );
+	linescheck.show();
+    table.attach(linescheck, {2, 3, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
+	linescheck.connect( "toggled", G_CALLBACK( OnLines ), NULL );
+
+	auto polyscheck = ui::CheckButton( "Polygons" );
+	polyscheck.show();
+    table.attach(polyscheck, {3, 4, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
+	polyscheck.connect( "toggled", G_CALLBACK( OnPoly ), NULL );
+
+	auto zlist = ui::ComboBoxText(ui::New);
+	zlist.show();
+	vbox2.pack_start( zlist, TRUE, FALSE, 0 );
+
+	gtk_combo_box_text_append_text(zlist, "Z-Buffer Test and Write (recommended for solid or no polygons)");
+	gtk_combo_box_text_append_text(zlist, "Z-Buffer Test Only (recommended for transparent polygons)");
+	gtk_combo_box_text_append_text(zlist, "Z-Buffer Off");
+
+	zlist.connect("changed", G_CALLBACK(+[](ui::ComboBox self, void *) {
+		OnSelchangeZbuffer(self, GINT_TO_POINTER(gtk_combo_box_get_active(self)));
+	}), nullptr);
+
+	table = ui::Table( 2, 2, FALSE );
+	table.show();
+	vbox2.pack_start( table, TRUE, TRUE, 0 );
+    gtk_table_set_row_spacings(table, 5);
+    gtk_table_set_col_spacings(table, 5);
+
+	adj = ui::Adjustment( portals.trans_3d, 0, 100, 1, 1, 0 );
+	auto transslider = ui::HScale( adj );
+	transslider.show();
+    table.attach(transslider, {0, 1, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
 	gtk_scale_set_draw_value( GTK_SCALE( transslider ), FALSE );
 
-	translabel = gtk_label_new( "" );
-	gtk_widget_show( translabel );
-	gtk_table_attach( GTK_TABLE( table ), translabel, 1, 2, 0, 1,
-					  (GtkAttachOptions) ( GTK_FILL ),
-					  (GtkAttachOptions) ( 0 ), 0, 0 );
+	auto translabel = ui::Label( "" );
+	translabel.show();
+    table.attach(translabel, {1, 2, 0, 1}, {GTK_FILL, 0});
 	gtk_misc_set_alignment( GTK_MISC( translabel ), 0.0, 0.0 );
-	gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScrollTrans ), translabel );
-
-	adj = gtk_adjustment_new( portals.clip_range, 1, 128, 1, 1, 0 );
-	clipslider = gtk_hscale_new( GTK_ADJUSTMENT( adj ) );
-	gtk_widget_show( clipslider );
-	gtk_table_attach( GTK_TABLE( table ), clipslider, 0, 1, 1, 2,
-					  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-					  (GtkAttachOptions) ( 0 ), 0, 0 );
+	adj.connect( "value_changed", G_CALLBACK( OnScrollTrans ), translabel );
+
+	adj = ui::Adjustment( portals.clip_range, 1, 128, 1, 1, 0 );
+	auto clipslider = ui::HScale( adj );
+	clipslider.show();
+    table.attach(clipslider, {0, 1, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
 	gtk_scale_set_draw_value( GTK_SCALE( clipslider ), FALSE );
 
-	cliplabel = gtk_label_new( "" );
-	gtk_widget_show( cliplabel );
-	gtk_table_attach( GTK_TABLE( table ), cliplabel, 1, 2, 1, 2,
-					  (GtkAttachOptions) ( GTK_FILL ),
-					  (GtkAttachOptions) ( 0 ), 0, 0 );
+	auto cliplabel = ui::Label( "" );
+	cliplabel.show();
+    table.attach(cliplabel, {1, 2, 1, 2}, {GTK_FILL, 0});
 	gtk_misc_set_alignment( GTK_MISC( cliplabel ), 0.0, 0.0 );
-	gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScrollClip ), cliplabel );
+	adj.connect( "value_changed", G_CALLBACK( OnScrollClip ), cliplabel );
 
-	hbox = gtk_hbox_new( TRUE, 5 );
-	gtk_widget_show( hbox );
-	gtk_box_pack_start( GTK_BOX( vbox2 ), hbox, TRUE, FALSE, 0 );
+	hbox = ui::HBox( TRUE, 5 );
+	hbox.show();
+	vbox2.pack_start( hbox, TRUE, FALSE, 0 );
 
-	show3check = gtk_check_button_new_with_label( "Show" );
-	gtk_widget_show( show3check );
-	gtk_box_pack_start( GTK_BOX( hbox ), show3check, TRUE, TRUE, 0 );
-	gtk_signal_connect( GTK_OBJECT( show3check ), "toggled", GTK_SIGNAL_FUNC( OnConfig3d ), NULL );
+	auto show3check = ui::CheckButton( "Show" );
+	show3check.show();
+	hbox.pack_start( show3check, TRUE, TRUE, 0 );
+	show3check.connect( "toggled", G_CALLBACK( OnConfig3d ), NULL );
 
-	portalcheck = gtk_check_button_new_with_label( "Portal cubic clipper" );
-	gtk_widget_show( portalcheck );
-	gtk_box_pack_start( GTK_BOX( hbox ), portalcheck, TRUE, TRUE, 0 );
-	gtk_signal_connect( GTK_OBJECT( portalcheck ), "toggled", GTK_SIGNAL_FUNC( OnClip ), NULL );
+	auto portalcheck = ui::CheckButton( "Portal cubic clipper" );
+	portalcheck.show();
+	hbox.pack_start( portalcheck, TRUE, TRUE, 0 );
+	portalcheck.connect( "toggled", G_CALLBACK( OnClip ), NULL );
 
-	frame = gtk_frame_new( "2D View" );
-	gtk_widget_show( frame );
-	gtk_box_pack_start( GTK_BOX( vbox ), frame, TRUE, TRUE, 0 );
+	frame = ui::Frame( "2D View" );
+	frame.show();
+	vbox.pack_start( frame, TRUE, TRUE, 0 );
 
-	vbox2 = gtk_vbox_new( FALSE, 5 );
-	gtk_widget_show( vbox2 );
-	gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
+	vbox2 = ui::VBox( FALSE, 5 );
+	vbox2.show();
+	frame.add(vbox2);
 	gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
 
-	hbox = gtk_hbox_new( FALSE, 5 );
-	gtk_widget_show( hbox );
-	gtk_box_pack_start( GTK_BOX( vbox2 ), hbox, TRUE, FALSE, 0 );
+	hbox = ui::HBox( FALSE, 5 );
+	hbox.show();
+	vbox2.pack_start( hbox, TRUE, FALSE, 0 );
 
-	adj = gtk_adjustment_new( portals.width_2d, 2, 40, 1, 1, 0 );
-	lw2slider = gtk_hscale_new( GTK_ADJUSTMENT( adj ) );
-	gtk_widget_show( lw2slider );
-	gtk_box_pack_start( GTK_BOX( hbox ), lw2slider, TRUE, TRUE, 0 );
+	adj = ui::Adjustment( portals.width_2d, 2, 40, 1, 1, 0 );
+	auto lw2slider = ui::HScale( adj );
+	lw2slider.show();
+	hbox.pack_start( lw2slider, TRUE, TRUE, 0 );
 	gtk_scale_set_draw_value( GTK_SCALE( lw2slider ), FALSE );
 
-	lw2label = gtk_label_new( "" );
-	gtk_widget_show( lw2label );
-	gtk_box_pack_start( GTK_BOX( hbox ), lw2label, FALSE, TRUE, 0 );
-	gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScroll2d ), lw2label );
-
-	hbox = gtk_hbox_new( FALSE, 5 );
-	gtk_widget_show( hbox );
-	gtk_box_pack_start( GTK_BOX( vbox2 ), hbox, TRUE, FALSE, 0 );
-
-	button = gtk_button_new_with_label( "Color" );
-	gtk_widget_show( button );
-	gtk_box_pack_start( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
-	gtk_signal_connect( GTK_OBJECT( button ), "clicked", GTK_SIGNAL_FUNC( OnColor2d ), NULL );
-	gtk_widget_set_usize( button, 60, -2 );
-
-	aa2check = gtk_check_button_new_with_label( "Anti-Alias (May not work on some video cards)" );
-	gtk_widget_show( aa2check );
-	gtk_box_pack_start( GTK_BOX( hbox ), aa2check, TRUE, TRUE, 0 );
-	gtk_signal_connect( GTK_OBJECT( aa2check ), "toggled", GTK_SIGNAL_FUNC( OnAntiAlias2d ), NULL );
-
-	hbox = gtk_hbox_new( FALSE, 5 );
-	gtk_widget_show( hbox );
-	gtk_box_pack_start( GTK_BOX( vbox2 ), hbox, TRUE, FALSE, 0 );
-
-	show2check = gtk_check_button_new_with_label( "Show" );
-	gtk_widget_show( show2check );
-	gtk_box_pack_start( GTK_BOX( hbox ), show2check, FALSE, FALSE, 0 );
-	gtk_signal_connect( GTK_OBJECT( show2check ), "toggled", GTK_SIGNAL_FUNC( OnConfig2d ), NULL );
-
-	hbox = gtk_hbox_new( FALSE, 5 );
-	gtk_widget_show( hbox );
-	gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
-
-	button = gtk_button_new_with_label( "OK" );
-	gtk_widget_show( button );
-	gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
-	gtk_signal_connect( GTK_OBJECT( button ), "clicked",
-						GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
-	gtk_widget_set_usize( button, 60, -2 );
+	auto lw2label = ui::Label( "" );
+	lw2label.show();
+	hbox.pack_start( lw2label, FALSE, TRUE, 0 );
+	adj.connect( "value_changed", G_CALLBACK( OnScroll2d ), lw2label );
+
+	hbox = ui::HBox( FALSE, 5 );
+	hbox.show();
+	vbox2.pack_start( hbox, TRUE, FALSE, 0 );
+
+	button = ui::Button( "Color" );
+	button.show();
+	hbox.pack_start( button, FALSE, FALSE, 0 );
+	button.connect( "clicked", G_CALLBACK( OnColor2d ), NULL );
+	button.dimensions(60, -1);
+
+	auto aa2check = ui::CheckButton( "Anti-Alias (May not work on some video cards)" );
+	aa2check.show();
+	hbox.pack_start( aa2check, TRUE, TRUE, 0 );
+	aa2check.connect( "toggled", G_CALLBACK( OnAntiAlias2d ), NULL );
+
+	hbox = ui::HBox( FALSE, 5 );
+	hbox.show();
+	vbox2.pack_start( hbox, TRUE, FALSE, 0 );
+
+	auto show2check = ui::CheckButton( "Show" );
+	show2check.show();
+	hbox.pack_start( show2check, FALSE, FALSE, 0 );
+	show2check.connect( "toggled", G_CALLBACK( OnConfig2d ), NULL );
+
+	hbox = ui::HBox( FALSE, 5 );
+	hbox.show();
+	vbox.pack_start( hbox, FALSE, FALSE, 0 );
+
+	button = ui::Button( "OK" );
+	button.show();
+	hbox.pack_end(button, FALSE, FALSE, 0);
+	button.connect( "clicked",
+						G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
+	button.dimensions(60, -1);
 
 	// initialize dialog
 	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( show2check ), portals.show_2d );
@@ -479,7 +435,7 @@ void DoConfigDialog(){
 	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( polyscheck ), portals.polygons );
 	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( linescheck ), portals.lines );
 	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( aa3check ), portals.aa_3d );
-	gtk_option_menu_set_history( GTK_OPTION_MENU( zlist ), portals.zbuffer );
+	gtk_combo_box_set_active(zlist, portals.zbuffer);
 	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( portalcheck ), portals.clip );
 
 	Set3DText( lw3label );
@@ -487,11 +443,11 @@ void DoConfigDialog(){
 	SetClipText( cliplabel );
 
 	gtk_grab_add( dlg );
-	gtk_widget_show( dlg );
+	dlg.show();
 
 	while ( loop )
 		gtk_main_iteration();
 
 	gtk_grab_remove( dlg );
-	gtk_widget_destroy( dlg );
+	dlg.destroy();
 }