Wrap GtkVBox

diff --git a/contrib/bkgrnd2d/dialog.cpp b/contrib/bkgrnd2d/dialog.cpp
index 687efb10de636faa9f60498501bf6aa845738ebc..afa934b4c63edc955a4f28a008972849d1f3213f 100644 (file)
--- a/contrib/bkgrnd2d/dialog.cpp
+++ b/contrib/bkgrnd2d/dialog.cpp
@@ -196,7 +196,7 @@ CBackgroundDialogPage::CBackgroundDialogPage( VIEWTYPE vt ){
                break;
        }
 // A vbox to hold everything
                break;
        }
 // A vbox to hold everything

-       m_pWidget = gtk_vbox_new( FALSE,0 );
+       m_pWidget = ui::VBox( FALSE,0 );

 // Frame for file row
        frame = gtk_frame_new( "File" );
        gtk_box_pack_start( GTK_BOX( m_pWidget ),frame, FALSE, FALSE, 2 );
 // Frame for file row
        frame = gtk_frame_new( "File" );
        gtk_box_pack_start( GTK_BOX( m_pWidget ),frame, FALSE, FALSE, 2 );

diff --git a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp
index 3cbc232b009ab4bca05c6bafe501abbf5be33463..08f1205c6c2abd7d8f3c74d27d32a09c509c76be 100644 (file)
--- a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp
+++ b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp
@@ -225,7 +225,7 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess
        g_object_set_data( G_OBJECT( window ), "ret", &ret );
        gtk_widget_realize( window );
 
        g_object_set_data( G_OBJECT( window ), "ret", &ret );
        gtk_widget_realize( window );
 

