X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=libs%2Fgtkutil%2Fdialog.cpp;h=aa8aad47d0a873046151804c55d918f01c5ee973;hb=e9bb12b9916f5cdc3834e83a8e0b2569545630cb;hp=c5eb96d37fb4404f467543b15f807e4a4d311b3c;hpb=2951e448a7f008f2438be4bd5feba2e4f4400eef;p=xonotic%2Fnetradiant.git

diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index c5eb96d3..aa8aad47 100644
--- a/libs/gtkutil/dialog.cpp
+++ b/libs/gtkutil/dialog.cpp
@@ -58,7 +58,7 @@ ui::Table create_dialog_table( unsigned int rows, unsigned int columns, unsigned
 
 ui::Button create_dialog_button( const char* label, GCallback func, gpointer data ){
 	auto button = ui::Button( label );
-	gtk_widget_set_size_request( GTK_WIDGET( button ), 64, -1 );
+	button.dimensions(64, -1);
 	button.show();
 	button.connect( "clicked", func, data );
 	return button;
@@ -86,8 +86,8 @@ gboolean modal_dialog_delete( ui::Widget widget, GdkEvent* event, ModalDialog* d
 }
 
 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 )
@@ -96,7 +96,7 @@ EMessageBoxReturn modal_dialog_show( ui::Window window, ModalDialog& dialog ){
 	}
 
 	window.hide();
-	gtk_grab_remove( GTK_WIDGET( window ) );
+	gtk_grab_remove( window  );
 
 	return dialog.ret;
 }
@@ -118,11 +118,11 @@ 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);
+	//window.dimensions(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;
 }
@@ -166,7 +166,7 @@ ui::Window create_simple_modal_dialog_window( const char* title, ModalDialog& di
 	vbox1.add(contents);
 
 	ui::Alignment alignment = ui::Alignment( 0.5, 0.0, 0.0, 0.0 );
-	gtk_widget_show( GTK_WIDGET( alignment ) );
+	alignment.show();
 	vbox1.pack_start( alignment, FALSE, FALSE, 0 );
 
 	auto button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog );
@@ -177,14 +177,14 @@ ui::Window create_simple_modal_dialog_window( const char* title, ModalDialog& di
 
 RadioHBox RadioHBox_new( StringArrayRange names ){
 	auto hbox = ui::HBox( TRUE, 4 );
-	gtk_widget_show( GTK_WIDGET( hbox ) );
+	hbox.show();
 
 	GSList* group = 0;
 	auto radio = ui::RadioButton(ui::null);
 	for ( StringArrayRange::Iterator i = names.first; i != names.last; ++i )
 	{
-		radio = ui::RadioButton(GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( group, *i ) ));
-		gtk_widget_show( GTK_WIDGET( radio ) );
+		radio = ui::RadioButton::from( gtk_radio_button_new_with_label( group, *i ) );
+		radio.show();
 		hbox.pack_start( radio, FALSE, FALSE, 0 );
 
 		group = gtk_radio_button_get_group( radio );
@@ -201,17 +201,17 @@ PathEntry PathEntry_new(){
 
 	// path entry
 	auto hbox = ui::HBox( FALSE, 0 );
-	gtk_widget_show( GTK_WIDGET( hbox ) );
+	hbox.show();
 
 	auto entry = ui::Entry(ui::New);
 	gtk_entry_set_has_frame( entry, FALSE );
-	gtk_widget_show( GTK_WIDGET( entry ) );
+	entry.show();
 	hbox.pack_start( entry, TRUE, TRUE, 0 );
 
 	// browse button
 	auto button = ui::Button(ui::New);
-	button_set_icon( button, "ellipsis.bmp" );
-	gtk_widget_show( GTK_WIDGET( button ) );
+	button_set_icon( button, "ellipsis.png" );
+	button.show();
 	hbox.pack_end(button, FALSE, FALSE, 0);
 
 	frame.add(hbox);
@@ -222,7 +222,7 @@ PathEntry PathEntry_new(){
 void PathEntry_setPath( PathEntry& self, const char* path ){
 	gtk_entry_set_text( self.m_entry, path );
 }
-typedef ReferenceCaller1<PathEntry, const char*, PathEntry_setPath> PathEntrySetPathCaller;
+typedef ReferenceCaller<PathEntry, void(const char*), PathEntry_setPath> PathEntrySetPathCaller;
 
 void BrowsedPathEntry_clicked( ui::Widget widget, BrowsedPathEntry* self ){
 	self->m_browse( PathEntrySetPathCaller( self->m_entry ) );
@@ -237,7 +237,7 @@ BrowsedPathEntry::BrowsedPathEntry( const BrowseCallback& browse ) :
 
 ui::Label DialogLabel_new( const char* name ){
 	auto label = ui::Label( name );
-	gtk_widget_show(label);
+	label.show();
 	gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
 	gtk_label_set_justify( label, GTK_JUSTIFY_LEFT );
 
@@ -246,22 +246,18 @@ ui::Label DialogLabel_new( const char* name ){
 
 ui::Table DialogRow_new( const char* name, ui::Widget widget ){
 	auto table = ui::Table( 1, 3, TRUE );
-	gtk_widget_show( GTK_WIDGET( table ) );
+	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,
-					  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-					  (GtkAttachOptions) ( 0 ), 0, 0 );
+    table.attach(DialogLabel_new(name), {0, 1, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
 
-	gtk_table_attach( table, widget, 1, 3, 0, 1,
-					  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-					  (GtkAttachOptions) ( 0 ), 0, 0 );
+    table.attach(widget, {1, 3, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
 
 	return table;
 }
 
-void DialogVBox_packRow( ui::VBox vbox, ui::Widget row ){
+void DialogVBox_packRow( ui::Box vbox, ui::Widget row ){
 	vbox.pack_start( row, FALSE, FALSE, 0 );
 }