X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=libs%2Fgtkutil%2Fdialog.cpp;h=c826731050b00a731b80cb41f62bdb3929951c7a;hb=69b4f74e6c95e22d6c6ce10d0e137c875fd83cc4;hp=dfeece8d43d4004e322dc7abdc821770efffd7f8;hpb=57f4ad12206f19d639260384220a5507e7b20086;p=xonotic%2Fnetradiant.git

diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index dfeece8d..c8267310 100644
--- a/libs/gtkutil/dialog.cpp
+++ b/libs/gtkutil/dialog.cpp
@@ -26,41 +26,41 @@
 #include "button.h"
 #include "window.h"
 
-GtkVBox* create_dialog_vbox( int spacing, int border ){
-	GtkVBox* vbox = ui::VBox( FALSE, spacing );
-	gtk_widget_show( GTK_WIDGET( vbox ) );
+ui::VBox create_dialog_vbox( int spacing, int border ){
+	auto vbox = ui::VBox( FALSE, spacing );
+	vbox.show();
 	gtk_container_set_border_width( GTK_CONTAINER( vbox ), border );
 	return vbox;
 }
 
-GtkHBox* create_dialog_hbox( int spacing, int border ){
-	GtkHBox* hbox = ui::HBox( FALSE, spacing );
-	gtk_widget_show( GTK_WIDGET( hbox ) );
+ui::HBox create_dialog_hbox( int spacing, int border ){
+	auto hbox = ui::HBox( FALSE, spacing );
+	hbox.show();
 	gtk_container_set_border_width( GTK_CONTAINER( hbox ), border );
 	return hbox;
 }
 
-GtkFrame* create_dialog_frame( const char* label, GtkShadowType shadow ){
-	GtkFrame* frame = ui::Frame( label );
-	gtk_widget_show( GTK_WIDGET( frame ) );
-	gtk_frame_set_shadow_type( frame, shadow );
+ui::Frame create_dialog_frame( const char* label, ui::Shadow shadow ){
+	auto frame = ui::Frame( label );
+	frame.show();
+	gtk_frame_set_shadow_type( frame, (GtkShadowType) shadow );
 	return frame;
 }
 
-GtkTable* create_dialog_table( unsigned int rows, unsigned int columns, unsigned int row_spacing, unsigned int col_spacing, int border ){
-	GtkTable* table = ui::Table( rows, columns, FALSE );
-	gtk_widget_show( GTK_WIDGET( table ) );
+ui::Table create_dialog_table( unsigned int rows, unsigned int columns, unsigned int row_spacing, unsigned int col_spacing, int border ){
+	auto table = ui::Table( rows, columns, FALSE );
+	table.show();
 	gtk_table_set_row_spacings( table, row_spacing );
 	gtk_table_set_col_spacings( table, col_spacing );
 	gtk_container_set_border_width( GTK_CONTAINER( table ), border );
 	return table;
 }
 
-GtkButton* create_dialog_button( const char* label, GCallback func, gpointer data ){
-	GtkButton* button = ui::Button( label );
-	gtk_widget_set_size_request( GTK_WIDGET( button ), 64, -1 );
-	gtk_widget_show( GTK_WIDGET( button ) );
-	g_signal_connect( G_OBJECT( button ), "clicked", func, data );
+ui::Button create_dialog_button( const char* label, GCallback func, gpointer data ){
+	auto button = ui::Button( label );
+	gtk_widget_set_size_request( button , 64, -1 );
+	button.show();
+	button.connect( "clicked", func, data );
 	return button;
 }
 
@@ -68,26 +68,26 @@ ui::Window create_dialog_window( ui::Window parent, const char* title, GCallback
 	ui::Window window = create_floating_window( title, parent );
 	gtk_window_set_default_size( window, default_w, default_h );
 	gtk_window_set_position( window, GTK_WIN_POS_CENTER_ON_PARENT );
-	g_signal_connect( G_OBJECT( window ), "delete_event", func, data );
+	window.connect( "delete_event", func, data );
 
 	return window;
 }
 
-gboolean modal_dialog_button_clicked( GtkWidget *widget, ModalDialogButton* button ){
+gboolean modal_dialog_button_clicked( ui::Widget widget, ModalDialogButton* button ){
 	button->m_dialog.loop = false;
 	button->m_dialog.ret = button->m_value;
 	return TRUE;
 }
 
-gboolean modal_dialog_delete( GtkWidget *widget, GdkEvent* event, ModalDialog* dialog ){
+gboolean modal_dialog_delete( ui::Widget widget, GdkEvent* event, ModalDialog* dialog ){
 	dialog->loop = 0;
 	dialog->ret = eIDCANCEL;
 	return TRUE;
 }
 
 EMessageBoxReturn modal_dialog_show( ui::Window window, ModalDialog& dialog ){
-	gtk_grab_add( GTK_WIDGET( window ) );
-	gtk_widget_show( GTK_WIDGET( window ) );
+	gtk_grab_add( window  );
+	window.show();
 
 	dialog.loop = true;
 	while ( dialog.loop )
@@ -95,13 +95,13 @@ EMessageBoxReturn modal_dialog_show( ui::Window window, ModalDialog& dialog ){
 		gtk_main_iteration();
 	}
 
-	gtk_widget_hide( GTK_WIDGET( window ) );
-	gtk_grab_remove( GTK_WIDGET( window ) );
+	window.hide();
+	gtk_grab_remove( window  );
 
 	return dialog.ret;
 }
 
-GtkButton* create_modal_dialog_button( const char* label, ModalDialogButton& button ){
+ui::Button create_modal_dialog_button( const char* label, ModalDialogButton& button ){
 	return create_dialog_button( label, G_CALLBACK( modal_dialog_button_clicked ), &button );
 }
 
@@ -110,7 +110,7 @@ ui::Window create_modal_dialog_window( ui::Window parent, const char* title, Mod
 }
 
 ui::Window create_fixedsize_modal_dialog_window( ui::Window parent, const char* title, ModalDialog& dialog, int width, int height ){
-	ui::Window window = create_modal_dialog_window( parent, title, dialog, width, height );
+	auto window = create_modal_dialog_window( parent, title, dialog, width, height );
 
 	gtk_window_set_resizable( window, FALSE );
 	gtk_window_set_modal( window, TRUE );
@@ -118,74 +118,74 @@ ui::Window create_fixedsize_modal_dialog_window( ui::Window parent, const char*
 
 	window_remove_minmax( window );
 
-	//gtk_widget_set_size_request(GTK_WIDGET(window), width, height);
+	//gtk_widget_set_size_request(window, width, height);
 	//gtk_window_set_default_size(window, width, height);
 	//gtk_window_resize(window, width, height);
 	//GdkGeometry geometry = { width, height, -1, -1, width, height, -1, -1, -1, -1, GDK_GRAVITY_STATIC, };
-	//gtk_window_set_geometry_hints(window, GTK_WIDGET(window), &geometry, (GdkWindowHints)(GDK_HINT_POS|GDK_HINT_MIN_SIZE|GDK_HINT_BASE_SIZE));
+	//gtk_window_set_geometry_hints(window, window, &geometry, (GdkWindowHints)(GDK_HINT_POS|GDK_HINT_MIN_SIZE|GDK_HINT_BASE_SIZE));
 
 	return window;
 }
 
-gboolean dialog_button_ok( GtkWidget *widget, ModalDialog* data ){
+gboolean dialog_button_ok( ui::Widget widget, ModalDialog* data ){
 	data->loop = false;
 	data->ret = eIDOK;
 	return TRUE;
 }
 
-gboolean dialog_button_cancel( GtkWidget *widget, ModalDialog* data ){
+gboolean dialog_button_cancel( ui::Widget widget, ModalDialog* data ){
 	data->loop = false;
 	data->ret = eIDCANCEL;
 	return TRUE;
 }
 
-gboolean dialog_button_yes( GtkWidget *widget, ModalDialog* data ){
+gboolean dialog_button_yes( ui::Widget widget, ModalDialog* data ){
 	data->loop = false;
 	data->ret = eIDYES;
 	return TRUE;
 }
 
-gboolean dialog_button_no( GtkWidget *widget, ModalDialog* data ){
+gboolean dialog_button_no( ui::Widget widget, ModalDialog* data ){
 	data->loop = false;
 	data->ret = eIDNO;
 	return TRUE;
 }
 
-gboolean dialog_delete_callback( GtkWidget *widget, GdkEventAny* event, ModalDialog* data ){
-	gtk_widget_hide( widget );
+gboolean dialog_delete_callback( ui::Widget widget, GdkEventAny* event, ModalDialog* data ){
+	widget.hide();
 	data->loop = false;
 	return TRUE;
 }
 
-ui::Window create_simple_modal_dialog_window( const char* title, ModalDialog& dialog, GtkWidget* contents ){
-	ui::Window window = create_fixedsize_modal_dialog_window(ui::Window(), title, dialog );
+ui::Window create_simple_modal_dialog_window( const char* title, ModalDialog& dialog, ui::Widget contents ){
+	ui::Window window = create_fixedsize_modal_dialog_window(ui::Window{ui::null}, title, dialog );
 
-	GtkVBox* vbox1 = create_dialog_vbox( 8, 4 );
-	gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( vbox1 ) );
+	auto vbox1 = create_dialog_vbox( 8, 4 );
+	window.add(vbox1);
 
-	gtk_container_add( GTK_CONTAINER( vbox1 ), contents );
+	vbox1.add(contents);
 
 	ui::Alignment alignment = ui::Alignment( 0.5, 0.0, 0.0, 0.0 );
-	gtk_widget_show( GTK_WIDGET( alignment ) );
-	gtk_box_pack_start( GTK_BOX( vbox1 ), GTK_WIDGET( alignment ), FALSE, FALSE, 0 );
+	alignment.show();
+	vbox1.pack_start( alignment, FALSE, FALSE, 0 );
 
-	GtkButton* button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog );
-	gtk_container_add( GTK_CONTAINER( alignment ), GTK_WIDGET( button ) );
+	auto button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog );
+	alignment.add(button);
 
 	return window;
 }
 
 RadioHBox RadioHBox_new( StringArrayRange names ){
-	GtkHBox* hbox = ui::HBox( TRUE, 4 );
-	gtk_widget_show( GTK_WIDGET( hbox ) );
+	auto hbox = ui::HBox( TRUE, 4 );
+	hbox.show();
 
 	GSList* group = 0;
-	GtkRadioButton* radio = 0;
+	auto radio = ui::RadioButton(ui::null);
 	for ( StringArrayRange::Iterator i = names.first; i != names.last; ++i )
 	{
-		radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( group, *i ) );
-		gtk_widget_show( GTK_WIDGET( radio ) );
-		gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( radio ), FALSE, FALSE, 0 );
+		radio = ui::RadioButton(GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( group, *i ) ));
+		radio.show();
+		hbox.pack_start( radio, FALSE, FALSE, 0 );
 
 		group = gtk_radio_button_get_group( radio );
 	}
@@ -195,26 +195,26 @@ RadioHBox RadioHBox_new( StringArrayRange names ){
 
 
 PathEntry PathEntry_new(){
-	GtkFrame* frame = ui::Frame();
-	gtk_widget_show( GTK_WIDGET( frame ) );
+	auto frame = ui::Frame();
+	frame.show();
 	gtk_frame_set_shadow_type( frame, GTK_SHADOW_IN );
 
 	// path entry
-	GtkHBox* hbox = ui::HBox( FALSE, 0 );
-	gtk_widget_show( GTK_WIDGET( hbox ) );
+	auto hbox = ui::HBox( FALSE, 0 );
+	hbox.show();
 
-	GtkEntry* entry = ui::Entry();
+	auto entry = ui::Entry(ui::New);
 	gtk_entry_set_has_frame( entry, FALSE );
-	gtk_widget_show( GTK_WIDGET( entry ) );
-	gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( entry ), TRUE, TRUE, 0 );
+	entry.show();
+	hbox.pack_start( entry, TRUE, TRUE, 0 );
 
 	// browse button
-	auto button = ui::Button();
+	auto button = ui::Button(ui::New);
 	button_set_icon( button, "ellipsis.bmp" );
-	gtk_widget_show( GTK_WIDGET( button ) );
-	gtk_box_pack_end( GTK_BOX( hbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
+	button.show();
+	hbox.pack_end(button, FALSE, FALSE, 0);
 
-	gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( hbox ) );
+	frame.add(hbox);
 
 	return PathEntry( frame, entry, button );
 }
@@ -224,34 +224,34 @@ void PathEntry_setPath( PathEntry& self, const char* path ){
 }
 typedef ReferenceCaller1<PathEntry, const char*, PathEntry_setPath> PathEntrySetPathCaller;
 
-void BrowsedPathEntry_clicked( GtkWidget* widget, BrowsedPathEntry* self ){
+void BrowsedPathEntry_clicked( ui::Widget widget, BrowsedPathEntry* self ){
 	self->m_browse( PathEntrySetPathCaller( self->m_entry ) );
 }
 
 BrowsedPathEntry::BrowsedPathEntry( const BrowseCallback& browse ) :
 	m_entry( PathEntry_new() ),
 	m_browse( browse ){
-	g_signal_connect( G_OBJECT( m_entry.m_button ), "clicked", G_CALLBACK( BrowsedPathEntry_clicked ), this );
+	m_entry.m_button.connect( "clicked", G_CALLBACK( BrowsedPathEntry_clicked ), this );
 }
 
 
-GtkLabel* DialogLabel_new( const char* name ){
-	ui::Label label = ui::Label( name );
-	gtk_widget_show(label);
+ui::Label DialogLabel_new( const char* name ){
+	auto label = ui::Label( name );
+	label.show();
 	gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
 	gtk_label_set_justify( label, GTK_JUSTIFY_LEFT );
 
 	return label;
 }
 
-GtkTable* DialogRow_new( const char* name, GtkWidget* widget ){
-	GtkTable* table = ui::Table( 1, 3, TRUE );
-	gtk_widget_show( GTK_WIDGET( table ) );
+ui::Table DialogRow_new( const char* name, ui::Widget widget ){
+	auto table = ui::Table( 1, 3, TRUE );
+	table.show();
 
 	gtk_table_set_col_spacings( table, 4 );
 	gtk_table_set_row_spacings( table, 0 );
 
-	gtk_table_attach( table, GTK_WIDGET( DialogLabel_new( name ) ), 0, 1, 0, 1,
+	gtk_table_attach( table, DialogLabel_new( name  ), 0, 1, 0, 1,
 					  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
 					  (GtkAttachOptions) ( 0 ), 0, 0 );
 
@@ -262,6 +262,6 @@ GtkTable* DialogRow_new( const char* name, GtkWidget* widget ){
 	return table;
 }
 
-void DialogVBox_packRow( GtkVBox* vbox, GtkWidget* row ){
-	gtk_box_pack_start( GTK_BOX( vbox ), row, FALSE, FALSE, 0 );
+void DialogVBox_packRow( ui::VBox vbox, ui::Widget row ){
+	vbox.pack_start( row, FALSE, FALSE, 0 );
 }