-       vbox = ui::Widget(gtk_vbox_new( FALSE, 10 ));
+       vbox = ui::VBox( FALSE, 10 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -343,7 +343,7 @@ EMessageBoxReturn DoIntersectBox( IntersectRS* rs ){
 
 
 
 
 
 

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -441,7 +441,7 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){
 
 
 
 
 
 

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -454,7 +454,7 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){
        // ---- hbox ----
 
 
        // ---- hbox ----
 
 

-       vbox2 = gtk_vbox_new( FALSE, 10 );
+       vbox2 = ui::VBox( FALSE, 10 );

        gtk_box_pack_start( GTK_BOX( hbox ), vbox2, FALSE, FALSE, 2 );
        gtk_widget_show( vbox2 );
 
        gtk_box_pack_start( GTK_BOX( hbox ), vbox2, FALSE, FALSE, 2 );
        gtk_widget_show( vbox2 );
 


@@ -500,7 +500,7 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){
 
 
 
 
 
 

-       vbox2 = gtk_vbox_new( FALSE, 10 );
+       vbox2 = ui::VBox( FALSE, 10 );

        gtk_box_pack_start( GTK_BOX( hbox ), vbox2, FALSE, FALSE, 2 );
        gtk_widget_show( vbox2 );
 
        gtk_box_pack_start( GTK_BOX( hbox ), vbox2, FALSE, FALSE, 2 );
        gtk_widget_show( vbox2 );
 


@@ -615,7 +615,7 @@ EMessageBoxReturn DoBuildStairsBox( BuildStairsRS* rs ){
        gtk_widget_realize( window );
 
        // new vbox
        gtk_widget_realize( window );
 
        // new vbox

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -876,7 +876,7 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){
        LoadGList( GetFilename( buffer, "plugins/bt/door-tex.txt" ), &listMainTextures );
        LoadGList( GetFilename( buffer, "plugins/bt/door-tex-trim.txt" ), &listTrimTextures );
 
        LoadGList( GetFilename( buffer, "plugins/bt/door-tex.txt" ), &listMainTextures );
        LoadGList( GetFilename( buffer, "plugins/bt/door-tex-trim.txt" ), &listTrimTextures );
 

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -1086,7 +1086,7 @@ EMessageBoxReturn DoPathPlotterBox( PathPlotterRS* rs ){
 
 
 
 
 
 

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -1257,7 +1257,7 @@ EMessageBoxReturn DoCTFColourChangeBox(){
 
 
 
 
 
 

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -1326,7 +1326,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){
 
        gtk_widget_realize( window );
 
 
        gtk_widget_realize( window );
 

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -1662,7 +1662,7 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){
 
        gtk_widget_realize( window );
 
 
        gtk_widget_realize( window );
 

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -1927,7 +1927,7 @@ EMessageBoxReturn DoMakeChainBox( MakeChainRS* rs ){
        gtk_widget_realize( window );
 
        // new vbox
        gtk_widget_realize( window );
 
        // new vbox

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 

diff --git a/contrib/brushexport/interface.cpp b/contrib/brushexport/interface.cpp
index ee679ba7c0fedd342dc40fb9c74672c34c48f4d8..4cd532c098675da995d8d1732f628cc890901b4d 100644 (file)
--- a/contrib/brushexport/interface.cpp
+++ b/contrib/brushexport/interface.cpp
@@ -47,7 +47,7 @@ create_w_plugplug2( void ){
        gtk_window_set_position( GTK_WINDOW( w_plugplug2 ), GTK_WIN_POS_CENTER );
        gtk_window_set_destroy_with_parent( GTK_WINDOW( w_plugplug2 ), TRUE );
 
        gtk_window_set_position( GTK_WINDOW( w_plugplug2 ), GTK_WIN_POS_CENTER );
        gtk_window_set_destroy_with_parent( GTK_WINDOW( w_plugplug2 ), TRUE );
 

-       vbox1 = gtk_vbox_new( FALSE, 0 );
+       vbox1 = ui::VBox( FALSE, 0 );

        gtk_widget_set_name( vbox1, "vbox1" );
        gtk_widget_show( vbox1 );
        gtk_container_add( GTK_CONTAINER( w_plugplug2 ), vbox1 );
        gtk_widget_set_name( vbox1, "vbox1" );
        gtk_widget_show( vbox1 );
        gtk_container_add( GTK_CONTAINER( w_plugplug2 ), vbox1 );


@@ -59,7 +59,7 @@ create_w_plugplug2( void ){
        gtk_box_pack_start( GTK_BOX( vbox1 ), hbox2, FALSE, FALSE, 0 );
        gtk_container_set_border_width( GTK_CONTAINER( hbox2 ), 5 );
 
        gtk_box_pack_start( GTK_BOX( vbox1 ), hbox2, FALSE, FALSE, 0 );
        gtk_container_set_border_width( GTK_CONTAINER( hbox2 ), 5 );
 

-       vbox4 = gtk_vbox_new( TRUE, 0 );
+       vbox4 = ui::VBox( TRUE, 0 );

        gtk_widget_set_name( vbox4, "vbox4" );
        gtk_widget_show( vbox4 );
        gtk_box_pack_start( GTK_BOX( hbox2 ), vbox4, TRUE, FALSE, 0 );
        gtk_widget_set_name( vbox4, "vbox4" );
        gtk_widget_show( vbox4 );
        gtk_box_pack_start( GTK_BOX( hbox2 ), vbox4, TRUE, FALSE, 0 );


@@ -88,7 +88,7 @@ create_w_plugplug2( void ){
        gtk_radio_button_set_group( GTK_RADIO_BUTTON( r_nocollapse ), r_collapse_group );
        r_collapse_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( r_nocollapse ) );
 
        gtk_radio_button_set_group( GTK_RADIO_BUTTON( r_nocollapse ), r_collapse_group );
        r_collapse_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( r_nocollapse ) );
 

-       vbox3 = gtk_vbox_new( FALSE, 0 );
+       vbox3 = ui::VBox( FALSE, 0 );

        gtk_widget_set_name( vbox3, "vbox3" );
        gtk_widget_show( vbox3 );
        gtk_box_pack_start( GTK_BOX( hbox2 ), vbox3, FALSE, FALSE, 0 );
        gtk_widget_set_name( vbox3, "vbox3" );
        gtk_widget_show( vbox3 );
        gtk_box_pack_start( GTK_BOX( hbox2 ), vbox3, FALSE, FALSE, 0 );


@@ -105,7 +105,7 @@ create_w_plugplug2( void ){
        gtk_box_pack_start( GTK_BOX( vbox3 ), b_close, TRUE, FALSE, 0 );
        gtk_container_set_border_width( GTK_CONTAINER( b_close ), 5 );
 
        gtk_box_pack_start( GTK_BOX( vbox3 ), b_close, TRUE, FALSE, 0 );
        gtk_container_set_border_width( GTK_CONTAINER( b_close ), 5 );
 

-       vbox2 = gtk_vbox_new( FALSE, 5 );
+       vbox2 = ui::VBox( FALSE, 5 );

        gtk_widget_set_name( vbox2, "vbox2" );
        gtk_widget_show( vbox2 );
        gtk_box_pack_start( GTK_BOX( vbox1 ), vbox2, TRUE, TRUE, 0 );
        gtk_widget_set_name( vbox2, "vbox2" );
        gtk_widget_show( vbox2 );
        gtk_box_pack_start( GTK_BOX( vbox1 ), vbox2, TRUE, TRUE, 0 );

diff --git a/contrib/camera/dialogs.cpp b/contrib/camera/dialogs.cpp
index 63ccbb9aaa1061d200900dcabb2469a3070aa554..a314b974f8050b120f3b10d6b0130925f5e61ca0 100644 (file)
--- a/contrib/camera/dialogs.cpp
+++ b/contrib/camera/dialogs.cpp
@@ -81,7 +81,7 @@ static gint ci_new( GtkWidget *widget, gpointer data ){
        gtk_widget_realize( window );
 
        // fill the window
        gtk_widget_realize( window );
 
        // fill the window

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -95,7 +95,7 @@ static gint ci_new( GtkWidget *widget, gpointer data ){
        gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
        gtk_widget_show( frame );
 
        gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
        gtk_widget_show( frame );
 

-       vbox2 = gtk_vbox_new( FALSE, 5 );
+       vbox2 = ui::VBox( FALSE, 5 );

        gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
        gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
        gtk_widget_show( vbox2 );
        gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
        gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
        gtk_widget_show( vbox2 );


@@ -374,7 +374,7 @@ static gint ci_rename( GtkWidget *widget, gpointer data ){
        gtk_widget_realize( window );
 
        // fill the window
        gtk_widget_realize( window );
 
        // fill the window

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -493,7 +493,7 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ){
        gtk_widget_realize( window );
 
        // fill the window
        gtk_widget_realize( window );
 
        // fill the window

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -524,7 +524,7 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ){
        gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
        gtk_widget_show( frame );
 
        gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
        gtk_widget_show( frame );
 

-       vbox2 = gtk_vbox_new( FALSE, 5 );
+       vbox2 = ui::VBox( FALSE, 5 );

        gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
        gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
        gtk_widget_show( vbox2 );
        gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
        gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
        gtk_widget_show( vbox2 );


@@ -841,7 +841,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ){
        gtk_widget_realize( window );
 
        // fill the window
        gtk_widget_realize( window );
 
        // fill the window

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 


@@ -855,7 +855,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ){
        gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
        gtk_widget_show( frame );
 
        gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
        gtk_widget_show( frame );
 

-       vbox2 = gtk_vbox_new( FALSE, 5 );
+       vbox2 = ui::VBox( FALSE, 5 );

        gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
        gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
        gtk_widget_show( vbox2 );
        gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
        gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
        gtk_widget_show( vbox2 );


@@ -1020,7 +1020,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
        // the properties column
        // -------------------------- //
 
        // the properties column
        // -------------------------- //
 

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_widget_show( vbox );
        gtk_table_attach( GTK_TABLE( table ), vbox, 0, 1, 0, 1,
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
        gtk_widget_show( vbox );
        gtk_table_attach( GTK_TABLE( table ), vbox, 0, 1, 0, 1,
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),


@@ -1076,7 +1076,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                          (GtkAttachOptions) ( GTK_FILL ), 0, 0 );
 
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                          (GtkAttachOptions) ( GTK_FILL ), 0, 0 );
 

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_container_add( GTK_CONTAINER( frame ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( frame ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
        gtk_widget_show( vbox );


@@ -1170,7 +1170,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                          (GtkAttachOptions) ( GTK_FILL ), 0, 0 );
 
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                          (GtkAttachOptions) ( GTK_FILL ), 0, 0 );
 

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_container_add( GTK_CONTAINER( frame ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( frame ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
        gtk_widget_show( vbox );


@@ -1268,7 +1268,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
        gtk_clist_set_column_auto_resize( GTK_CLIST( g_pEventsList ), 2, TRUE );
        gtk_widget_show( g_pEventsList );
 
        gtk_clist_set_column_auto_resize( GTK_CLIST( g_pEventsList ), 2, TRUE );
        gtk_widget_show( g_pEventsList );
 

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_box_pack_start( GTK_BOX( hbox ), vbox, FALSE, FALSE, 0 );
        gtk_widget_show( vbox );
 
        gtk_box_pack_start( GTK_BOX( hbox ), vbox, FALSE, FALSE, 0 );
        gtk_widget_show( vbox );
 

diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp
index d341948ac0d987fad9eb06f31925944cd4740b76..9cd424bb218d748c03b0599e101b115f43a73e30 100644 (file)
--- a/contrib/gtkgensurf/gendlgs.cpp
+++ b/contrib/gtkgensurf/gendlgs.cpp
@@ -1390,7 +1390,7 @@ GtkWidget* create_main_dialog(){
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
 
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
 

-       vbox = gtk_vbox_new( TRUE, 5 );
+       vbox = ui::VBox( TRUE, 5 );

        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( frame ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( frame ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );


@@ -1411,7 +1411,7 @@ GtkWidget* create_main_dialog(){
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
 
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
 

-       vbox = gtk_vbox_new( TRUE, 5 );
+       vbox = ui::VBox( TRUE, 5 );

        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( frame ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( frame ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );


@@ -1432,7 +1432,7 @@ GtkWidget* create_main_dialog(){
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
 
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
 

-       vbox = gtk_vbox_new( TRUE, 5 );
+       vbox = ui::VBox( TRUE, 5 );

        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( frame ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( frame ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );


@@ -1524,7 +1524,7 @@ GtkWidget* create_main_dialog(){
        gtk_widget_set_usize( spin, 60, -2 );
        g_object_set_data( G_OBJECT( dlg ), "random", spin );
 
        gtk_widget_set_usize( spin, 60, -2 );
        g_object_set_data( G_OBJECT( dlg ), "random", spin );
 

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_widget_show( vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
 
        gtk_widget_show( vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
 


@@ -1786,7 +1786,7 @@ GtkWidget* create_main_dialog(){
        g_object_set_data( G_OBJECT( dlg ), "linearborder", check );
        g_signal_connect( G_OBJECT( check ), "toggled", G_CALLBACK( extents_linearborder ), NULL );
 
        g_object_set_data( G_OBJECT( dlg ), "linearborder", check );
        g_signal_connect( G_OBJECT( check ), "toggled", G_CALLBACK( extents_linearborder ), NULL );
 

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_widget_show( vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
 
        gtk_widget_show( vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
 


@@ -1892,7 +1892,7 @@ GtkWidget* create_main_dialog(){
        g_object_set_data( G_OBJECT( dlg ), "bmp_white", entry );
        g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &gbmp.white_value );
 
        g_object_set_data( G_OBJECT( dlg ), "bmp_white", entry );
        g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &gbmp.white_value );
 

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_widget_show( vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
 
        gtk_widget_show( vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
 


@@ -1987,7 +1987,7 @@ GtkWidget* create_main_dialog(){
        g_object_set_data( G_OBJECT( dlg ), "fix_freeall", button );
        g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( fix_freeall ), NULL );
 
        g_object_set_data( G_OBJECT( dlg ), "fix_freeall", button );
        g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( fix_freeall ), NULL );
 

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_widget_show( vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
 
        gtk_widget_show( vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
 


@@ -2134,7 +2134,7 @@ GtkWidget* create_main_dialog(){
        g_object_set_data( G_OBJECT( dlg ), "terrain_ent", check );
        g_signal_connect( G_OBJECT( check ), "toggled", G_CALLBACK( texture_terrainent ), NULL );
 
        g_object_set_data( G_OBJECT( dlg ), "terrain_ent", check );
        g_signal_connect( G_OBJECT( check ), "toggled", G_CALLBACK( texture_terrainent ), NULL );
 

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_widget_show( vbox );
        gtk_box_pack_start( GTK_BOX( hbox ), vbox, FALSE, TRUE, 0 );
 
        gtk_widget_show( vbox );
        gtk_box_pack_start( GTK_BOX( hbox ), vbox, FALSE, TRUE, 0 );
 

diff --git a/contrib/gtkgensurf/view.cpp b/contrib/gtkgensurf/view.cpp
index 1b27db56fa3c4a8b4d7118b7622f5deb9cf7d87e..51f588ecbb2dc5d4bd4debd19261b870523b4aff 100644 (file)
--- a/contrib/gtkgensurf/view.cpp
+++ b/contrib/gtkgensurf/view.cpp
@@ -378,7 +378,7 @@ void CreateViewWindow(){
        gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pWnd ) );
        gtk_window_set_default_size( GTK_WINDOW( dlg ), 300, 400 );
 
        gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pWnd ) );
        gtk_window_set_default_size( GTK_WINDOW( dlg ), 300, 400 );
 

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( dlg ), vbox );
 
        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( dlg ), vbox );
 

diff --git a/contrib/hydratoolz/plugin.cpp b/contrib/hydratoolz/plugin.cpp
index f790bf305f9599a0dba7cdcb428f38b839dd0435..76cda55b5c2b8007b775f08c3803fab082b06869 100644 (file)
--- a/contrib/hydratoolz/plugin.cpp
+++ b/contrib/hydratoolz/plugin.cpp
@@ -95,7 +95,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
        gtk_object_set_data( GTK_OBJECT( window ), "ret", &ret );
        gtk_widget_realize( window );
 
        gtk_object_set_data( GTK_OBJECT( window ), "ret", &ret );
        gtk_widget_realize( window );
 

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 

diff --git a/contrib/prtview/AboutDialog.cpp b/contrib/prtview/AboutDialog.cpp
index 4b3719d00b29ea28b6a4897a6001cc709a2a4312..dbc16ca6b90a6e6a1fb46a61065b7d6145390145 100644 (file)
--- a/contrib/prtview/AboutDialog.cpp
+++ b/contrib/prtview/AboutDialog.cpp
@@ -77,7 +77,7 @@ void DoAboutDlg(){
        gtk_box_pack_start( GTK_BOX( hbox ), label, TRUE, TRUE, 0 );
        gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
 
        gtk_box_pack_start( GTK_BOX( hbox ), label, TRUE, TRUE, 0 );
        gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
 

-       vbox = gtk_vbox_new( FALSE, 0 );
+       vbox = ui::VBox( FALSE, 0 );

        gtk_widget_show( vbox );
        gtk_box_pack_start( GTK_BOX( hbox ), vbox, FALSE, FALSE, 0 );
 
        gtk_widget_show( vbox );
        gtk_box_pack_start( GTK_BOX( hbox ), vbox, FALSE, FALSE, 0 );
 

diff --git a/contrib/prtview/ConfigDialog.cpp b/contrib/prtview/ConfigDialog.cpp
index be8c3197906fe11ff2b219af7a74a1f723f5492a..3bedca33e2d9ca7955f2f6f309e051be37335e9e 100644 (file)
--- a/contrib/prtview/ConfigDialog.cpp
+++ b/contrib/prtview/ConfigDialog.cpp
@@ -256,7 +256,7 @@ void DoConfigDialog(){
        g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
        g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
 
        g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
        g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
 

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( dlg ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( dlg ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );


@@ -265,7 +265,7 @@ void DoConfigDialog(){
        gtk_widget_show( frame );
        gtk_box_pack_start( GTK_BOX( vbox ), frame, TRUE, TRUE, 0 );
 
        gtk_widget_show( frame );
        gtk_box_pack_start( GTK_BOX( vbox ), frame, TRUE, TRUE, 0 );
 

-       vbox2 = gtk_vbox_new( FALSE, 5 );
+       vbox2 = ui::VBox( FALSE, 5 );

        gtk_widget_show( vbox2 );
        gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
        gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
        gtk_widget_show( vbox2 );
        gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
        gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );


@@ -415,7 +415,7 @@ void DoConfigDialog(){
        gtk_widget_show( frame );
        gtk_box_pack_start( GTK_BOX( vbox ), frame, TRUE, TRUE, 0 );
 
        gtk_widget_show( frame );
        gtk_box_pack_start( GTK_BOX( vbox ), frame, TRUE, TRUE, 0 );
 

-       vbox2 = gtk_vbox_new( FALSE, 5 );
+       vbox2 = ui::VBox( FALSE, 5 );

        gtk_widget_show( vbox2 );
        gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
        gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
        gtk_widget_show( vbox2 );
        gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
        gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );

diff --git a/contrib/prtview/LoadPortalFileDialog.cpp b/contrib/prtview/LoadPortalFileDialog.cpp
index f3d4df8d06a0104867dd8d1b259e9d9b168a1016..f91404f0ae8a4110699a678c291286e23bfc994d 100644 (file)
--- a/contrib/prtview/LoadPortalFileDialog.cpp
+++ b/contrib/prtview/LoadPortalFileDialog.cpp
@@ -117,7 +117,7 @@ int DoLoadPortalFileDialog(){
        g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
        g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
 
        g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
        g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
 

-       vbox = gtk_vbox_new( FALSE, 5 );
+       vbox = ui::VBox( FALSE, 5 );

        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( dlg ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( dlg ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );

diff --git a/contrib/sunplug/sunplug.cpp b/contrib/sunplug/sunplug.cpp
index df782bdf75de4356a92f16ab9e05a4c95055028c..77ef38440fc2423b8ad93023cb03874b3bb65a90 100644 (file)
--- a/contrib/sunplug/sunplug.cpp
+++ b/contrib/sunplug/sunplug.cpp
@@ -265,7 +265,7 @@ void about_plugin_window(){
        gtk_window_set_modal( GTK_WINDOW( window ), TRUE ); // force the user not to do something with the other windows
        gtk_container_set_border_width( GTK_CONTAINER( window ), 10 ); // set the border of the window
 
        gtk_window_set_modal( GTK_WINDOW( window ), TRUE ); // force the user not to do something with the other windows
        gtk_container_set_border_width( GTK_CONTAINER( window ), 10 ); // set the border of the window
 

-       vbox = gtk_vbox_new( FALSE, 10 ); // create a box to arrange new objects vertically
+       vbox = ui::VBox( FALSE, 10 ); // create a box to arrange new objects vertically

        gtk_container_add( GTK_CONTAINER( window ), vbox ); // add the box to the window
 
        label = ui::Label( "SunPlug v1.0 for NetRadiant 1.5\nby Topsun" ); // create a label
        gtk_container_add( GTK_CONTAINER( window ), vbox ); // add the box to the window
 
        label = ui::Label( "SunPlug v1.0 for NetRadiant 1.5\nby Topsun" ); // create a label


@@ -331,7 +331,7 @@ void MapCoordinator(){
        gtk_window_set_modal( GTK_WINDOW( window ), TRUE ); // force the user not to do something with the other windows
        gtk_container_set_border_width( GTK_CONTAINER( window ), 10 ); // set the border of the window
 
        gtk_window_set_modal( GTK_WINDOW( window ), TRUE ); // force the user not to do something with the other windows
        gtk_container_set_border_width( GTK_CONTAINER( window ), 10 ); // set the border of the window
 

-       vbox = gtk_vbox_new( FALSE, 10 ); // create a box to arrange new objects vertically
+       vbox = ui::VBox( FALSE, 10 ); // create a box to arrange new objects vertically

        gtk_container_add( GTK_CONTAINER( window ), vbox ); // add the box to the window
 
        scene::Path path = makeReference( GlobalSceneGraph().root() ); // get the path to the root element of the graph
        gtk_container_add( GTK_CONTAINER( window ), vbox ); // add the box to the window
 
        scene::Path path = makeReference( GlobalSceneGraph().root() ); // get the path to the root element of the graph

diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index 852d06e282b52c129fe12651a1eebd391ac32662..092d7ce08dd9dab5d78f18a3844b8a893604aba3 100644 (file)
--- a/libs/gtkutil/dialog.cpp
+++ b/libs/gtkutil/dialog.cpp
@@ -36,7 +36,7 @@
 #include "window.h"
 
 GtkVBox* create_dialog_vbox( int spacing, int border ){
 #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;
        gtk_widget_show( GTK_WIDGET( vbox ) );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), border );
        return vbox;

diff --git a/libs/uilib/uilib.cpp b/libs/uilib/uilib.cpp
index 08f4b1c7e99d809464a97b8c932bab8179e20b0d..acb2d65aac214ad5ad0f0e94ca4231ddaea12b57 100644 (file)
--- a/libs/uilib/uilib.cpp
+++ b/libs/uilib/uilib.cpp
@@ -97,4 +97,7 @@ namespace ui {
     TreeView::TreeView(TreeModel model) : TreeView(GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)))
     { }
 
     TreeView::TreeView(TreeModel model) : TreeView(GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)))
     { }
 

+    VBox::VBox(bool homogenous, int spacing) : VBox(GTK_VBOX(gtk_vbox_new(homogenous, spacing)))
+    { }
+

 }
 }

diff --git a/libs/uilib/uilib.h b/libs/uilib/uilib.h
index fb726994658a9ac0b4e2088d1fba0ef11e4e80f6..50115238acab27c7411b752c1652e1c8156758be 100644 (file)
--- a/libs/uilib/uilib.h
+++ b/libs/uilib/uilib.h
@@ -12,6 +12,7 @@ using ui_modal = struct ModalDialog;
 using ui_treemodel = struct _GtkTreeModel;
 using ui_treeview = struct _GtkTreeView;
 using ui_typeinst = struct _GTypeInstance;
 using ui_treemodel = struct _GtkTreeModel;
 using ui_treeview = struct _GtkTreeView;
 using ui_typeinst = struct _GTypeInstance;

+using ui_vbox = struct _GtkVBox;

 using ui_widget = struct _GtkWidget;
 using ui_window = struct _GtkWindow;
 
 using ui_widget = struct _GtkWidget;
 using ui_window = struct _GtkWindow;
 


@@ -135,6 +136,10 @@ namespace ui {
          TreeView(TreeModel model);
     );
 
          TreeView(TreeModel model);
     );
 

+    WRAP(VBox, ui_vbox,
+         VBox(bool homogenous, int spacing);
+    );
+

 #undef WRAP
 
 }
 #undef WRAP
 
 }

diff --git a/plugins/textool/TexTool.cpp b/plugins/textool/TexTool.cpp
index cebd2359d2550f1eff1c5d0e73bf9fdf05060659..f8ed360f79a9d8fedc0eaeb22a50ddb189c6b368 100644 (file)
--- a/plugins/textool/TexTool.cpp
+++ b/plugins/textool/TexTool.cpp
@@ -65,7 +65,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
        g_object_set_data( G_OBJECT( window ), "ret", &ret );
        gtk_widget_realize( window );
 
        g_object_set_data( G_OBJECT( window ), "ret", &ret );
        gtk_widget_realize( window );
 

-       vbox = gtk_vbox_new( FALSE, 10 );
+       vbox = ui::VBox( FALSE, 10 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 

diff --git a/radiant/entityinspector.cpp b/radiant/entityinspector.cpp
index 7eb95ff1d0fdb14ca683755e2588da8ae09212b6..4d30f8fe03b8eb740880bdf507bd1270a4e1aa11 100644 (file)
--- a/radiant/entityinspector.cpp
+++ b/radiant/entityinspector.cpp
@@ -1304,7 +1304,7 @@ void EntityInspector_destroyWindow( ui::Widget widget, gpointer data ){
 }
 
 ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){
 }
 
 ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){

-       ui::Widget vbox = ui::Widget(gtk_vbox_new( FALSE, 2 ));
+       ui::Widget vbox = ui::VBox( FALSE, 2 );

        gtk_widget_show( vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 2 );
 
        gtk_widget_show( vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 2 );
 


@@ -1387,7 +1387,7 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){
                        gtk_widget_show( split2 );
 
                        {
                        gtk_widget_show( split2 );
 
                        {

-                               ui::Widget vbox2 = ui::Widget(gtk_vbox_new( FALSE, 2 ));
+                               ui::Widget vbox2 = ui::VBox( FALSE, 2 );

                                gtk_widget_show( vbox2 );
                                gtk_paned_pack1( GTK_PANED( split2 ), vbox2, FALSE, FALSE );
 
                                gtk_widget_show( vbox2 );
                                gtk_paned_pack1( GTK_PANED( split2 ), vbox2, FALSE, FALSE );
 


@@ -1528,7 +1528,7 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){
                                gtk_widget_show( viewport );
                                gtk_viewport_set_shadow_type( GTK_VIEWPORT( viewport ), GTK_SHADOW_NONE );
 
                                gtk_widget_show( viewport );
                                gtk_viewport_set_shadow_type( GTK_VIEWPORT( viewport ), GTK_SHADOW_NONE );
 

-                               g_attributeBox = GTK_VBOX( gtk_vbox_new( FALSE, 2 ) );
+                               g_attributeBox = ui::VBox( FALSE, 2 );

                                gtk_widget_show( GTK_WIDGET( g_attributeBox ) );
 
                                gtk_container_add( GTK_CONTAINER( viewport ), GTK_WIDGET( g_attributeBox ) );
                                gtk_widget_show( GTK_WIDGET( g_attributeBox ) );
 
                                gtk_container_add( GTK_CONTAINER( viewport ), GTK_WIDGET( g_attributeBox ) );

diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp
index 36db069f86471e9e773c5a1a97e1437b5a2be0a7..104f1ee4146e0e1215d2a5db41929918978c8adb 100644 (file)
--- a/radiant/findtexturedialog.cpp
+++ b/radiant/findtexturedialog.cpp
@@ -148,7 +148,7 @@ ui::Window FindTextureDialog::BuildDialog(){
        gtk_container_add( GTK_CONTAINER( dlg ), GTK_WIDGET( hbox ) );
        gtk_container_set_border_width( GTK_CONTAINER( hbox ), 5 );
 
        gtk_container_add( GTK_CONTAINER( dlg ), GTK_WIDGET( hbox ) );
        gtk_container_set_border_width( GTK_CONTAINER( hbox ), 5 );
 

-       vbox = ui::Widget(gtk_vbox_new( FALSE, 5 ));
+       vbox = ui::VBox( FALSE, 5 );

        gtk_widget_show( vbox );
        gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 );
 
        gtk_widget_show( vbox );
        gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 );
 


@@ -197,7 +197,7 @@ ui::Window FindTextureDialog::BuildDialog(){
        gtk_box_pack_start( GTK_BOX( vbox ), check, TRUE, TRUE, 0 );
        AddDialogData( *GTK_TOGGLE_BUTTON( check ), m_bSelectedOnly );
 
        gtk_box_pack_start( GTK_BOX( vbox ), check, TRUE, TRUE, 0 );
        AddDialogData( *GTK_TOGGLE_BUTTON( check ), m_bSelectedOnly );
 

-       vbox = ui::Widget(gtk_vbox_new( FALSE, 5 ));
+       vbox = ui::VBox( FALSE, 5 );

        gtk_widget_show( vbox );
        gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), FALSE, FALSE, 0 );
 
        gtk_widget_show( vbox );
        gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), FALSE, FALSE, 0 );
 

diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index 1536daf75de41d9a8735baf9d4bd7dd880e26ce5..e51934392f2c113cf275ef05bd9460e104d21597 100644 (file)
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -755,7 +755,7 @@ static void CreateGtkTextEditor(){
                                          G_CALLBACK( editor_delete ), 0 );
        gtk_window_set_default_size( GTK_WINDOW( dlg ), 600, 300 );
 
                                          G_CALLBACK( editor_delete ), 0 );
        gtk_window_set_default_size( GTK_WINDOW( dlg ), 600, 300 );
 

-       vbox = ui::Widget(gtk_vbox_new( FALSE, 5 ));
+       vbox = ui::VBox( FALSE, 5 );

        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( dlg ), GTK_WIDGET( vbox ) );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( dlg ), GTK_WIDGET( vbox ) );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 447296bdef8a22eb29da77795682f40c214c887d..755d56da37def45d6a4369567b9d943ec6a41bb3 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -2733,7 +2733,7 @@ void MainFrame::Create(){
 
        GetPlugInMgr().Init( window );
 
 
        GetPlugInMgr().Init( window );
 

-       ui::Widget vbox = ui::Widget(gtk_vbox_new( FALSE, 0 ));
+       ui::Widget vbox = ui::VBox( FALSE, 0 );

        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 
        gtk_container_add( GTK_CONTAINER( window ), vbox );
        gtk_widget_show( vbox );
 

diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp
index 98e0894eddd8f3d6771a9328626a79710ca94e2a..6840c6bf153d06ab30ae4a64d0a3901180ab6f8b 100644 (file)
--- a/radiant/patchdialog.cpp
+++ b/radiant/patchdialog.cpp
@@ -573,7 +573,7 @@ ui::Window PatchInspector::BuildDialog(){
 
 
        {
 
 
        {

-               GtkVBox* vbox = GTK_VBOX( gtk_vbox_new( FALSE, 5 ) );
+               GtkVBox* vbox = ui::VBox( FALSE, 5 );

                gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
                gtk_widget_show( GTK_WIDGET( vbox ) );
                gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( vbox ) );
                gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
                gtk_widget_show( GTK_WIDGET( vbox ) );
                gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( vbox ) );


@@ -582,7 +582,7 @@ ui::Window PatchInspector::BuildDialog(){
                        gtk_widget_show( GTK_WIDGET( hbox ) );
                        gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hbox ), TRUE, TRUE, 0 );
                        {
                        gtk_widget_show( GTK_WIDGET( hbox ) );
                        gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hbox ), TRUE, TRUE, 0 );
                        {

-                               GtkVBox* vbox2 = GTK_VBOX( gtk_vbox_new( FALSE, 0 ) );
+                               GtkVBox* vbox2 = ui::VBox( FALSE, 0 );

                                gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 0 );
                                gtk_widget_show( GTK_WIDGET( vbox2 ) );
                                gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox2 ), TRUE, TRUE, 0 );
                                gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 0 );
                                gtk_widget_show( GTK_WIDGET( vbox2 ) );
                                gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox2 ), TRUE, TRUE, 0 );


@@ -591,7 +591,7 @@ ui::Window PatchInspector::BuildDialog(){
                                        gtk_widget_show( GTK_WIDGET( frame ) );
                                        gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( frame ), TRUE, TRUE, 0 );
                                        {
                                        gtk_widget_show( GTK_WIDGET( frame ) );
                                        gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( frame ), TRUE, TRUE, 0 );
                                        {

-                                               GtkVBox* vbox3 = GTK_VBOX( gtk_vbox_new( FALSE, 5 ) );
+                                               GtkVBox* vbox3 = ui::VBox( FALSE, 5 );

                                                gtk_container_set_border_width( GTK_CONTAINER( vbox3 ), 5 );
                                                gtk_widget_show( GTK_WIDGET( vbox3 ) );
                                                gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox3 ) );
                                                gtk_container_set_border_width( GTK_CONTAINER( vbox3 ), 5 );
                                                gtk_widget_show( GTK_WIDGET( vbox3 ) );
                                                gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox3 ) );


@@ -738,7 +738,7 @@ ui::Window PatchInspector::BuildDialog(){
                                        gtk_widget_show( GTK_WIDGET( frame ) );
                                        gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( frame ), TRUE, TRUE, 0 );
                                        {
                                        gtk_widget_show( GTK_WIDGET( frame ) );
                                        gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( frame ), TRUE, TRUE, 0 );
                                        {

-                                               GtkVBox* vbox3 = GTK_VBOX( gtk_vbox_new( FALSE, 5 ) );
+                                               GtkVBox* vbox3 = ui::VBox( FALSE, 5 );

                                                gtk_container_set_border_width( GTK_CONTAINER( vbox3 ), 5 );
                                                gtk_widget_show( GTK_WIDGET( vbox3 ) );
                                                gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox3 ) );
                                                gtk_container_set_border_width( GTK_CONTAINER( vbox3 ), 5 );
                                                gtk_widget_show( GTK_WIDGET( vbox3 ) );
                                                gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox3 ) );


@@ -806,7 +806,7 @@ ui::Window PatchInspector::BuildDialog(){
                                gtk_widget_show( GTK_WIDGET( frame ) );
                                gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( frame ), TRUE, TRUE, 0 );
                                {
                                gtk_widget_show( GTK_WIDGET( frame ) );
                                gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( frame ), TRUE, TRUE, 0 );
                                {

-                                       GtkVBox* vbox2 = GTK_VBOX( gtk_vbox_new( FALSE, 5 ) );
+                                       GtkVBox* vbox2 = ui::VBox( FALSE, 5 );

                                        gtk_widget_show( GTK_WIDGET( vbox2 ) );
                                        gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox2 ) );
                                        gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
                                        gtk_widget_show( GTK_WIDGET( vbox2 ) );
                                        gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox2 ) );
                                        gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index f93f6b45e1ac5be75411d1d4be6d15f79e06bf79..1c02b1408ed9a1368db0dbf579d5ecfed4dd7728 100644 (file)
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -666,7 +666,7 @@ ui::Widget PreferencePages_addPage( ui::Widget notebook, const char* name ){
        gtk_container_set_border_width( GTK_CONTAINER( pageframe ), 4 );
        gtk_widget_show( pageframe );
 
        gtk_container_set_border_width( GTK_CONTAINER( pageframe ), 4 );
        gtk_widget_show( pageframe );
 

-       ui::Widget vbox = ui::Widget(gtk_vbox_new( FALSE, 4 ));
+       ui::Widget vbox = ui::VBox( FALSE, 4 );

        gtk_widget_show( vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 4 );
        gtk_container_add( GTK_CONTAINER( pageframe ), vbox );
        gtk_widget_show( vbox );
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 4 );
        gtk_container_add( GTK_CONTAINER( pageframe ), vbox );


@@ -704,7 +704,7 @@ ui::Window PrefsDlg::BuildDialog(){
        ui::Window dialog = ui::Window(create_floating_window( "NetRadiant Preferences", m_parent ));
 
        {
        ui::Window dialog = ui::Window(create_floating_window( "NetRadiant Preferences", m_parent ));
 
        {

-               ui::Widget mainvbox = ui::Widget(gtk_vbox_new( FALSE, 5 ));
+               ui::Widget mainvbox = ui::VBox( FALSE, 5 );

                gtk_container_add( GTK_CONTAINER( dialog ), mainvbox );
                gtk_container_set_border_width( GTK_CONTAINER( mainvbox ), 5 );
                gtk_widget_show( mainvbox );
                gtk_container_add( GTK_CONTAINER( dialog ), mainvbox );
                gtk_container_set_border_width( GTK_CONTAINER( mainvbox ), 5 );
                gtk_widget_show( mainvbox );

diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp
index ebd828c4641d0d7f97550b46003c52891c8fa7b3..acd1f650132b3181e73d81aeaa409b106c292b83 100644 (file)
--- a/radiant/surfacedialog.cpp
+++ b/radiant/surfacedialog.cpp
@@ -599,7 +599,7 @@ ui::Window SurfaceInspector::BuildDialog(){
 
        {
                // replaced by only the vbox:
 
        {
                // replaced by only the vbox:

-               ui::Widget vbox = ui::Widget(gtk_vbox_new( FALSE, 5 ));
+               ui::Widget vbox = ui::VBox( FALSE, 5 );

                gtk_widget_show( vbox );
                gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( vbox ) );
                gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
                gtk_widget_show( vbox );
                gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( vbox ) );
                gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );


@@ -948,7 +948,7 @@ ui::Window SurfaceInspector::BuildDialog(){
                                gtk_widget_show( GTK_WIDGET( frame ) );
                                gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( frame ), TRUE, TRUE, 0 );
                                {
                                gtk_widget_show( GTK_WIDGET( frame ) );
                                gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( frame ), TRUE, TRUE, 0 );
                                {

-                                       GtkVBox* vbox3 = GTK_VBOX( gtk_vbox_new( FALSE, 4 ) );
+                                       GtkVBox* vbox3 = ui::VBox( FALSE, 4 );

                                        //gtk_container_set_border_width(GTK_CONTAINER(vbox3), 4);
                                        gtk_widget_show( GTK_WIDGET( vbox3 ) );
                                        gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox3 ) );
                                        //gtk_container_set_border_width(GTK_CONTAINER(vbox3), 4);
                                        gtk_widget_show( GTK_WIDGET( vbox3 ) );
                                        gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox3 ) );


@@ -983,7 +983,7 @@ ui::Window SurfaceInspector::BuildDialog(){
                                gtk_widget_show( GTK_WIDGET( frame ) );
                                gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( frame ), TRUE, TRUE, 0 );
                                {
                                gtk_widget_show( GTK_WIDGET( frame ) );
                                gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( frame ), TRUE, TRUE, 0 );
                                {

-                                       GtkVBox* vbox3 = GTK_VBOX( gtk_vbox_new( FALSE, 4 ) );
+                                       GtkVBox* vbox3 = ui::VBox( FALSE, 4 );

                                        //gtk_container_set_border_width(GTK_CONTAINER(vbox3), 4);
                                        gtk_widget_show( GTK_WIDGET( vbox3 ) );
                                        gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox3 ) );
                                        //gtk_container_set_border_width(GTK_CONTAINER(vbox3), 4);
                                        gtk_widget_show( GTK_WIDGET( vbox3 ) );
                                        gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox3 ) );


