X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libs%2Fgtkutil%2Fdialog.cpp;h=dfeece8d43d4004e322dc7abdc821770efffd7f8;hb=57f4ad12206f19d639260384220a5507e7b20086;hp=59f5c5d9328161c359f4f37836eb38778c0fd7dd;hpb=b7e36c120eb1546a6c6f97f30e42ab7f9a559c61;p=xonotic%2Fnetradiant.git diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp index 59f5c5d9..dfeece8d 100644 --- a/libs/gtkutil/dialog.cpp +++ b/libs/gtkutil/dialog.cpp @@ -21,43 +21,34 @@ #include "dialog.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include "button.h" #include "window.h" GtkVBox* create_dialog_vbox( int spacing, int border ){ - GtkVBox* vbox = GTK_VBOX( gtk_vbox_new( FALSE, spacing ) ); + GtkVBox* vbox = ui::VBox( FALSE, spacing ); gtk_widget_show( GTK_WIDGET( vbox ) ); gtk_container_set_border_width( GTK_CONTAINER( vbox ), border ); return vbox; } GtkHBox* create_dialog_hbox( int spacing, int border ){ - GtkHBox* hbox = GTK_HBOX( gtk_hbox_new( FALSE, spacing ) ); + GtkHBox* hbox = ui::HBox( FALSE, spacing ); gtk_widget_show( GTK_WIDGET( hbox ) ); gtk_container_set_border_width( GTK_CONTAINER( hbox ), border ); return hbox; } GtkFrame* create_dialog_frame( const char* label, GtkShadowType shadow ){ - GtkFrame* frame = GTK_FRAME( gtk_frame_new( label ) ); + GtkFrame* frame = ui::Frame( label ); gtk_widget_show( GTK_WIDGET( frame ) ); gtk_frame_set_shadow_type( frame, 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 = GTK_TABLE( gtk_table_new( rows, columns, FALSE ) ); + GtkTable* table = ui::Table( rows, columns, FALSE ); gtk_widget_show( GTK_WIDGET( table ) ); gtk_table_set_row_spacings( table, row_spacing ); gtk_table_set_col_spacings( table, col_spacing ); @@ -66,15 +57,15 @@ GtkTable* create_dialog_table( unsigned int rows, unsigned int columns, unsigned } GtkButton* create_dialog_button( const char* label, GCallback func, gpointer data ){ - GtkButton* button = GTK_BUTTON( gtk_button_new_with_label( label ) ); + 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 ); return button; } -GtkWindow* create_dialog_window( GtkWindow* parent, const char* title, GCallback func, gpointer data, int default_w, int default_h ){ - GtkWindow* window = create_floating_window( title, parent ); +ui::Window create_dialog_window( ui::Window parent, const char* title, GCallback func, gpointer data, int default_w, int default_h ){ + 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 ); @@ -94,7 +85,7 @@ gboolean modal_dialog_delete( GtkWidget *widget, GdkEvent* event, ModalDialog* d return TRUE; } -EMessageBoxReturn modal_dialog_show( GtkWindow* window, ModalDialog& dialog ){ +EMessageBoxReturn modal_dialog_show( ui::Window window, ModalDialog& dialog ){ gtk_grab_add( GTK_WIDGET( window ) ); gtk_widget_show( GTK_WIDGET( window ) ); @@ -114,12 +105,12 @@ GtkButton* create_modal_dialog_button( const char* label, ModalDialogButton& but return create_dialog_button( label, G_CALLBACK( modal_dialog_button_clicked ), &button ); } -GtkWindow* create_modal_dialog_window( GtkWindow* parent, const char* title, ModalDialog& dialog, int default_w, int default_h ){ +ui::Window create_modal_dialog_window( ui::Window parent, const char* title, ModalDialog& dialog, int default_w, int default_h ){ return create_dialog_window( parent, title, G_CALLBACK( modal_dialog_delete ), &dialog, default_w, default_h ); } -GtkWindow* create_fixedsize_modal_dialog_window( GtkWindow* parent, const char* title, ModalDialog& dialog, int width, int height ){ - GtkWindow* window = create_modal_dialog_window( parent, title, dialog, width, height ); +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 ); gtk_window_set_resizable( window, FALSE ); gtk_window_set_modal( window, TRUE ); @@ -166,15 +157,15 @@ gboolean dialog_delete_callback( GtkWidget *widget, GdkEventAny* event, ModalDia return TRUE; } -GtkWindow* create_simple_modal_dialog_window( const char* title, ModalDialog& dialog, GtkWidget* contents ){ - GtkWindow* window = create_fixedsize_modal_dialog_window( 0, title, dialog ); +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 ); GtkVBox* vbox1 = create_dialog_vbox( 8, 4 ); gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( vbox1 ) ); gtk_container_add( GTK_CONTAINER( vbox1 ), contents ); - GtkAlignment* alignment = GTK_ALIGNMENT( gtk_alignment_new( 0.5, 0.0, 0.0, 0.0 ) ); + 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 ); @@ -185,7 +176,7 @@ GtkWindow* create_simple_modal_dialog_window( const char* title, ModalDialog& di } RadioHBox RadioHBox_new( StringArrayRange names ){ - GtkHBox* hbox = GTK_HBOX( gtk_hbox_new( TRUE, 4 ) ); + GtkHBox* hbox = ui::HBox( TRUE, 4 ); gtk_widget_show( GTK_WIDGET( hbox ) ); GSList* group = 0; @@ -204,21 +195,21 @@ RadioHBox RadioHBox_new( StringArrayRange names ){ PathEntry PathEntry_new(){ - GtkFrame* frame = GTK_FRAME( gtk_frame_new( NULL ) ); + GtkFrame* frame = ui::Frame(); gtk_widget_show( GTK_WIDGET( frame ) ); gtk_frame_set_shadow_type( frame, GTK_SHADOW_IN ); // path entry - GtkHBox* hbox = GTK_HBOX( gtk_hbox_new( FALSE, 0 ) ); + GtkHBox* hbox = ui::HBox( FALSE, 0 ); gtk_widget_show( GTK_WIDGET( hbox ) ); - GtkEntry* entry = GTK_ENTRY( gtk_entry_new() ); + GtkEntry* entry = ui::Entry(); 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 ); // browse button - GtkButton* button = GTK_BUTTON( gtk_button_new() ); + auto button = ui::Button(); 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 ); @@ -245,8 +236,8 @@ BrowsedPathEntry::BrowsedPathEntry( const BrowseCallback& browse ) : GtkLabel* DialogLabel_new( const char* name ){ - GtkLabel* label = GTK_LABEL( gtk_label_new( name ) ); - gtk_widget_show( GTK_WIDGET( label ) ); + ui::Label label = ui::Label( name ); + gtk_widget_show(label); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); gtk_label_set_justify( label, GTK_JUSTIFY_LEFT ); @@ -254,7 +245,7 @@ GtkLabel* DialogLabel_new( const char* name ){ } GtkTable* DialogRow_new( const char* name, GtkWidget* widget ){ - GtkTable* table = GTK_TABLE( gtk_table_new( 1, 3, TRUE ) ); + GtkTable* table = ui::Table( 1, 3, TRUE ); gtk_widget_show( GTK_WIDGET( table ) ); gtk_table_set_col_spacings( table, 4 );