@@ -1022,7 +1022,7 @@ ui::Window SurfaceInspector::BuildDialog(){
                                gtk_widget_show( GTK_WIDGET( frame ) );
                                gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( frame ), TRUE, TRUE, 0 );
                                {
                                gtk_widget_show( GTK_WIDGET( frame ) );
                                gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( frame ), TRUE, TRUE, 0 );
                                {

-                                       GtkVBox* vbox3 = GTK_VBOX( gtk_vbox_new( FALSE, 4 ) );
+                                       GtkVBox* vbox3 = ui::VBox( FALSE, 4 );

                                        gtk_container_set_border_width( GTK_CONTAINER( vbox3 ), 4 );
                                        gtk_widget_show( GTK_WIDGET( vbox3 ) );
                                        gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox3 ) );
                                        gtk_container_set_border_width( GTK_CONTAINER( vbox3 ), 4 );
                                        gtk_widget_show( GTK_WIDGET( vbox3 ) );
                                        gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox3 ) );

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 7c8808df2246883322242a0e73c2eeda146d022e..65587fd49ce415c8e73b0f580c1e58c2db1f4837 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -1951,7 +1951,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){
 
        ui::Widget table = ui::Widget(gtk_table_new( 3, 3, FALSE ));
        ui::Widget frame_table;
 
        ui::Widget table = ui::Widget(gtk_table_new( 3, 3, FALSE ));
        ui::Widget frame_table;

-       ui::Widget vbox = ui::Widget(gtk_vbox_new( FALSE, 0 ));
+       ui::Widget vbox = ui::VBox( FALSE, 0 );

        gtk_table_attach( GTK_TABLE( table ), vbox, 0, 1, 1, 3, GTK_FILL, GTK_FILL, 0, 0 );
        gtk_widget_show( vbox );
 
        gtk_table_attach( GTK_TABLE( table ), vbox, 0, 1, 1, 3, GTK_FILL, GTK_FILL, 0, 0 );
        gtk_widget_show( vbox );