From: TimePath Date: Fri, 29 Dec 2017 10:53:21 +0000 (+1100) Subject: GTK: wrap gtk_widget_show X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fd6b262a39ceeda3f991fc6bd8f767353d149374;p=xonotic%2Fnetradiant.git GTK: wrap gtk_widget_show --- diff --git a/contrib/bkgrnd2d/dialog.cpp b/contrib/bkgrnd2d/dialog.cpp index e2e58760..f6b0fb7f 100644 --- a/contrib/bkgrnd2d/dialog.cpp +++ b/contrib/bkgrnd2d/dialog.cpp @@ -210,13 +210,13 @@ CBackgroundDialogPage::CBackgroundDialogPage( VIEWTYPE vt ){ //TODO set min size ? done with spaces right now hbox.pack_start(m_pFileLabel, TRUE, TRUE, 5 ); - gtk_widget_show( m_pFileLabel ); + m_pFileLabel.show(); w = ui::Button( "Browse..." ); w.connect( "clicked", G_CALLBACK( browse_callback ), ( gpointer ) this ); hbox.pack_start(w, FALSE, FALSE, 5 ); gtk_tooltips_set_tip( pTooltips, w, "Select a file", NULL ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Reload" ); w.connect( "clicked", G_CALLBACK( reload_callback ), ( gpointer ) this ); @@ -224,10 +224,10 @@ CBackgroundDialogPage::CBackgroundDialogPage( VIEWTYPE vt ){ // gtk_widget_set_sensitive(w,FALSE); gtk_tooltips_set_tip( pTooltips, w, "Reload current file", NULL ); hbox.pack_start(w, FALSE, FALSE, 5 ); - gtk_widget_show( w ); + w.show(); - gtk_widget_show( hbox ); - gtk_widget_show( frame ); + hbox.show(); + frame.show(); // second row (rendering options) frame = ui::Frame( "Rendering" ); @@ -239,7 +239,7 @@ CBackgroundDialogPage::CBackgroundDialogPage( VIEWTYPE vt ){ w = ui::Label( "Vertex alpha:" ); hbox.pack_start(w, FALSE, FALSE, 5 ); - gtk_widget_show( w ); + w.show(); w = ui::HScale( 0.0, 1.0, 0.01 ); gtk_range_set_value( GTK_RANGE( w ),0.5 ); @@ -247,10 +247,10 @@ CBackgroundDialogPage::CBackgroundDialogPage( VIEWTYPE vt ){ w.connect( "value-changed", G_CALLBACK( alpha_adjust_callback ), ( gpointer ) this ); hbox.pack_start(w, TRUE, TRUE, 5 ); gtk_tooltips_set_tip( pTooltips, w, "Set image transparancy", NULL ); - gtk_widget_show( w ); + w.show(); - gtk_widget_show( hbox ); - gtk_widget_show( frame ); + hbox.show(); + frame.show(); // Third row (size and position) frame = ui::Frame( "Size/Position (undefined)" ); m_pPosLabel = gtk_frame_get_label_widget( GTK_FRAME( frame ) ); @@ -264,20 +264,20 @@ CBackgroundDialogPage::CBackgroundDialogPage( VIEWTYPE vt ){ hbox.pack_start(w, TRUE, FALSE, 5 ); w.connect( "clicked", G_CALLBACK( size_sel_callback ), ( gpointer ) this ); gtk_tooltips_set_tip( pTooltips, w, "Set the size of the image to the bounding rectangle of all selected brushes and entities", NULL ); - gtk_widget_show( w ); + w.show(); if ( m_vt == XY ) { w = ui::Button( "from map mins/maxs" ); hbox.pack_start(w, TRUE, FALSE, 2 ); w.connect( "clicked", G_CALLBACK( size_mm_callback ), ( gpointer ) this ); gtk_tooltips_set_tip( pTooltips, w, "Set the size of the image using the mapcoordsmins and mapcoordsmaxs keys of the worldspawn entity", NULL ); - gtk_widget_show( w ); + w.show(); } - gtk_widget_show( hbox ); - gtk_widget_show( frame ); + hbox.show(); + frame.show(); - gtk_widget_show( m_pWidget ); + m_pWidget.show(); } void CBackgroundDialogPage::Append( GtkWidget *notebook ){ @@ -329,7 +329,7 @@ void InitBackgroundDialog(){ gtk_box_pack_start( GTK_BOX( GTK_DIALOG( pDialogWnd )->vbox ), pNotebook, TRUE, TRUE, 0 ); - gtk_widget_show( pNotebook ); + pNotebook.show(); gtk_widget_realize( pDialogWnd ); } diff --git a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp index 817a4e1e..15ccf8e1 100644 --- a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp +++ b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp @@ -221,20 +221,20 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess auto vbox = ui::VBox( FALSE, 10 ); window.add(vbox); - gtk_widget_show( vbox ); + vbox.show(); w = ui::Label( lpText ); vbox.pack_start( w, FALSE, FALSE, 2 ); gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT ); - gtk_widget_show( w ); + w.show(); w = ui::Widget(gtk_hseparator_new()); vbox.pack_start( w, FALSE, FALSE, 2 ); - gtk_widget_show( w ); + w.show(); auto hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); if ( type == eMB_OK ) { w = ui::Button( "Ok" ); @@ -242,7 +242,7 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); gtk_widget_set_can_default(w, true); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); ret = eIDOK; } else if ( type == eMB_OKCANCEL ) { @@ -251,12 +251,12 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; } else if ( type == eMB_YESNOCANCEL ) { @@ -265,17 +265,17 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "No" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; } else /* if (mode == MB_YESNO) */ @@ -285,17 +285,17 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "No" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) ); - gtk_widget_show( w ); + w.show(); ret = eIDNO; } gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); while ( loop ) @@ -328,18 +328,18 @@ EMessageBoxReturn DoIntersectBox( IntersectRS* rs ){ auto vbox = ui::VBox( FALSE, 10 ); window.add(vbox); - gtk_widget_show( vbox ); + vbox.show(); // ---- vbox ---- auto radio1 = ui::Widget(gtk_radio_button_new_with_label( NULL, "Use Whole Map" )); vbox.pack_start( radio1, FALSE, FALSE, 2 ); - gtk_widget_show( radio1 ); + radio1.show(); auto radio2 = ui::Widget(gtk_radio_button_new_with_label( gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio1)), "Use Selected Brushes" )); vbox.pack_start( radio2, FALSE, FALSE, 2 ); - gtk_widget_show( radio2 ); + radio2.show(); auto hsep = ui::Widget(gtk_hseparator_new()); vbox.pack_start( hsep, FALSE, FALSE, 2 ); @@ -347,15 +347,15 @@ EMessageBoxReturn DoIntersectBox( IntersectRS* rs ){ auto check1 = ui::CheckButton( "Include Detail Brushes" ); vbox.pack_start( check1, FALSE, FALSE, 0 ); - gtk_widget_show( check1 ); + check1.show(); auto check2 = ui::CheckButton( "Select Duplicate Brushes Only" ); vbox.pack_start( check2, FALSE, FALSE, 0 ); - gtk_widget_show( check2 ); + check2.show(); auto hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); // ---- hbox ---- ok/cancel buttons @@ -365,12 +365,12 @@ EMessageBoxReturn DoIntersectBox( IntersectRS* rs ){ gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; // ---- /hbox ---- @@ -378,7 +378,7 @@ EMessageBoxReturn DoIntersectBox( IntersectRS* rs ){ // ---- /vbox ---- gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); while ( loop ) @@ -427,50 +427,50 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){ auto hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); // ---- hbox ---- auto vbox2 = ui::VBox( FALSE, 10 ); hbox.pack_start( vbox2, FALSE, FALSE, 2 ); - gtk_widget_show( vbox2 ); + vbox2.show(); // ---- vbox2 ---- auto hbox2 = ui::HBox( FALSE, 10 ); vbox2.pack_start( hbox2, FALSE, FALSE, 2 ); - gtk_widget_show( hbox2 ); + hbox2.show(); // ---- hbox2 ---- auto text1 = ui::Entry( 256 ); gtk_entry_set_text( (GtkEntry*)text1, "3" ); hbox2.pack_start( text1, FALSE, FALSE, 2 ); - gtk_widget_show( text1 ); + text1.show(); auto l = ui::Label( "Number Of Sides" ); hbox2.pack_start( l, FALSE, FALSE, 2 ); gtk_label_set_justify( GTK_LABEL( l ), GTK_JUSTIFY_LEFT ); - gtk_widget_show( l ); + l.show(); // ---- /hbox2 ---- hbox2 = ui::HBox( FALSE, 10 ); vbox2.pack_start( hbox2, FALSE, FALSE, 2 ); - gtk_widget_show( hbox2 ); + hbox2.show(); // ---- hbox2 ---- auto text2 = ui::Entry( 256 ); gtk_entry_set_text( (GtkEntry*)text2, "8" ); hbox2.pack_start( text2, FALSE, FALSE, 2 ); - gtk_widget_show( text2 ); + text2.show(); l = ui::Label( "Border Width" ); hbox2.pack_start( l, FALSE, FALSE, 2 ); gtk_label_set_justify( GTK_LABEL( l ), GTK_JUSTIFY_LEFT ); - gtk_widget_show( l ); + l.show(); // ---- /hbox2 ---- @@ -480,23 +480,23 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){ vbox2 = ui::VBox( FALSE, 10 ); hbox.pack_start( vbox2, FALSE, FALSE, 2 ); - gtk_widget_show( vbox2 ); + vbox2.show(); // ---- vbox2 ---- auto check1 = ui::CheckButton( "Use Border" ); vbox2.pack_start( check1, FALSE, FALSE, 0 ); - gtk_widget_show( check1 ); + check1.show(); auto check2 = ui::CheckButton( "Inverse Polygon" ); vbox2.pack_start( check2, FALSE, FALSE, 0 ); - gtk_widget_show( check2 ); + check2.show(); auto check3 = ui::CheckButton( "Align Top Edge" ); vbox2.pack_start( check3, FALSE, FALSE, 0 ); - gtk_widget_show( check3 ); + check3.show(); // ---- /vbox2 ---- @@ -504,7 +504,7 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){ hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); // ---- hbox ---- @@ -514,12 +514,12 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){ gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; // ---- /hbox ---- @@ -527,7 +527,7 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){ // ---- /vbox ---- gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); bool dialogError = TRUE; @@ -589,51 +589,51 @@ EMessageBoxReturn DoBuildStairsBox( BuildStairsRS* rs ){ // new vbox auto vbox = ui::VBox( FALSE, 10 ); window.add(vbox); - gtk_widget_show( vbox ); + vbox.show(); auto hbox = ui::HBox( FALSE, 10 ); vbox.add(hbox); - gtk_widget_show( hbox ); + hbox.show(); // dunno if you want this text or not ... ui::Widget w = ui::Label( text ); hbox.pack_start( w, FALSE, FALSE, 0 ); // not entirely sure on all the parameters / what they do ... - gtk_widget_show( w ); + w.show(); w = ui::Widget(gtk_hseparator_new()); vbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); // ------------------------- // indenting == good way of keeping track of lines :) // new hbox hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); auto textStairHeight = ui::Entry( 256 ); hbox.pack_start( textStairHeight, FALSE, FALSE, 1 ); - gtk_widget_show( textStairHeight ); + textStairHeight.show(); w = ui::Label( "Stair Height" ); hbox.pack_start( w, FALSE, FALSE, 1 ); - gtk_widget_show( w ); + w.show(); // ------------------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Label( "Direction:" ); hbox.pack_start( w, FALSE, FALSE, 5 ); - gtk_widget_show( w ); + w.show(); // -------------------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); // radio buttons confuse me ... // but this _looks_ right @@ -643,57 +643,57 @@ EMessageBoxReturn DoBuildStairsBox( BuildStairsRS* rs ){ auto radioNorth = ui::Widget(gtk_radio_button_new_with_label( NULL, "North" )); hbox.pack_start( radioNorth, FALSE, FALSE, 3 ); - gtk_widget_show( radioNorth ); + radioNorth.show(); radioDirection = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radioNorth ) ); auto radioSouth = ui::Widget(gtk_radio_button_new_with_label( radioDirection, "South" )); hbox.pack_start( radioSouth, FALSE, FALSE, 2 ); - gtk_widget_show( radioSouth ); + radioSouth.show(); radioDirection = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radioSouth ) ); auto radioEast = ui::Widget(gtk_radio_button_new_with_label( radioDirection, "East" )); hbox.pack_start( radioEast, FALSE, FALSE, 1 ); - gtk_widget_show( radioEast ); + radioEast.show(); radioDirection = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radioEast ) ); auto radioWest = ui::Widget(gtk_radio_button_new_with_label( radioDirection, "West" )); hbox.pack_start( radioWest, FALSE, FALSE, 0 ); - gtk_widget_show( radioWest ); + radioWest.show(); // --------------------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Label( "Style:" ); hbox.pack_start( w, FALSE, FALSE, 5 ); - gtk_widget_show( w ); + w.show(); // --------------------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); auto radioOldStyle = ui::Widget(gtk_radio_button_new_with_label( NULL, "Original" )); hbox.pack_start( radioOldStyle, FALSE, FALSE, 0 ); - gtk_widget_show( radioOldStyle ); + radioOldStyle.show(); radioStyle = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radioOldStyle ) ); auto radioBobStyle = ui::Widget(gtk_radio_button_new_with_label( radioStyle, "Bob's Style" )); hbox.pack_start( radioBobStyle, FALSE, FALSE, 0 ); - gtk_widget_show( radioBobStyle ); + radioBobStyle.show(); radioStyle = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radioBobStyle ) ); auto radioCornerStyle = ui::Widget(gtk_radio_button_new_with_label( radioStyle, "Corner Style" )); hbox.pack_start( radioCornerStyle, FALSE, FALSE, 0 ); - gtk_widget_show( radioCornerStyle ); + radioCornerStyle.show(); // err, the q3r has an if or something so you need bob style checked before this // is "ungreyed out" but you'll need to do that, as i suck :) @@ -704,63 +704,63 @@ EMessageBoxReturn DoBuildStairsBox( BuildStairsRS* rs ){ auto checkUseDetail = ui::CheckButton( "Use Detail Brushes" ); hbox.pack_start( checkUseDetail, FALSE, FALSE, 0 ); - gtk_widget_show( checkUseDetail ); + checkUseDetail.show(); // --------------------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); auto textMainTex = ui::Entry( 512 ); gtk_entry_set_text( GTK_ENTRY( textMainTex ), rs->mainTexture ); hbox.pack_start( textMainTex, FALSE, FALSE, 0 ); - gtk_widget_show( textMainTex ); + textMainTex.show(); w = ui::Label( "Main Texture" ); hbox.pack_start( w, FALSE, FALSE, 1 ); - gtk_widget_show( w ); + w.show(); // -------------------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); auto textRiserTex = ui::Entry( 512 ); hbox.pack_start( textRiserTex, FALSE, FALSE, 0 ); - gtk_widget_show( textRiserTex ); + textRiserTex.show(); w = ui::Label( "Riser Texture" ); hbox.pack_start( w, FALSE, FALSE, 1 ); - gtk_widget_show( w ); + w.show(); // -------------------------- // w = ui::Widget(gtk_hseparator_new()); vbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Button( "OK" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; // +djbob: need our "little" modal loop mars :P gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); bool dialogError = TRUE; @@ -844,82 +844,82 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){ auto vbox = ui::VBox( FALSE, 10 ); window.add(vbox); - gtk_widget_show( vbox ); + vbox.show(); // -------------------------- // auto hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); auto textFrontBackTex = ui::Entry( 512 ); gtk_entry_set_text( GTK_ENTRY( textFrontBackTex ), rs->mainTexture ); hbox.pack_start( textFrontBackTex, FALSE, FALSE, 0 ); - gtk_widget_show( textFrontBackTex ); + textFrontBackTex.show(); ui::Widget w = ui::Label( "Door Front/Back Texture" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); // ------------------------ // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); auto textTrimTex = ui::Entry( 512 ); hbox.pack_start( textTrimTex, FALSE, FALSE, 0 ); - gtk_widget_show( textTrimTex ); + textTrimTex.show(); w = ui::Label( "Door Trim Texture" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); // ----------------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); // sp: horizontally ???? // djbob: yes mars, u can spell :] auto checkScaleMainH = ui::CheckButton( "Scale Main Texture Horizontally" ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( checkScaleMainH ), TRUE ); hbox.pack_start( checkScaleMainH, FALSE, FALSE, 0 ); - gtk_widget_show( checkScaleMainH ); + checkScaleMainH.show(); auto checkScaleTrimH = ui::CheckButton( "Scale Trim Texture Horizontally" ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( checkScaleTrimH ), TRUE ); hbox.pack_start( checkScaleTrimH, FALSE, FALSE, 0 ); - gtk_widget_show( checkScaleTrimH ); + checkScaleTrimH.show(); // ---------------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); auto checkScaleMainV = ui::CheckButton( "Scale Main Texture Vertically" ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( checkScaleMainV ), TRUE ); hbox.pack_start( checkScaleMainV, FALSE, FALSE, 0 ); - gtk_widget_show( checkScaleMainV ); + checkScaleMainV.show(); auto checkScaleTrimV = ui::CheckButton( "Scale Trim Texture Vertically" ); hbox.pack_start( checkScaleTrimV, FALSE, FALSE, 0 ); - gtk_widget_show( checkScaleTrimV ); + checkScaleTrimV.show(); // --------------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); // djbob: lists added auto comboMain = ui::ComboBox(GTK_COMBO_BOX(gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(listMainTextures)))); gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(comboMain), 0); hbox.pack_start( comboMain, FALSE, FALSE, 0 ); - gtk_widget_show( comboMain ); + comboMain.show(); tw1.one = textFrontBackTex; tw1.two = comboMain; @@ -927,18 +927,18 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){ auto buttonSetMain = ui::Button( "Set As Main Texture" ); buttonSetMain.connect( "clicked", G_CALLBACK( dialog_button_callback_settex ), &tw1 ); hbox.pack_start( buttonSetMain, FALSE, FALSE, 0 ); - gtk_widget_show( buttonSetMain ); + buttonSetMain.show(); // ------------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); auto comboTrim = ui::ComboBox(GTK_COMBO_BOX(gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(listTrimTextures)))); gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(comboMain), 0); hbox.pack_start( comboTrim, FALSE, FALSE, 0 ); - gtk_widget_show( comboTrim ); + comboTrim.show(); tw2.one = textTrimTex; tw2.two = comboTrim; @@ -946,59 +946,59 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){ auto buttonSetTrim = ui::Button( "Set As Trim Texture" ); buttonSetTrim.connect( "clicked", G_CALLBACK( dialog_button_callback_settex ), &tw2 ); hbox.pack_start( buttonSetTrim, FALSE, FALSE, 0 ); - gtk_widget_show( buttonSetTrim ); + buttonSetTrim.show(); // ------------------ // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Label( "Orientation" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); // argh more radio buttons! auto radioNS = ui::Widget(gtk_radio_button_new_with_label( NULL, "North - South" )); hbox.pack_start( radioNS, FALSE, FALSE, 0 ); - gtk_widget_show( radioNS ); + radioNS.show(); radioOrientation = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radioNS ) ); auto radioEW = ui::Widget(gtk_radio_button_new_with_label( radioOrientation, "East - West" )); hbox.pack_start( radioEW, FALSE, FALSE, 0 ); - gtk_widget_show( radioEW ); + radioEW.show(); // ----------------- // w = ui::Widget(gtk_hseparator_new()); vbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); // ----------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Button( "OK" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; // ----------------- // //+djbob gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); while ( loop ) @@ -1049,80 +1049,80 @@ EMessageBoxReturn DoPathPlotterBox( PathPlotterRS* rs ){ auto vbox = ui::VBox( FALSE, 10 ); window.add(vbox); - gtk_widget_show( vbox ); + vbox.show(); // ---- vbox ---- auto hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); // ---- hbox ---- auto text1 = ui::Entry( 256 ); gtk_entry_set_text( text1, "25" ); hbox.pack_start( text1, FALSE, FALSE, 2 ); - gtk_widget_show( text1 ); + text1.show(); w = ui::Label( "Number Of Points" ); hbox.pack_start( w, FALSE, FALSE, 2 ); gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT ); - gtk_widget_show( w ); + w.show(); // ---- /hbox ---- hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); // ---- hbox ---- auto text2 = ui::Entry( 256 ); gtk_entry_set_text( text2, "3" ); hbox.pack_start( text2, FALSE, FALSE, 2 ); - gtk_widget_show( text2 ); + text2.show(); w = ui::Label( "Multipler" ); hbox.pack_start( w, FALSE, FALSE, 2 ); gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT ); - gtk_widget_show( w ); + w.show(); // ---- /hbox ---- w = ui::Label( "Path Distance = dist(start -> apex) * multiplier" ); vbox.pack_start( w, FALSE, FALSE, 0 ); gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT ); - gtk_widget_show( w ); + w.show(); hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); // ---- hbox ---- auto text3 = ui::Entry( 256 ); gtk_entry_set_text( text3, "-800" ); hbox.pack_start( text3, FALSE, FALSE, 2 ); - gtk_widget_show( text3 ); + text3.show(); w = ui::Label( "Gravity" ); hbox.pack_start( w, FALSE, FALSE, 2 ); gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT ); - gtk_widget_show( w ); + w.show(); // ---- /hbox ---- w = ui::Widget(gtk_hseparator_new()); vbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); auto check1 = ui::CheckButton( "No Dynamic Update" ); vbox.pack_start( check1, FALSE, FALSE, 0 ); - gtk_widget_show( check1 ); + check1.show(); auto check2 = ui::CheckButton( "Show Bounding Lines" ); vbox.pack_start( check2, FALSE, FALSE, 0 ); - gtk_widget_show( check2 ); + check2.show(); // ---- /vbox ---- @@ -1131,18 +1131,18 @@ EMessageBoxReturn DoPathPlotterBox( PathPlotterRS* rs ){ w = ui::Widget(gtk_hseparator_new()); vbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); // ----------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Button( "Enable" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) ); - gtk_widget_show( w ); + w.show(); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); @@ -1150,19 +1150,19 @@ EMessageBoxReturn DoPathPlotterBox( PathPlotterRS* rs ){ w = ui::Button( "Disable" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; // ----------------- // gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); bool dialogError = TRUE; @@ -1220,13 +1220,13 @@ EMessageBoxReturn DoCTFColourChangeBox(){ auto vbox = ui::VBox( FALSE, 10 ); window.add(vbox); - gtk_widget_show( vbox ); + vbox.show(); // ---- vbox ---- auto hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, TRUE, TRUE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); // ---- hbox ---- ok/cancel buttons @@ -1236,17 +1236,17 @@ EMessageBoxReturn DoCTFColourChangeBox(){ gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Blue->Red" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; // ---- /hbox ---- @@ -1254,7 +1254,7 @@ EMessageBoxReturn DoCTFColourChangeBox(){ // ---- /vbox ---- gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); while ( loop ) @@ -1295,7 +1295,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ auto hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); // ---- hbox ---- @@ -1305,12 +1305,12 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ w = ui::Label( texSelected ); hbox.pack_start( w, FALSE, FALSE, 2 ); gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT ); - gtk_widget_show( w ); + w.show(); // ---- /hbox ---- auto frame = ui::Frame( "Reset Texture Names" ); - gtk_widget_show( frame ); + frame.show(); vbox.pack_start( frame, FALSE, TRUE, 0 ); auto table = ui::Table( 2, 3, TRUE ); @@ -1324,7 +1324,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ dlgTexReset.cbTexChange = ui::CheckButton( "Enabled" ); dlgTexReset.cbTexChange.connect( "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL ); - gtk_widget_show( dlgTexReset.cbTexChange ); + dlgTexReset.cbTexChange.show(); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.cbTexChange, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); @@ -1333,32 +1333,32 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); dlgTexReset.editTexOld = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( dlgTexReset.editTexOld ), rs->textureName ); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.editTexOld, 2, 3, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( dlgTexReset.editTexOld ); + dlgTexReset.editTexOld.show(); w = ui::Label( "New Name: " ); gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); dlgTexReset.editTexNew = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( dlgTexReset.editTexNew ), rs->textureName ); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.editTexNew, 2, 3, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( dlgTexReset.editTexNew ); + dlgTexReset.editTexNew.show(); // ---- /frame ---- frame = ui::Frame( "Reset Scales" ); - gtk_widget_show( frame ); + frame.show(); vbox.pack_start( frame, FALSE, TRUE, 0 ); table = ui::Table( 2, 3, TRUE ); @@ -1372,7 +1372,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ dlgTexReset.cbScaleHor = ui::CheckButton( "Enabled" ); dlgTexReset.cbScaleHor.connect( "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL ); - gtk_widget_show( dlgTexReset.cbScaleHor ); + dlgTexReset.cbScaleHor.show(); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.cbScaleHor, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); @@ -1381,19 +1381,19 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); dlgTexReset.editScaleHor = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( dlgTexReset.editScaleHor ), "0.5" ); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.editScaleHor, 2, 3, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( dlgTexReset.editScaleHor ); + dlgTexReset.editScaleHor.show(); dlgTexReset.cbScaleVert = ui::CheckButton( "Enabled" ); dlgTexReset.cbScaleVert.connect( "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL ); - gtk_widget_show( dlgTexReset.cbScaleVert ); + dlgTexReset.cbScaleVert.show(); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.cbScaleVert, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); @@ -1402,19 +1402,19 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); dlgTexReset.editScaleVert = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( dlgTexReset.editScaleVert ), "0.5" ); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.editScaleVert, 2, 3, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( dlgTexReset.editScaleVert ); + dlgTexReset.editScaleVert.show(); // ---- /frame ---- frame = ui::Frame( "Reset Shift" ); - gtk_widget_show( frame ); + frame.show(); vbox.pack_start( frame, FALSE, TRUE, 0 ); table = ui::Table( 2, 3, TRUE ); @@ -1428,7 +1428,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ dlgTexReset.cbShiftHor = ui::CheckButton( "Enabled" ); dlgTexReset.cbShiftHor.connect( "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL ); - gtk_widget_show( dlgTexReset.cbShiftHor ); + dlgTexReset.cbShiftHor.show(); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.cbShiftHor, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); @@ -1437,19 +1437,19 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); dlgTexReset.editShiftHor = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( dlgTexReset.editShiftHor ), "0" ); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.editShiftHor, 2, 3, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( dlgTexReset.editShiftHor ); + dlgTexReset.editShiftHor.show(); dlgTexReset.cbShiftVert = ui::CheckButton( "Enabled" ); dlgTexReset.cbShiftVert.connect( "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL ); - gtk_widget_show( dlgTexReset.cbShiftVert ); + dlgTexReset.cbShiftVert.show(); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.cbShiftVert, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); @@ -1458,19 +1458,19 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); dlgTexReset.editShiftVert = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( dlgTexReset.editShiftVert ), "0" ); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.editShiftVert, 2, 3, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( dlgTexReset.editShiftVert ); + dlgTexReset.editShiftVert.show(); // ---- /frame ---- frame = ui::Frame( "Reset Rotation" ); - gtk_widget_show( frame ); + frame.show(); vbox.pack_start( frame, FALSE, TRUE, 0 ); table = ui::Table( 1, 3, TRUE ); @@ -1483,7 +1483,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ // ---- frame ---- dlgTexReset.cbRotation = ui::CheckButton( "Enabled" ); - gtk_widget_show( dlgTexReset.cbRotation ); + dlgTexReset.cbRotation.show(); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.cbRotation, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); @@ -1492,20 +1492,20 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); dlgTexReset.editRotation = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( dlgTexReset.editRotation ), "0" ); gtk_table_attach( GTK_TABLE( table ), dlgTexReset.editRotation, 2, 3, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( dlgTexReset.editRotation ); + dlgTexReset.editRotation.show(); // ---- /frame ---- hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); // ---- hbox ---- @@ -1515,17 +1515,17 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Use All Brushes" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; // ---- /hbox ---- @@ -1533,7 +1533,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ // ---- /vbox ---- gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); Update_TextureReseter(); @@ -1631,12 +1631,12 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){ auto hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); // ---- /hbox ---- auto frame = ui::Frame( "Radii" ); - gtk_widget_show( frame ); + frame.show(); vbox.pack_start( frame, FALSE, TRUE, 0 ); auto table = ui::Table( 2, 3, TRUE ); @@ -1652,14 +1652,14 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); radiusX = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( radiusX ), "100" ); gtk_table_attach( GTK_TABLE( table ), radiusX, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( radiusX ); + radiusX.show(); @@ -1667,19 +1667,19 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); radiusY = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( radiusY ), "100" ); gtk_table_attach( GTK_TABLE( table ), radiusY, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( radiusY ); + radiusY.show(); frame = ui::Frame( "Angles" ); - gtk_widget_show( frame ); + frame.show(); vbox.pack_start( frame, FALSE, TRUE, 0 ); table = ui::Table( 2, 3, TRUE ); @@ -1695,14 +1695,14 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); angleStart = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( angleStart ), "0" ); gtk_table_attach( GTK_TABLE( table ), angleStart, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( angleStart ); + angleStart.show(); @@ -1710,18 +1710,18 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); angleEnd = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( angleEnd ), "90" ); gtk_table_attach( GTK_TABLE( table ), angleEnd, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( angleEnd ); + angleEnd.show(); frame = ui::Frame( "Height" ); - gtk_widget_show( frame ); + frame.show(); vbox.pack_start( frame, FALSE, TRUE, 0 ); table = ui::Table( 2, 3, TRUE ); @@ -1737,14 +1737,14 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); heightStart = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( heightStart ), "0" ); gtk_table_attach( GTK_TABLE( table ), heightStart, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( heightStart ); + heightStart.show(); @@ -1752,19 +1752,19 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); heightEnd = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( heightEnd ), "0" ); gtk_table_attach( GTK_TABLE( table ), heightEnd, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( heightEnd ); + heightEnd.show(); frame = ui::Frame( "Points" ); - gtk_widget_show( frame ); + frame.show(); vbox.pack_start( frame, FALSE, TRUE, 0 ); table = ui::Table( 2, 3, TRUE ); @@ -1780,19 +1780,19 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){ gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( w ); + w.show(); numPoints = ui::Entry( 256 ); gtk_entry_set_text( GTK_ENTRY( numPoints ), "0" ); gtk_table_attach( GTK_TABLE( table ), numPoints, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_widget_show( numPoints ); + numPoints.show(); hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); // ---- hbox ---- @@ -1802,12 +1802,12 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){ gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; // ---- /hbox ---- @@ -1815,7 +1815,7 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){ gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); bool dialogError = TRUE; @@ -1899,40 +1899,40 @@ EMessageBoxReturn DoMakeChainBox( MakeChainRS* rs ){ // dunno if you want this text or not ... w = ui::Label( text ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); w = ui::Widget(gtk_hseparator_new()); vbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); // ------------------------- // // new hbox hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); textlinkNum = ui::Entry( 256 ); hbox.pack_start( textlinkNum, FALSE, FALSE, 1 ); - gtk_widget_show( textlinkNum ); + textlinkNum.show(); w = ui::Label( "Number of elements in chain" ); hbox.pack_start( w, FALSE, FALSE, 1 ); - gtk_widget_show( w ); + w.show(); // -------------------------- // hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); textlinkName = ui::Entry( 256 ); hbox.pack_start( textlinkName, FALSE, FALSE, 0 ); - gtk_widget_show( textlinkName ); + textlinkName.show(); w = ui::Label( "Basename for chain's targetnames." ); hbox.pack_start( w, FALSE, FALSE, 1 ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "OK" ); @@ -1940,17 +1940,17 @@ EMessageBoxReturn DoMakeChainBox( MakeChainRS* rs ){ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); bool dialogError = TRUE; diff --git a/contrib/brushexport/interface.cpp b/contrib/brushexport/interface.cpp index c8d95298..d9ea6292 100644 --- a/contrib/brushexport/interface.cpp +++ b/contrib/brushexport/interface.cpp @@ -25,25 +25,25 @@ create_w_plugplug2( void ){ auto vbox1 = ui::VBox( FALSE, 0 ); gtk_widget_set_name( vbox1, "vbox1" ); - gtk_widget_show( vbox1 ); + vbox1.show(); w_plugplug2.add(vbox1); gtk_container_set_border_width( GTK_CONTAINER( vbox1 ), 5 ); auto hbox2 = ui::HBox( TRUE, 5 ); gtk_widget_set_name( hbox2, "hbox2" ); - gtk_widget_show( hbox2 ); + hbox2.show(); vbox1.pack_start( hbox2, FALSE, FALSE, 0 ); gtk_container_set_border_width( GTK_CONTAINER( hbox2 ), 5 ); auto vbox4 = ui::VBox( TRUE, 0 ); gtk_widget_set_name( vbox4, "vbox4" ); - gtk_widget_show( vbox4 ); + vbox4.show(); hbox2.pack_start( vbox4, TRUE, FALSE, 0 ); auto r_collapse = ui::Widget(gtk_radio_button_new_with_mnemonic( NULL, "Collapse mesh" )); gtk_widget_set_name( r_collapse, "r_collapse" ); gtk_widget_set_tooltip_text(r_collapse, "Collapse all brushes into a single group"); - gtk_widget_show( r_collapse ); + r_collapse.show(); vbox4.pack_start( r_collapse, FALSE, FALSE, 0 ); gtk_radio_button_set_group( GTK_RADIO_BUTTON( r_collapse ), r_collapse_group ); r_collapse_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( r_collapse ) ); @@ -51,7 +51,7 @@ create_w_plugplug2( void ){ auto r_collapsebymaterial = ui::Widget(gtk_radio_button_new_with_mnemonic( NULL, "Collapse by material" )); gtk_widget_set_name( r_collapsebymaterial, "r_collapsebymaterial" ); gtk_widget_set_tooltip_text(r_collapsebymaterial, "Collapse into groups by material"); - gtk_widget_show( r_collapsebymaterial ); + r_collapsebymaterial.show(); vbox4.pack_start( r_collapsebymaterial, FALSE, FALSE, 0 ); gtk_radio_button_set_group( GTK_RADIO_BUTTON( r_collapsebymaterial ), r_collapse_group ); r_collapse_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( r_collapsebymaterial ) ); @@ -59,37 +59,37 @@ create_w_plugplug2( void ){ auto r_nocollapse = ui::Widget(gtk_radio_button_new_with_mnemonic( NULL, "Don't collapse" )); gtk_widget_set_name( r_nocollapse, "r_nocollapse" ); gtk_widget_set_tooltip_text(r_nocollapse, "Every brush is stored in its own group"); - gtk_widget_show( r_nocollapse ); + r_nocollapse.show(); vbox4.pack_start( r_nocollapse, FALSE, FALSE, 0 ); 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 ) ); auto vbox3 = ui::VBox( FALSE, 0 ); gtk_widget_set_name( vbox3, "vbox3" ); - gtk_widget_show( vbox3 ); + vbox3.show(); hbox2.pack_start( vbox3, FALSE, FALSE, 0 ); auto b_export = ui::Button(GTK_BUTTON(gtk_button_new_from_stock( "gtk-save" ))); gtk_widget_set_name( b_export, "b_export" ); - gtk_widget_show( b_export ); + b_export.show(); vbox3.pack_start( b_export, TRUE, FALSE, 0 ); gtk_container_set_border_width( GTK_CONTAINER( b_export ), 5 ); auto b_close = ui::Button(GTK_BUTTON(gtk_button_new_from_stock( "gtk-cancel" ))); gtk_widget_set_name( b_close, "b_close" ); - gtk_widget_show( b_close ); + b_close.show(); vbox3.pack_start( b_close, TRUE, FALSE, 0 ); gtk_container_set_border_width( GTK_CONTAINER( b_close ), 5 ); auto vbox2 = ui::VBox( FALSE, 5 ); gtk_widget_set_name( vbox2, "vbox2" ); - gtk_widget_show( vbox2 ); + vbox2.show(); vbox1.pack_start( vbox2, TRUE, TRUE, 0 ); gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 2 ); auto label1 = ui::Label( "Ignored materials:" ); gtk_widget_set_name( label1, "label1" ); - gtk_widget_show( label1 ); + label1.show(); vbox2.pack_start( label1, FALSE, FALSE, 0 ); auto scrolledwindow1 = ui::ScrolledWindow(ui::New); @@ -108,38 +108,38 @@ create_w_plugplug2( void ){ auto ed_materialname = ui::Entry(ui::New); gtk_widget_set_name( ed_materialname, "ed_materialname" ); - gtk_widget_show( ed_materialname ); + ed_materialname.show(); vbox2.pack_start( ed_materialname, FALSE, FALSE, 0 ); auto hbox1 = ui::HBox( TRUE, 0 ); gtk_widget_set_name( hbox1, "hbox1" ); - gtk_widget_show( hbox1 ); + hbox1.show(); vbox2.pack_start( hbox1, FALSE, FALSE, 0 ); auto b_addmaterial = ui::Button(GTK_BUTTON(gtk_button_new_from_stock( "gtk-add" ))); gtk_widget_set_name( b_addmaterial, "b_addmaterial" ); - gtk_widget_show( b_addmaterial ); + b_addmaterial.show(); hbox1.pack_start( b_addmaterial, FALSE, FALSE, 0 ); auto b_removematerial = ui::Button(GTK_BUTTON(gtk_button_new_from_stock( "gtk-remove" ))); gtk_widget_set_name( b_removematerial, "b_removematerial" ); - gtk_widget_show( b_removematerial ); + b_removematerial.show(); hbox1.pack_start( b_removematerial, FALSE, FALSE, 0 ); auto t_limitmatnames = ui::Widget(gtk_check_button_new_with_mnemonic( "Use short material names (max. 20 chars)" )); gtk_widget_set_name( t_limitmatnames, "t_limitmatnames" ); - gtk_widget_show( t_limitmatnames ); + t_limitmatnames.show(); vbox2.pack_end( t_limitmatnames, FALSE, FALSE, 0 ); auto t_objects = ui::Widget(gtk_check_button_new_with_mnemonic( "Create (o)bjects instead of (g)roups" )); gtk_widget_set_name( t_objects, "t_objects" ); - gtk_widget_show( t_objects ); + t_objects.show(); vbox2.pack_end(t_objects, FALSE, FALSE, 0); auto t_exportmaterials = ui::CheckButton(GTK_CHECK_BUTTON(gtk_check_button_new_with_mnemonic( "Create material information (.mtl file)" ))); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( t_exportmaterials ), true ); gtk_widget_set_name( t_exportmaterials, "t_exportmaterials" ); - gtk_widget_show( t_exportmaterials ); + t_exportmaterials.show(); vbox2.pack_end(t_exportmaterials, FALSE, FALSE, 10); using namespace callbacks; diff --git a/contrib/camera/dialogs.cpp b/contrib/camera/dialogs.cpp index 71ba5c1a..b8f65689 100644 --- a/contrib/camera/dialogs.cpp +++ b/contrib/camera/dialogs.cpp @@ -89,50 +89,50 @@ static gint ci_new( GtkWidget *widget, gpointer data ){ hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); auto frame = ui::Frame( "Type" ); hbox.pack_start( frame, TRUE, TRUE, 0 ); - gtk_widget_show( frame ); + frame.show(); auto vbox2 = ui::VBox( FALSE, 5 ); frame.add(vbox2); gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 ); - gtk_widget_show( vbox2 ); + vbox2.show(); // -------------------------- // fixed = gtk_radio_button_new_with_label( targetTypeRadio, "Fixed" ); vbox2.pack_start( fixed, FALSE, FALSE, 3 ); - gtk_widget_show( fixed ); + fixed.show(); targetTypeRadio = gtk_radio_button_get_group( GTK_RADIO_BUTTON( fixed ) ); interpolated = gtk_radio_button_new_with_label( targetTypeRadio, "Interpolated" ); vbox2.pack_start( interpolated, FALSE, FALSE, 3 ); - gtk_widget_show( interpolated ); + interpolated.show(); targetTypeRadio = gtk_radio_button_get_group( GTK_RADIO_BUTTON( interpolated ) ); spline = gtk_radio_button_new_with_label( targetTypeRadio, "Spline" ); vbox2.pack_start( spline, FALSE, FALSE, 3 ); - gtk_widget_show( spline ); + spline.show(); targetTypeRadio = gtk_radio_button_get_group( GTK_RADIO_BUTTON( spline ) ); // -------------------------- // w = gtk_hseparator_new(); vbox.pack_start( w, FALSE, FALSE, 2 ); - gtk_widget_show( w ); + w.show(); // -------------------------- // hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Button( "Ok" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - gtk_widget_show( w ); + w.show(); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); @@ -140,13 +140,13 @@ static gint ci_new( GtkWidget *widget, gpointer data ){ w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; // -------------------------- // gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); bool dialogError = TRUE; @@ -382,15 +382,15 @@ static gint ci_rename( GtkWidget *widget, gpointer data ){ hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Label( "Name:" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); name = ui::Entry(); hbox.pack_start( name, FALSE, FALSE, 0 ); - gtk_widget_show( name ); + name.show(); if ( g_iActiveTarget < 0 ) { gtk_entry_set_text( GTK_ENTRY( name ), GetCurrentCam()->GetCam()->getPositionObj()->getName() ); @@ -403,18 +403,18 @@ static gint ci_rename( GtkWidget *widget, gpointer data ){ w = gtk_hseparator_new(); vbox.pack_start( w, FALSE, FALSE, 2 ); - gtk_widget_show( w ); + w.show(); // -------------------------- // hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Button( "Ok" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - gtk_widget_show( w ); + w.show(); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); @@ -422,13 +422,13 @@ static gint ci_rename( GtkWidget *widget, gpointer data ){ w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; // -------------------------- // gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); bool dialogError = TRUE; @@ -501,15 +501,15 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ){ hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Label( "Name:" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); name = ui::Entry(); hbox.pack_start( name, TRUE, TRUE, 0 ); - gtk_widget_show( name ); + name.show(); sprintf( buf, "target%i", GetCurrentCam()->GetCam()->numTargets() + 1 ); gtk_entry_set_text( GTK_ENTRY( name ), buf ); @@ -518,50 +518,50 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ){ hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); auto frame = ui::Frame( "Type" ); hbox.pack_start( frame, TRUE, TRUE, 0 ); - gtk_widget_show( frame ); + frame.show(); auto vbox2 = ui::VBox( FALSE, 5 ); frame.add(vbox2); gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 ); - gtk_widget_show( vbox2 ); + vbox2.show(); // -------------------------- // fixed = gtk_radio_button_new_with_label( targetTypeRadio, "Fixed" ); vbox2.pack_start( fixed, FALSE, FALSE, 3 ); - gtk_widget_show( fixed ); + fixed.show(); targetTypeRadio = gtk_radio_button_get_group( GTK_RADIO_BUTTON( fixed ) ); interpolated = gtk_radio_button_new_with_label( targetTypeRadio, "Interpolated" ); vbox2.pack_start( interpolated, FALSE, FALSE, 3 ); - gtk_widget_show( interpolated ); + interpolated.show(); targetTypeRadio = gtk_radio_button_get_group( GTK_RADIO_BUTTON( interpolated ) ); spline = gtk_radio_button_new_with_label( targetTypeRadio, "Spline" ); vbox2.pack_start( spline, FALSE, FALSE, 3 ); - gtk_widget_show( spline ); + spline.show(); targetTypeRadio = gtk_radio_button_get_group( GTK_RADIO_BUTTON( spline ) ); // -------------------------- // w = gtk_hseparator_new(); vbox.pack_start( w, FALSE, FALSE, 2 ); - gtk_widget_show( w ); + w.show(); // -------------------------- // hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Button( "Ok" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - gtk_widget_show( w ); + w.show(); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); @@ -569,13 +569,13 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ){ w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; // -------------------------- // gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); bool dialogError = TRUE; @@ -849,23 +849,23 @@ static gint ci_add( GtkWidget *widget, gpointer data ){ hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); auto frame = ui::Frame( "Type" ); hbox.pack_start( frame, TRUE, TRUE, 0 ); - gtk_widget_show( frame ); + frame.show(); auto vbox2 = ui::VBox( FALSE, 5 ); frame.add(vbox2); gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 ); - gtk_widget_show( vbox2 ); + vbox2.show(); // -------------------------- // for ( i = 1; i < EVENT_COUNT; i++ ) { eventWidget[i] = gtk_radio_button_new_with_label( eventTypeRadio, camEventStr[i] ); vbox2.pack_start( eventWidget[i], FALSE, FALSE, 3 ); - gtk_widget_show( eventWidget[i] ); + eventWidget[i].show(); eventTypeRadio = gtk_radio_button_get_group( GTK_RADIO_BUTTON( eventWidget[i] ) ); if ( camEventFlags[i][1] == false ) { gtk_widget_set_sensitive( eventWidget[i], FALSE ); @@ -876,32 +876,32 @@ static gint ci_add( GtkWidget *widget, gpointer data ){ hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Label( "Parameters:" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); parameters = ui::Entry(); hbox.pack_start( parameters, TRUE, TRUE, 0 ); - gtk_widget_show( parameters ); + parameters.show(); // -------------------------- // w = gtk_hseparator_new(); vbox.pack_start( w, FALSE, FALSE, 2 ); - gtk_widget_show( w ); + w.show(); // -------------------------- // hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Button( "Ok" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - gtk_widget_show( w ); + w.show(); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); @@ -909,13 +909,13 @@ static gint ci_add( GtkWidget *widget, gpointer data ){ w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = eIDCANCEL; // -------------------------- // gtk_window_set_position( GTK_WINDOW( window ),GTK_WIN_POS_CENTER ); - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); bool dialogError = TRUE; @@ -1021,7 +1021,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){ // -------------------------- // vbox = ui::VBox( FALSE, 5 ); - gtk_widget_show( vbox ); + vbox.show(); gtk_table_attach( GTK_TABLE( table ), vbox, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1030,37 +1030,37 @@ GtkWidget *CreateCameraInspectorDialog( void ){ hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Label( "File:" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); g_pCamListCombo = gtk_combo_new(); hbox.pack_start( g_pCamListCombo, TRUE, TRUE, 0 ); - gtk_widget_show( g_pCamListCombo ); + g_pCamListCombo.show(); // -------------------------- // hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Label( "Name:" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); g_pCamName = ui::Entry(); hbox.pack_start( g_pCamName, FALSE, FALSE, 0 ); - gtk_widget_show( g_pCamName ); + g_pCamName.show(); w = ui::Label( "Type: " ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); w = ui::Label( "" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); g_pCamType = GTK_LABEL( w ); RefreshCamListCombo(); @@ -1085,15 +1085,15 @@ GtkWidget *CreateCameraInspectorDialog( void ){ hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Label( "Edit:" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); g_pPathListCombo = gtk_combo_new(); hbox.pack_start( g_pPathListCombo, TRUE, TRUE, 0 ); - gtk_widget_show( g_pPathListCombo ); + g_pPathListCombo.show(); RefreshPathListCombo(); @@ -1104,18 +1104,18 @@ GtkWidget *CreateCameraInspectorDialog( void ){ hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); g_pEditModeEditRadioButton = gtk_radio_button_new_with_label( g_pEditTypeRadio, "Edit Points" ); hbox.pack_start( g_pEditModeEditRadioButton, FALSE, FALSE, 3 ); - gtk_widget_show( g_pEditModeEditRadioButton ); + g_pEditModeEditRadioButton.show(); g_pEditTypeRadio = gtk_radio_button_get_group( GTK_RADIO_BUTTON( g_pEditModeEditRadioButton ) ); g_pEditModeEditRadioButton.connect( "clicked", G_CALLBACK( ci_editmode_edit ), NULL ); g_pEditModeAddRadioButton = gtk_radio_button_new_with_label( g_pEditTypeRadio, "Add Points" ); hbox.pack_start( g_pEditModeAddRadioButton, FALSE, FALSE, 3 ); - gtk_widget_show( g_pEditModeAddRadioButton ); + g_pEditModeAddRadioButton.show(); g_pEditTypeRadio = gtk_radio_button_get_group( GTK_RADIO_BUTTON( g_pEditModeAddRadioButton ) ); g_pEditModeAddRadioButton.connect( "clicked", G_CALLBACK( ci_editmode_add ), NULL ); @@ -1128,44 +1128,44 @@ GtkWidget *CreateCameraInspectorDialog( void ){ w = ui::Label( "Type: " ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); w = ui::Label( "" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); g_pPathType = GTK_LABEL( w ); // -------------------------- // hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Button( "Rename..." ); hbox.pack_start( w, FALSE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( ci_rename ), NULL ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Add Target..." ); hbox.pack_start( w, FALSE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( ci_add_target ), NULL ); - gtk_widget_show( w ); + w.show(); // not available in splines library /*w = gtk_button_new_with_label( "Delete Selected" ); hbox.pack_start( w, FALSE, TRUE, 0); w.connect( "clicked", G_CALLBACK( ci_delete_selected ), NULL ); - gtk_widget_show( w ); + w.show(); w = gtk_button_new_with_label( "Select All" ); hbox.pack_start( w, FALSE, TRUE, 0); w.connect( "clicked", G_CALLBACK( ci_select_all ), NULL ); - gtk_widget_show( w );*/ + w.show();*/ // -------------------------- // frame = ui::Frame( "Time" ); - gtk_widget_show( frame ); + frame.show(); gtk_table_attach( GTK_TABLE( table ), frame, 0, 1, 2, 3, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1179,84 +1179,84 @@ GtkWidget *CreateCameraInspectorDialog( void ){ hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Label( "Length (seconds):" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); g_pSecondsEntry = ui::Entry(); hbox.pack_start( g_pSecondsEntry, FALSE, FALSE, 0 ); - gtk_widget_show( g_pSecondsEntry ); + g_pSecondsEntry.show(); // -------------------------- // hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Label( "Current Time: " ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); w = ui::Label( "0.00" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); g_pCurrentTime = GTK_LABEL( w ); w = ui::Label( " of " ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); w = ui::Label( "0.00" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); g_pTotalTime = GTK_LABEL( w ); // -------------------------- // hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); g_pTimeLine = ui::Adjustment( 0, 0, 30000, 100, 250, 0 ); g_pTimeLine.connect( "value_changed", G_CALLBACK( ci_timeline_changed ), NULL ); w = ui::HScale( g_pTimeLine ); hbox.pack_start( w, TRUE, TRUE, 0 ); - gtk_widget_show( w ); + w.show(); gtk_scale_set_draw_value( GTK_SCALE( w ), FALSE ); // -------------------------- // hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); g_pTrackCamera = ui::CheckButton( "Track Camera" ); hbox.pack_start( g_pTrackCamera, FALSE, FALSE, 0 ); - gtk_widget_show( g_pTrackCamera ); + g_pTrackCamera.show(); // -------------------------- // hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = ui::Label( "Events:" ); hbox.pack_start( w, FALSE, FALSE, 0 ); - gtk_widget_show( w ); + w.show(); // -------------------------- // hbox = ui::HBox( FALSE, 5 ); vbox.pack_start( hbox, FALSE, FALSE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); auto scr = w = ui::ScrolledWindow(); gtk_widget_set_size_request( w, 0, 150 ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( w ), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); hbox.pack_start( w, TRUE, TRUE, 0 ); - gtk_widget_show( w ); + w.show(); g_pEventsList = gtk_clist_new( 3 ); scr.add(g_pEventsList); @@ -1266,21 +1266,21 @@ GtkWidget *CreateCameraInspectorDialog( void ){ gtk_clist_set_column_auto_resize( GTK_CLIST( g_pEventsList ), 0, TRUE ); gtk_clist_set_column_auto_resize( GTK_CLIST( g_pEventsList ), 1, TRUE ); gtk_clist_set_column_auto_resize( GTK_CLIST( g_pEventsList ), 2, TRUE ); - gtk_widget_show( g_pEventsList ); + g_pEventsList.show(); vbox = ui::VBox( FALSE, 5 ); hbox.pack_start( vbox, FALSE, FALSE, 0 ); - gtk_widget_show( vbox ); + vbox.show(); w = ui::Button( "Add..." ); vbox.pack_start( w, FALSE, FALSE, 0 ); w.connect( "clicked", G_CALLBACK( ci_add ), NULL ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Del" ); vbox.pack_start( w, FALSE, FALSE, 0 ); w.connect( "clicked", G_CALLBACK( ci_del ), NULL ); - gtk_widget_show( w ); + w.show(); // -------------------------- // @@ -1294,7 +1294,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){ // -------------------------- // vbox = gtk_vbox_new( FALSE, 5 ); - gtk_widget_show( vbox ); + vbox.show(); gtk_table_attach( GTK_TABLE( table ), vbox, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1302,17 +1302,17 @@ GtkWidget *CreateCameraInspectorDialog( void ){ w = gtk_button_new_with_label( "New..." ); vbox.pack_start( w, FALSE, FALSE, 0 ); w.connect( "clicked", G_CALLBACK( ci_new ), NULL ); - gtk_widget_show( w ); + w.show(); w = gtk_button_new_with_label( "Load..." ); vbox.pack_start( w, FALSE, FALSE, 0 ); w.connect( "clicked", G_CALLBACK( ci_load ), NULL ); - gtk_widget_show( w ); + w.show(); // -------------------------- // vbox = gtk_vbox_new( FALSE, 5 ); - gtk_widget_show( vbox ); + vbox.show(); gtk_table_attach( GTK_TABLE( table ), vbox, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1320,45 +1320,45 @@ GtkWidget *CreateCameraInspectorDialog( void ){ w = gtk_button_new_with_label( "Save..." ); vbox.pack_start( w, FALSE, FALSE, 0 ); w.connect( "clicked", G_CALLBACK( ci_save ), NULL ); - gtk_widget_show( w ); + w.show(); w = gtk_button_new_with_label( "Unload" ); vbox.pack_start( w, FALSE, FALSE, 0 ); w.connect( "clicked", G_CALLBACK( ci_unload ), NULL ); - gtk_widget_show( w ); + w.show(); hbox = gtk_hbox_new( FALSE, 5 ); vbox.pack_start( hbox, TRUE, TRUE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = gtk_button_new_with_label( "Apply" ); vbox.pack_start( w, FALSE, FALSE, 0 ); w.connect( "clicked", G_CALLBACK( ci_apply ), NULL ); - gtk_widget_show( w ); + w.show(); w = gtk_button_new_with_label( "Preview" ); vbox.pack_start( w, FALSE, FALSE, 0 ); w.connect( "clicked", G_CALLBACK( ci_preview ), NULL ); - gtk_widget_show( w ); + w.show(); // -------------------------- // vbox = gtk_vbox_new( FALSE, 5 ); - gtk_widget_show( vbox ); + vbox.show(); gtk_table_attach( GTK_TABLE( table ), vbox, 1, 2, 2, 3, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); hbox = gtk_hbox_new( FALSE, 5 ); vbox.pack_start( hbox, TRUE, TRUE, 0 ); - gtk_widget_show( hbox ); + hbox.show(); w = gtk_button_new_with_label( "Close" ); vbox.pack_start( w, FALSE, FALSE, 0 ); w.connect( "clicked", G_CALLBACK( ci_close ), NULL ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); // -------------------------- // diff --git a/contrib/camera/funchandlers.cpp b/contrib/camera/funchandlers.cpp index f3be8e3b..5d72242b 100644 --- a/contrib/camera/funchandlers.cpp +++ b/contrib/camera/funchandlers.cpp @@ -85,7 +85,7 @@ void DoNewSplineCamera(){ } void DoCameraInspector(){ - gtk_widget_show( g_pCameraInspectorWnd ); + g_pCameraInspectorWnd.show(); } void DoPreviewCamera(){ diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp index 14ccf40b..00978939 100644 --- a/contrib/gtkgensurf/gendlgs.cpp +++ b/contrib/gtkgensurf/gendlgs.cpp @@ -1367,7 +1367,7 @@ GtkWidget* create_main_dialog(){ gtk_container_set_border_width( GTK_CONTAINER( hbox ), 5 ); notebook = gtk_notebook_new(); - gtk_widget_show( notebook ); + notebook.show(); hbox.pack_start( notebook, TRUE, TRUE, 0 ); notebook.connect( "switch_page", G_CALLBACK( switch_page ), NULL ); @@ -1375,17 +1375,17 @@ GtkWidget* create_main_dialog(){ g_object_set_data( G_OBJECT( dlg ), "notebook", notebook ); table = ui::Table( 2, 2, FALSE ); - gtk_widget_show( table ); + table.show(); gtk_container_set_border_width( GTK_CONTAINER( table ), 5 ); gtk_table_set_row_spacings( GTK_TABLE( table ), 5 ); gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); label = ui::Label( "General" ); - gtk_widget_show( label ); + label.show(); gtk_notebook_append_page( GTK_NOTEBOOK( notebook ), table, label ); auto frame = ui::Frame( "Game" ); - gtk_widget_show( frame ); + frame.show(); gtk_table_attach( GTK_TABLE( table ), frame, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1398,7 +1398,7 @@ GtkWidget* create_main_dialog(){ for ( i = 0, group = NULL; i < NUMGAMES; i++ ) { radio = gtk_radio_button_new_with_label( group, games[i] ); - gtk_widget_show( radio ); + radio.show(); vbox.pack_start( radio, TRUE, TRUE, 0 ); group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radio ) ); game_radios[i] = radio; @@ -1406,7 +1406,7 @@ GtkWidget* create_main_dialog(){ } frame = ui::Frame( "Waveform" ); - gtk_widget_show( frame ); + frame.show(); gtk_table_attach( GTK_TABLE( table ), frame, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1419,7 +1419,7 @@ GtkWidget* create_main_dialog(){ for ( i = 0, group = NULL; i < 5; i++ ) { radio = gtk_radio_button_new_with_label( group, waveforms[i] ); - gtk_widget_show( radio ); + radio.show(); vbox.pack_start( radio, TRUE, TRUE, 0 ); group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radio ) ); wave_radios[i] = radio; @@ -1427,7 +1427,7 @@ GtkWidget* create_main_dialog(){ } frame = ui::Frame( "Orientation" ); - gtk_widget_show( frame ); + frame.show(); gtk_table_attach( GTK_TABLE( table ), frame, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1440,7 +1440,7 @@ GtkWidget* create_main_dialog(){ for ( i = 0, group = NULL; i < 6; i++ ) { radio = gtk_radio_button_new_with_label( group, orientations[i] ); - gtk_widget_show( radio ); + radio.show(); vbox.pack_start( radio, TRUE, TRUE, 0 ); group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radio ) ); plane_radios[i] = radio; @@ -1448,7 +1448,7 @@ GtkWidget* create_main_dialog(){ } table2 = ui::Table( 4, 2, FALSE ); - gtk_widget_show( table2 ); + table2.show(); gtk_table_set_row_spacings( GTK_TABLE( table2 ), 5 ); gtk_table_set_col_spacings( GTK_TABLE( table2 ), 5 ); gtk_table_attach( GTK_TABLE( table ), table2, 1, 2, 1, 2, @@ -1456,7 +1456,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); label = ui::Label( "Wavelength:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table2 ), label, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1464,7 +1464,7 @@ GtkWidget* create_main_dialog(){ gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_RIGHT ); label = ui::Label( "Max. amplitude:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table2 ), label, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1472,7 +1472,7 @@ GtkWidget* create_main_dialog(){ gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_RIGHT ); label = ui::Label( "Roughness:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table2 ), label, 0, 1, 2, 3, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1480,7 +1480,7 @@ GtkWidget* create_main_dialog(){ gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_RIGHT ); label = ui::Label( "Random seed:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table2 ), label, 0, 1, 3, 4, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1488,7 +1488,7 @@ GtkWidget* create_main_dialog(){ gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_RIGHT ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table2 ), entry, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1497,7 +1497,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &WaveLength ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table2 ), entry, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1506,7 +1506,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Amplitude ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table2 ), entry, 1, 2, 2, 3, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1517,7 +1517,7 @@ GtkWidget* create_main_dialog(){ adj = ui::Adjustment( 1, 1, 32767, 1, 10, 0 ); adj.connect( "value_changed", G_CALLBACK( general_random ), NULL ); spin = ui::SpinButton( adj, 1, 0 ); - gtk_widget_show( spin ); + spin.show(); gtk_table_attach( GTK_TABLE( table2 ), spin, 1, 2, 3, 4, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1525,19 +1525,19 @@ GtkWidget* create_main_dialog(){ g_object_set_data( G_OBJECT( dlg ), "random", spin ); vbox = ui::VBox( FALSE, 5 ); - gtk_widget_show( vbox ); + vbox.show(); gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 ); label = ui::Label( "Extents" ); - gtk_widget_show( label ); + label.show(); gtk_notebook_append_page( GTK_NOTEBOOK( notebook ), vbox, label ); hbox2 = ui::HBox( FALSE, 5 ); - gtk_widget_show( hbox2 ); + hbox2.show(); vbox.pack_start( hbox2, FALSE, TRUE, 0 ); frame = ui::Frame( "Extents" ); - gtk_widget_show( frame ); + frame.show(); hbox2.pack_start( frame, TRUE, TRUE, 0 ); auto table = ui::Table( 3, 4, FALSE ); @@ -1548,47 +1548,47 @@ GtkWidget* create_main_dialog(){ gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); label = ui::Label( "X:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); g_object_set_data( G_OBJECT( dlg ), "hmin_text", label ); label = ui::Label( "X:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); g_object_set_data( G_OBJECT( dlg ), "hmax_text", label ); label = ui::Label( "Y:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); g_object_set_data( G_OBJECT( dlg ), "vmin_text", label ); label = ui::Label( "Y:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 2, 3, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); g_object_set_data( G_OBJECT( dlg ), "vmax_text", label ); label = ui::Label( "Lower-left" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); label = ui::Label( "Upper-right" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 3, 4, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1597,7 +1597,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Hll ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 3, 4, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1606,7 +1606,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Hur ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 2, 3, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1615,7 +1615,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Vll ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 3, 4, 2, 3, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1624,7 +1624,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Vur ); frame = ui::Frame( "Divisions" ); - gtk_widget_show( frame ); + frame.show(); hbox2.pack_start( frame, TRUE, TRUE, 0 ); table = ui::Table( 2, 2, FALSE ); @@ -1635,14 +1635,14 @@ GtkWidget* create_main_dialog(){ gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); label = ui::Label( "X:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); g_object_set_data( G_OBJECT( dlg ), "nh_text", label ); label = ui::Label( "Y:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1651,7 +1651,7 @@ GtkWidget* create_main_dialog(){ adj = ui::Adjustment( 8, 1, MAX_ROWS, 1, 10, 0 ); adj.connect( "value_changed", G_CALLBACK( extents_nhnv_spin ), &NH ); spin = ui::SpinButton( adj, 1, 0 ); - gtk_widget_show( spin ); + spin.show(); gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1661,7 +1661,7 @@ GtkWidget* create_main_dialog(){ adj = ui::Adjustment( 8, 1, MAX_ROWS, 1, 10, 0 ); adj.connect( "value_changed", G_CALLBACK( extents_nhnv_spin ), &NV ); spin = ui::SpinButton( adj, 1, 0 ); - gtk_widget_show( spin ); + spin.show(); gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1669,46 +1669,46 @@ GtkWidget* create_main_dialog(){ g_object_set_data( G_OBJECT( dlg ), "nv", spin ); check = ui::CheckButton( "Use Bezier patches" ); - gtk_widget_show( check ); + check.show(); vbox.pack_start( check, FALSE, TRUE, 0 ); g_object_set_data( G_OBJECT( dlg ), "use_patches", check ); check.connect( "toggled", G_CALLBACK( extents_use_patches ), NULL ); // ^Fishman - Snap to grid, replaced scroll bar with a texbox. label = ui::Label( "Snap to grid:" ); - gtk_widget_show( label ); + label.show(); vbox.pack_start( label, FALSE, TRUE, 0 ); gtk_object_set_data( GTK_OBJECT( dlg ), "snap_text", label ); adj = ui::Adjustment( 8, 0, 256, 1, 10, 0 ); adj.connect( "value_changed", G_CALLBACK( extents_snaptogrid_spin ), &SP ); spin = ui::SpinButton( adj, 1, 0 ); - gtk_widget_show( spin ); + spin.show(); vbox.pack_start( spin, FALSE, TRUE, 0 ); gtk_widget_set_size_request( spin, 60, -1 ); g_object_set_data( G_OBJECT( dlg ), "sp", spin ); // ^Fishman - End of Snap to grid code. hbox2 = ui::HBox( FALSE, 5 ); - gtk_widget_show( hbox2 ); + hbox2.show(); vbox.pack_start( hbox2, FALSE, TRUE, 10 ); label = ui::Label( "Decimate:" ); - gtk_widget_show( label ); + label.show(); hbox2.pack_start( label, FALSE, TRUE, 0 ); adj = ui::Adjustment( 0, 0, 110, 1, 10, 0 ); adj.connect( "value_changed", G_CALLBACK( extents_decimate ), NULL ); g_object_set_data( G_OBJECT( dlg ), "decimate_adj", adj ); scale = ui::HScale( adj ); - gtk_widget_show( scale ); + scale.show(); hbox2.pack_start( scale, TRUE, TRUE, 0 ); gtk_scale_set_value_pos( GTK_SCALE( scale ), GTK_POS_RIGHT ); gtk_scale_set_digits( GTK_SCALE( scale ), 0 ); g_object_set_data( G_OBJECT( dlg ), "decimate", scale ); frame = ui::Frame( "Corner values" ); - gtk_widget_show( frame ); + frame.show(); vbox.pack_start( frame, FALSE, TRUE, 0 ); table = ui::Table( 3, 4, FALSE ); @@ -1719,31 +1719,31 @@ GtkWidget* create_main_dialog(){ gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); label = ui::Label( "Upper-left:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); label = ui::Label( "Lower-left:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); label = ui::Label( "Upper-right:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); label = ui::Label( "Lower-right:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1752,7 +1752,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Z01 ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1761,7 +1761,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Z00 ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 3, 4, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1770,7 +1770,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Z11 ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 3, 4, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1779,7 +1779,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Z10 ); check = ui::CheckButton( "Linear borders" ); - gtk_widget_show( check ); + check.show(); gtk_table_attach( GTK_TABLE( table ), check, 0, 4, 2, 3, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); @@ -1787,34 +1787,34 @@ GtkWidget* create_main_dialog(){ check.connect( "toggled", G_CALLBACK( extents_linearborder ), NULL ); vbox = ui::VBox( FALSE, 10 ); - gtk_widget_show( vbox ); + vbox.show(); gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 ); label = ui::Label( "Bitmap" ); - gtk_widget_show( label ); + label.show(); gtk_notebook_append_page( GTK_NOTEBOOK( notebook ), vbox, label ); label = ui::Label( "" ); - gtk_widget_show( label ); + label.show(); vbox.pack_start( label, FALSE, TRUE, 0 ); g_object_set_data( G_OBJECT( dlg ), "bmp_note", label ); table = ui::Table( 2, 2, FALSE ); - gtk_widget_show( table ); + table.show(); gtk_container_set_border_width( GTK_CONTAINER( table ), 5 ); vbox.pack_start( table, FALSE, TRUE, 0 ); gtk_table_set_row_spacings( GTK_TABLE( table ), 5 ); gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); label = ui::Label( "Filename:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); g_object_set_data( G_OBJECT( dlg ), "bmp_text1", label ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1822,34 +1822,34 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( bitmap_file_entryfocusout ), NULL ); hbox2 = ui::HBox( TRUE, 5 ); - gtk_widget_show( hbox2 ); + hbox2.show(); gtk_table_attach( GTK_TABLE( table ), hbox2, 1, 2, 1, 2, (GtkAttachOptions) ( 0 ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); button = ui::Button( "Browse..." ); - gtk_widget_show( button ); + button.show(); hbox2.pack_start( button, FALSE, FALSE, 0 ); gtk_widget_set_size_request( button, 60, -1 ); g_object_set_data( G_OBJECT( dlg ), "bmp_file_browse", button ); button.connect( "clicked", G_CALLBACK( bitmap_browse ), NULL ); button = ui::Button( "Reload" ); - gtk_widget_show( button ); + button.show(); hbox2.pack_start( button, FALSE, FALSE, 0 ); gtk_widget_set_size_request( button, 60, -1 ); g_object_set_data( G_OBJECT( dlg ), "bmp_reload", button ); button.connect( "clicked", G_CALLBACK( bitmap_reload ), NULL ); table = ui::Table( 2, 2, TRUE ); - gtk_widget_show( table ); + table.show(); gtk_container_set_border_width( GTK_CONTAINER( table ), 5 ); vbox.pack_start( table, FALSE, TRUE, 0 ); gtk_table_set_row_spacings( GTK_TABLE( table ), 5 ); gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); label = ui::Label( "Map color 0 to:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL | GTK_EXPAND ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1858,7 +1858,7 @@ GtkWidget* create_main_dialog(){ gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_RIGHT ); label = ui::Label( "Map color 255 to:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL | GTK_EXPAND ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1867,37 +1867,37 @@ GtkWidget* create_main_dialog(){ gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_RIGHT ); hbox2 = ui::HBox( FALSE, 5 ); - gtk_widget_show( hbox2 ); + hbox2.show(); gtk_table_attach( GTK_TABLE( table ), hbox2, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); hbox2.pack_start( entry, FALSE, FALSE, 0 ); gtk_widget_set_size_request( entry, 50, -1 ); g_object_set_data( G_OBJECT( dlg ), "bmp_black", entry ); entry.connect( "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &gbmp.black_value ); hbox2 = ui::HBox( FALSE, 5 ); - gtk_widget_show( hbox2 ); + hbox2.show(); gtk_table_attach( GTK_TABLE( table ), hbox2, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); hbox2.pack_start( entry, FALSE, FALSE, 0 ); gtk_widget_set_size_request( entry, 50, -1 ); g_object_set_data( G_OBJECT( dlg ), "bmp_white", entry ); entry.connect( "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &gbmp.white_value ); vbox = ui::VBox( FALSE, 10 ); - gtk_widget_show( vbox ); + vbox.show(); gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 ); label = ui::Label( "Fix Points" ); - gtk_widget_show( label ); + label.show(); gtk_notebook_append_page( GTK_NOTEBOOK( notebook ), vbox, label ); label = ui::Label( "Click on a vertex in the lower half of the preview window,\n" @@ -1906,18 +1906,18 @@ GtkWidget* create_main_dialog(){ "selection. Use Shift+Click to select a range of vertices.\n\n" "Click \"Free\" to unlock a vertex. Vertices within \"Range\n" "affected\" will be influenced by this vertex." ); - gtk_widget_show( label ); + label.show(); vbox.pack_start( label, FALSE, TRUE, 0 ); table = ui::Table( 3, 3, FALSE ); - gtk_widget_show( table ); + table.show(); gtk_container_set_border_width( GTK_CONTAINER( table ), 5 ); vbox.pack_start( table, FALSE, TRUE, 0 ); gtk_table_set_row_spacings( GTK_TABLE( table ), 5 ); gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); label = ui::Label( "Value:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1925,7 +1925,7 @@ GtkWidget* create_main_dialog(){ g_object_set_data( G_OBJECT( dlg ), "fix_value_text", label ); label = ui::Label( "Range affected:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1933,7 +1933,7 @@ GtkWidget* create_main_dialog(){ g_object_set_data( G_OBJECT( dlg ), "fix_range_text", label ); label = ui::Label( "Rate of change:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1943,7 +1943,7 @@ GtkWidget* create_main_dialog(){ adj = ui::Adjustment( 0, -65536, 65536, 1, 16, 0 ); adj.connect( "value_changed", G_CALLBACK( fix_value_changed ), NULL ); spin = ui::SpinButton( adj, 1, 0 ); - gtk_widget_show( spin ); + spin.show(); gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_EXPAND ), (GtkAttachOptions) ( GTK_EXPAND ), 0, 0 ); @@ -1952,7 +1952,7 @@ GtkWidget* create_main_dialog(){ spin.connect( "focus_out_event", G_CALLBACK( fix_value_entryfocusout ), NULL ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_EXPAND ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1961,7 +1961,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( fix_range_entryfocusout ), NULL ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 2, 3, (GtkAttachOptions) ( GTK_EXPAND ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1970,7 +1970,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( fix_rate_entryfocusout ), NULL ); button = ui::Button( "Free" ); - gtk_widget_show( button ); + button.show(); gtk_table_attach( GTK_TABLE( table ), button, 2, 3, 0, 1, (GtkAttachOptions) ( GTK_EXPAND ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1979,7 +1979,7 @@ GtkWidget* create_main_dialog(){ button.connect( "clicked", G_CALLBACK( fix_free ), NULL ); button = ui::Button( "Free All" ); - gtk_widget_show( button ); + button.show(); gtk_table_attach( GTK_TABLE( table ), button, 2, 3, 1, 2, (GtkAttachOptions) ( GTK_EXPAND ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -1988,43 +1988,43 @@ GtkWidget* create_main_dialog(){ button.connect( "clicked", G_CALLBACK( fix_freeall ), NULL ); vbox = ui::VBox( FALSE, 10 ); - gtk_widget_show( vbox ); + vbox.show(); gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 ); label = ui::Label( "Texture" ); - gtk_widget_show( label ); + label.show(); gtk_notebook_append_page( GTK_NOTEBOOK( notebook ), vbox, label ); // ^Fishman - Modified to add more labels and textboxes. table = ui::Table( 5, 2, FALSE ); - gtk_widget_show( table ); + table.show(); vbox.pack_start( table, FALSE, TRUE, 0 ); gtk_table_set_row_spacings( GTK_TABLE( table ), 5 ); gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); label = ui::Label( "Surface:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); label = ui::Label( "Other:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); label = ui::Label( "Steep:" ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -2033,7 +2033,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( texture_entryfocusout ), GINT_TO_POINTER( 0 ) ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -2042,7 +2042,7 @@ GtkWidget* create_main_dialog(){ entry.connect( "focus_out_event", G_CALLBACK( texture_entryfocusout ), GINT_TO_POINTER( 1 ) ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 2, 3, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -2050,39 +2050,39 @@ GtkWidget* create_main_dialog(){ g_object_set_data( G_OBJECT( dlg ), "texture3", entry ); hbox2 = ui::HBox( FALSE, 5 ); - gtk_widget_show( hbox2 ); + hbox2.show(); vbox.pack_start( hbox2, FALSE, TRUE, 0 ); label = ui::Label( "\"Steep\" angle:" ); - gtk_widget_show( label ); + label.show(); hbox2.pack_start( label, FALSE, TRUE, 0 ); adj = ui::Adjustment( 60, 0, 90, 1, 10, 0 ); spin = ui::SpinButton( adj, 1, 0 ); - gtk_widget_show( spin ); + spin.show(); hbox2.pack_start( spin, FALSE, TRUE, 0 ); g_object_set_data( G_OBJECT( dlg ), "tex_slant", spin ); table = ui::Table( 2, 4, TRUE ); - gtk_widget_show( table ); + table.show(); vbox.pack_start( table, FALSE, TRUE, 0 ); gtk_table_set_row_spacings( GTK_TABLE( table ), 5 ); gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); label = ui::Label( "Offset " ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 0, 2, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); label = ui::Label( "Scale " ); - gtk_widget_show( label ); + label.show(); gtk_table_attach( GTK_TABLE( table ), label, 2, 4, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -2090,7 +2090,7 @@ GtkWidget* create_main_dialog(){ g_object_set_data( G_OBJECT( dlg ), "texoffsetx", entry ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -2098,7 +2098,7 @@ GtkWidget* create_main_dialog(){ g_object_set_data( G_OBJECT( dlg ), "texoffsety", entry ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 2, 3, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -2106,7 +2106,7 @@ GtkWidget* create_main_dialog(){ g_object_set_data( G_OBJECT( dlg ), "texscalex", entry ); entry = ui::Entry(); - gtk_widget_show( entry ); + entry.show(); gtk_table_attach( GTK_TABLE( table ), entry, 3, 4, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); @@ -2116,71 +2116,71 @@ GtkWidget* create_main_dialog(){ check = ui::CheckButton( "Use detail brushes" ); - gtk_widget_show( check ); + check.show(); vbox.pack_start( check, FALSE, TRUE, 0 ); g_object_set_data( G_OBJECT( dlg ), "detail", check ); check.connect( "toggled", G_CALLBACK( texture_detail ), NULL ); check = ui::CheckButton( "Detail hint brushes" ); - gtk_widget_show( check ); + check.show(); vbox.pack_start( check, FALSE, TRUE, 0 ); g_object_set_data( G_OBJECT( dlg ), "hint", check ); check.connect( "toggled", G_CALLBACK( texture_hint ), NULL ); // ^Fishman - Add terrain key to func_group. check = ui::CheckButton( "Add terrain key" ); - gtk_widget_show( check ); + check.show(); vbox.pack_start( check, FALSE, TRUE, 0 ); g_object_set_data( G_OBJECT( dlg ), "terrain_ent", check ); check.connect( "toggled", G_CALLBACK( texture_terrainent ), NULL ); vbox = ui::VBox( FALSE, 5 ); - gtk_widget_show( vbox ); + vbox.show(); hbox.pack_start( vbox, FALSE, TRUE, 0 ); button = ui::Button( "OK" ); - gtk_widget_show( button ); + button.show(); vbox.pack_start( button, FALSE, TRUE, 0 ); gtk_widget_set_size_request( button, 60, -1 ); g_object_set_data( G_OBJECT( dlg ), "go", button ); button.connect( "clicked", G_CALLBACK( main_go ), NULL ); label = ui::Label( "Settings:" ); - gtk_widget_show( label ); + label.show(); vbox.pack_start( label, FALSE, TRUE, 0 ); button = ui::Button( "Open..." ); - gtk_widget_show( button ); + button.show(); vbox.pack_start( button, FALSE, TRUE, 0 ); g_object_set_data( G_OBJECT( dlg ), "open", button ); button.connect( "clicked", G_CALLBACK( main_open ), NULL ); button = ui::Button( "Save as..." ); - gtk_widget_show( button ); + button.show(); vbox.pack_start( button, FALSE, TRUE, 0 ); g_object_set_data( G_OBJECT( dlg ), "save", button ); button.connect( "clicked", G_CALLBACK( main_save ), NULL ); button = ui::Button( "Defaults" ); - gtk_widget_show( button ); + button.show(); vbox.pack_start( button, FALSE, TRUE, 0 ); g_object_set_data( G_OBJECT( dlg ), "defaults", button ); button.connect( "clicked", G_CALLBACK( main_defaults ), NULL ); button = ui::Button( "About..." ); - gtk_widget_show( button ); + button.show(); vbox.pack_start( button, FALSE, TRUE, 0 ); button.connect( "clicked", G_CALLBACK( main_about ), NULL ); check = ui::CheckButton( "Preview" ); - gtk_widget_show( check ); + check.show(); vbox.pack_start( check, FALSE, TRUE, 0 ); check.connect( "toggled", G_CALLBACK( main_preview ), NULL ); g_object_set_data( G_OBJECT( dlg ), "main_preview", check ); // ^Fishman - Antializing for the preview window. check = ui::CheckButton( "Antialised lines" ); - gtk_widget_show( check ); + check.show(); vbox.pack_start( check, FALSE, TRUE, 0 ); g_object_set_data( G_OBJECT( dlg ), "main_antialiasing", check ); check.connect( "toggled", G_CALLBACK( main_antialiasing ), NULL ); diff --git a/contrib/gtkgensurf/plugin.cpp b/contrib/gtkgensurf/plugin.cpp index 38a730da..6acaa4b9 100644 --- a/contrib/gtkgensurf/plugin.cpp +++ b/contrib/gtkgensurf/plugin.cpp @@ -140,7 +140,7 @@ void QERPlug_Dispatch( const char *p, vec3_t vMin, vec3_t vMax, bool bSingleBrus UseFaceBounds(); } - gtk_widget_show( g_pWnd ); + g_pWnd.show(); } } diff --git a/contrib/gtkgensurf/view.cpp b/contrib/gtkgensurf/view.cpp index 12ac4d94..6969ca5c 100644 --- a/contrib/gtkgensurf/view.cpp +++ b/contrib/gtkgensurf/view.cpp @@ -91,7 +91,7 @@ void ShowPreview(){ if ( g_pWndPreview == NULL ) { CreateViewWindow(); } - gtk_widget_show( g_pWndPreview ); + g_pWndPreview.show(); UpdatePreview( true ); } @@ -383,31 +383,31 @@ void CreateViewWindow(){ #ifndef ISOMETRIC auto hbox = ui::HBox( TRUE, 5 ); - gtk_widget_show( hbox ); + hbox.show(); vbox.pack_start( hbox, FALSE, TRUE, 0 ); gtk_container_set_border_width( GTK_CONTAINER( hbox ), 3 ); label = ui::Label( "Elevation" ); - gtk_widget_show( label ); + label.show(); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); hbox.pack_start( label, FALSE, TRUE, 0 ); auto adj = ui::Adjustment( 30, -90, 90, 1, 10, 0 ); adj.connect( "value_changed", G_CALLBACK( preview_spin ), &elevation ); spin = ui::SpinButton( adj, 1, 0 ); - gtk_widget_show( spin ); + spin.show(); hbox.pack_start( spin, FALSE, TRUE, 0 ); spin.connect( "focus_out_event", G_CALLBACK( doublevariable_spinfocusout ), &elevation ); adj = ui::Adjustment( 30, 0, 359, 1, 10, 0 ); adj.connect( "value_changed", G_CALLBACK( preview_spin ), &azimuth ); spin = ui::SpinButton( adj, 1, 0 ); - gtk_widget_show( spin ); + spin.show(); gtk_spin_button_set_wrap( GTK_SPIN_BUTTON( spin ), TRUE ); hbox.pack_end(spin, FALSE, TRUE, 0); label = ui::Label( "Azimuth" ); - gtk_widget_show( label ); + label.show(); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); hbox.pack_end(label, FALSE, TRUE, 0); spin.connect( "focus_out_event", G_CALLBACK( doublevariable_spinfocusout ), &azimuth ); @@ -426,11 +426,11 @@ void CreateViewWindow(){ g_pPreviewWidget.connect( "button_press_event", G_CALLBACK( button_press ), NULL ); - gtk_widget_show( g_pPreviewWidget ); + g_pPreviewWidget.show(); frame.add(ui::Widget(g_pPreviewWidget)); if ( Preview ) { - gtk_widget_show( g_pWndPreview ); + g_pWndPreview.show(); } UpdatePreview( true ); diff --git a/contrib/hydratoolz/plugin.cpp b/contrib/hydratoolz/plugin.cpp index 43403d08..1f1f6cd0 100644 --- a/contrib/hydratoolz/plugin.cpp +++ b/contrib/hydratoolz/plugin.cpp @@ -102,15 +102,15 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ w = ui::Label( lpText ); vbox.pack_start( w, FALSE, FALSE, 2 ); gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT ); - gtk_widget_show( w ); + w.show(); w = gtk_hseparator_new(); vbox.pack_start( w, FALSE, FALSE, 2 ); - gtk_widget_show( w ); + w.show(); hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); if ( mode == MB_OK ) { w = ui::Button( "Ok" ); @@ -119,7 +119,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); ret = IDOK; } else if ( mode == MB_OKCANCEL ) { @@ -129,13 +129,13 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = IDCANCEL; } else if ( mode == MB_YESNOCANCEL ) { @@ -145,19 +145,19 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDYES ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "No" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDNO ) ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = IDCANCEL; } else /* if (mode == MB_YESNO) */ @@ -168,17 +168,17 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDYES ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "No" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDNO ) ); - gtk_widget_show( w ); + w.show(); ret = IDNO; } - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); while ( loop ) diff --git a/contrib/prtview/ConfigDialog.cpp b/contrib/prtview/ConfigDialog.cpp index f97ad3f2..c8090053 100644 --- a/contrib/prtview/ConfigDialog.cpp +++ b/contrib/prtview/ConfigDialog.cpp @@ -71,7 +71,7 @@ static int DoColor( PackedColour *c ){ 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 ) @@ -261,70 +261,70 @@ void DoConfigDialog(){ gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 ); auto hbox = ui::HBox( FALSE, 5 ); - gtk_widget_show( hbox ); + hbox.show(); vbox2.pack_start( hbox, TRUE, TRUE, 0 ); auto adj = ui::Adjustment( portals.width_3d, 2, 40, 1, 1, 0 ); auto lw3slider = ui::HScale( adj ); - gtk_widget_show( lw3slider ); + lw3slider.show(); hbox.pack_start( lw3slider, TRUE, TRUE, 0 ); gtk_scale_set_draw_value( GTK_SCALE( lw3slider ), FALSE ); auto lw3label = ui::Label( "" ); - gtk_widget_show( lw3label ); + lw3label.show(); hbox.pack_start( lw3label, FALSE, TRUE, 0 ); adj.connect( "value_changed", G_CALLBACK( OnScroll3d ), lw3label ); auto table = ui::Table( 2, 4, FALSE ); - gtk_widget_show( table ); + table.show(); vbox2.pack_start( table, TRUE, TRUE, 0 ); gtk_table_set_row_spacings( GTK_TABLE( table ), 5 ); gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); auto button = ui::Button( "Color" ); - gtk_widget_show( button ); + button.show(); gtk_table_attach( GTK_TABLE( table ), button, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); button.connect( "clicked", G_CALLBACK( OnColor3d ), NULL ); button = ui::Button( "Depth Color" ); - gtk_widget_show( button ); + button.show(); gtk_table_attach( GTK_TABLE( table ), button, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); button.connect( "clicked", G_CALLBACK( OnColorFog ), NULL ); auto aa3check = ui::CheckButton( "Anti-Alias (May not work on some video cards)" ); - gtk_widget_show( aa3check ); + aa3check.show(); gtk_table_attach( GTK_TABLE( table ), aa3check, 1, 4, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); aa3check.connect( "toggled", G_CALLBACK( OnAntiAlias3d ), NULL ); auto depthcheck = ui::CheckButton( "Depth Cue" ); - gtk_widget_show( depthcheck ); + depthcheck.show(); gtk_table_attach( GTK_TABLE( table ), depthcheck, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); depthcheck.connect( "toggled", G_CALLBACK( OnFog ), NULL ); auto linescheck = ui::CheckButton( "Lines" ); - gtk_widget_show( linescheck ); + linescheck.show(); gtk_table_attach( GTK_TABLE( table ), linescheck, 2, 3, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); linescheck.connect( "toggled", G_CALLBACK( OnLines ), NULL ); auto polyscheck = ui::CheckButton( "Polygons" ); - gtk_widget_show( polyscheck ); + polyscheck.show(); gtk_table_attach( GTK_TABLE( table ), polyscheck, 3, 4, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); polyscheck.connect( "toggled", G_CALLBACK( OnPoly ), NULL ); auto zlist = ui::ComboBoxText(ui::New); - gtk_widget_show( zlist ); + 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)"); @@ -336,21 +336,21 @@ void DoConfigDialog(){ }), nullptr); table = ui::Table( 2, 2, FALSE ); - gtk_widget_show( table ); + table.show(); vbox2.pack_start( table, TRUE, TRUE, 0 ); gtk_table_set_row_spacings( GTK_TABLE( table ), 5 ); gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); adj = ui::Adjustment( portals.trans_3d, 0, 100, 1, 1, 0 ); auto transslider = ui::HScale( adj ); - gtk_widget_show( transslider ); + transslider.show(); gtk_table_attach( GTK_TABLE( table ), transslider, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); gtk_scale_set_draw_value( GTK_SCALE( transslider ), FALSE ); auto translabel = ui::Label( "" ); - gtk_widget_show( translabel ); + translabel.show(); gtk_table_attach( GTK_TABLE( table ), translabel, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); @@ -359,14 +359,14 @@ void DoConfigDialog(){ adj = ui::Adjustment( portals.clip_range, 1, 128, 1, 1, 0 ); auto clipslider = ui::HScale( adj ); - gtk_widget_show( clipslider ); + clipslider.show(); gtk_table_attach( GTK_TABLE( table ), clipslider, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); gtk_scale_set_draw_value( GTK_SCALE( clipslider ), FALSE ); auto cliplabel = ui::Label( "" ); - gtk_widget_show( cliplabel ); + cliplabel.show(); gtk_table_attach( GTK_TABLE( table ), cliplabel, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); @@ -374,21 +374,21 @@ void DoConfigDialog(){ adj.connect( "value_changed", G_CALLBACK( OnScrollClip ), cliplabel ); hbox = ui::HBox( TRUE, 5 ); - gtk_widget_show( hbox ); + hbox.show(); vbox2.pack_start( hbox, TRUE, FALSE, 0 ); auto show3check = ui::CheckButton( "Show" ); - gtk_widget_show( show3check ); + show3check.show(); hbox.pack_start( show3check, TRUE, TRUE, 0 ); show3check.connect( "toggled", G_CALLBACK( OnConfig3d ), NULL ); auto portalcheck = ui::CheckButton( "Portal cubic clipper" ); - gtk_widget_show( portalcheck ); + portalcheck.show(); hbox.pack_start( portalcheck, TRUE, TRUE, 0 ); portalcheck.connect( "toggled", G_CALLBACK( OnClip ), NULL ); frame = ui::Frame( "2D View" ); - gtk_widget_show( frame ); + frame.show(); vbox.pack_start( frame, TRUE, TRUE, 0 ); vbox2 = ui::VBox( FALSE, 5 ); @@ -397,50 +397,50 @@ void DoConfigDialog(){ gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 ); hbox = ui::HBox( FALSE, 5 ); - gtk_widget_show( hbox ); + hbox.show(); vbox2.pack_start( hbox, TRUE, FALSE, 0 ); adj = ui::Adjustment( portals.width_2d, 2, 40, 1, 1, 0 ); auto lw2slider = ui::HScale( adj ); - gtk_widget_show( lw2slider ); + lw2slider.show(); hbox.pack_start( lw2slider, TRUE, TRUE, 0 ); gtk_scale_set_draw_value( GTK_SCALE( lw2slider ), FALSE ); auto lw2label = ui::Label( "" ); - gtk_widget_show( lw2label ); + lw2label.show(); hbox.pack_start( lw2label, FALSE, TRUE, 0 ); adj.connect( "value_changed", G_CALLBACK( OnScroll2d ), lw2label ); hbox = ui::HBox( FALSE, 5 ); - gtk_widget_show( hbox ); + hbox.show(); vbox2.pack_start( hbox, TRUE, FALSE, 0 ); button = ui::Button( "Color" ); - gtk_widget_show( button ); + button.show(); hbox.pack_start( button, FALSE, FALSE, 0 ); button.connect( "clicked", G_CALLBACK( OnColor2d ), NULL ); gtk_widget_set_size_request( button, 60, -1 ); auto aa2check = ui::CheckButton( "Anti-Alias (May not work on some video cards)" ); - gtk_widget_show( aa2check ); + aa2check.show(); hbox.pack_start( aa2check, TRUE, TRUE, 0 ); aa2check.connect( "toggled", G_CALLBACK( OnAntiAlias2d ), NULL ); hbox = ui::HBox( FALSE, 5 ); - gtk_widget_show( hbox ); + hbox.show(); vbox2.pack_start( hbox, TRUE, FALSE, 0 ); auto show2check = ui::CheckButton( "Show" ); - gtk_widget_show( show2check ); + show2check.show(); hbox.pack_start( show2check, FALSE, FALSE, 0 ); show2check.connect( "toggled", G_CALLBACK( OnConfig2d ), NULL ); hbox = ui::HBox( FALSE, 5 ); - gtk_widget_show( hbox ); + hbox.show(); vbox.pack_start( hbox, FALSE, FALSE, 0 ); button = ui::Button( "OK" ); - gtk_widget_show( button ); + button.show(); hbox.pack_end(button, FALSE, FALSE, 0); button.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) ); @@ -464,7 +464,7 @@ void DoConfigDialog(){ SetClipText( cliplabel ); gtk_grab_add( dlg ); - gtk_widget_show( dlg ); + dlg.show(); while ( loop ) gtk_main_iteration(); diff --git a/contrib/prtview/LoadPortalFileDialog.cpp b/contrib/prtview/LoadPortalFileDialog.cpp index aef0e3f5..3252bc40 100644 --- a/contrib/prtview/LoadPortalFileDialog.cpp +++ b/contrib/prtview/LoadPortalFileDialog.cpp @@ -94,41 +94,41 @@ int DoLoadPortalFileDialog(){ gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 ); auto entry = ui::Entry(ui::New); - gtk_widget_show( entry ); + entry.show(); gtk_editable_set_editable( GTK_EDITABLE( entry ), FALSE ); vbox.pack_start( entry, FALSE, FALSE, 0 ); auto hbox = ui::HBox( FALSE, 5 ); - gtk_widget_show( hbox ); + hbox.show(); vbox.pack_start( hbox, FALSE, FALSE, 0 ); auto check3d = ui::CheckButton( "Show 3D" ); - gtk_widget_show( check3d ); + check3d.show(); hbox.pack_start( check3d, FALSE, FALSE, 0 ); auto check2d = ui::CheckButton( "Show 2D" ); - gtk_widget_show( check2d ); + check2d.show(); hbox.pack_start( check2d, FALSE, FALSE, 0 ); auto button = ui::Button( "Change" ); - gtk_widget_show( button ); + button.show(); hbox.pack_end(button, FALSE, FALSE, 0); button.connect( "clicked", G_CALLBACK( change_clicked ), entry ); gtk_widget_set_size_request( button, 60, -1 ); hbox = ui::HBox( FALSE, 5 ); - gtk_widget_show( hbox ); + hbox.show(); vbox.pack_start( hbox, FALSE, FALSE, 0 ); button = ui::Button( "Cancel" ); - gtk_widget_show( button ); + button.show(); hbox.pack_end(button, FALSE, FALSE, 0); button.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) ); gtk_widget_set_size_request( button, 60, -1 ); button = ui::Button( "OK" ); - gtk_widget_show( button ); + button.show(); hbox.pack_end(button, FALSE, FALSE, 0); button.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) ); @@ -147,7 +147,7 @@ int DoLoadPortalFileDialog(){ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( check3d ), portals.show_3d ); gtk_grab_add( dlg ); - gtk_widget_show( dlg ); + dlg.show(); while ( loop ) gtk_main_iteration(); diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp index c5eb96d3..8fa34e65 100644 --- a/libs/gtkutil/dialog.cpp +++ b/libs/gtkutil/dialog.cpp @@ -87,7 +87,7 @@ 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 ) ); + window.show(); dialog.loop = true; while ( dialog.loop ) @@ -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.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.show(); hbox.pack_end(button, FALSE, FALSE, 0); frame.add(hbox); @@ -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,7 +246,7 @@ 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 ); diff --git a/libs/gtkutil/messagebox.cpp b/libs/gtkutil/messagebox.cpp index 50544aeb..334c4e78 100644 --- a/libs/gtkutil/messagebox.cpp +++ b/libs/gtkutil/messagebox.cpp @@ -29,7 +29,7 @@ ui::Widget create_padding( int width, int height ){ ui::Alignment widget = ui::Alignment( 0.0, 0.0, 0.0, 0.0 ); - gtk_widget_show( widget ); + widget.show(); gtk_widget_set_size_request( widget, width, height ); return widget; } @@ -83,11 +83,11 @@ EMessageBoxReturn gtk_MessageBox( ui::Widget parent, const char* text, const cha hboxDummy.pack_start( iconBox, FALSE, FALSE, 0 ); auto image = ui::Image(GTK_IMAGE( gtk_image_new_from_stock( messagebox_stock_icon( icon ), GTK_ICON_SIZE_DIALOG ) )); - gtk_widget_show( GTK_WIDGET( image ) ); + image.show(); iconBox.pack_start( image, FALSE, FALSE, 0 ); auto label = ui::Label( text ); - gtk_widget_show( GTK_WIDGET( label ) ); + label.show(); gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 ); gtk_label_set_justify( label, GTK_JUSTIFY_LEFT ); gtk_label_set_line_wrap( label, TRUE ); @@ -98,7 +98,7 @@ EMessageBoxReturn gtk_MessageBox( ui::Widget parent, const char* text, const cha vbox.pack_start( vboxDummy, FALSE, FALSE, 0 ); auto alignment = ui::Alignment( 0.5, 0.0, 0.0, 0.0 ); - gtk_widget_show( GTK_WIDGET( alignment ) ); + alignment.show(); vboxDummy.pack_start( alignment, FALSE, FALSE, 0 ); auto hbox = create_dialog_hbox( 8, 0 ); @@ -130,7 +130,7 @@ EMessageBoxReturn gtk_MessageBox( ui::Widget parent, const char* text, const cha auto button = create_modal_dialog_button( "OK", cancel_button ); hbox.pack_start( button, TRUE, FALSE, 0 ); gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 ); - gtk_widget_show( GTK_WIDGET( button ) ); + button.show(); } dialog.ret = eIDCANCEL; @@ -146,12 +146,12 @@ EMessageBoxReturn gtk_MessageBox( ui::Widget parent, const char* text, const cha { auto button = create_modal_dialog_button( "No", no_button ); hbox.pack_start( button, TRUE, FALSE, 0 ); - gtk_widget_show( GTK_WIDGET( button ) ); + button.show(); } { auto button = create_modal_dialog_button( "Cancel", cancel_button ); hbox.pack_start( button, TRUE, FALSE, 0 ); - gtk_widget_show( GTK_WIDGET( button ) ); + button.show(); } dialog.ret = eIDCANCEL; @@ -166,7 +166,7 @@ EMessageBoxReturn gtk_MessageBox( ui::Widget parent, const char* text, const cha { auto button = create_modal_dialog_button( "Yes", yes_button ); hbox.pack_start( button, TRUE, FALSE, 0 ); - gtk_widget_show( GTK_WIDGET( button ) ); + button.show(); } dialog.ret = eIDNO; @@ -177,13 +177,13 @@ EMessageBoxReturn gtk_MessageBox( ui::Widget parent, const char* text, const cha auto button = create_modal_dialog_button( "Yes", yes_button ); hbox.pack_start( button, TRUE, FALSE, 0 ); widget_make_default( button ); - gtk_widget_show( GTK_WIDGET( button ) ); + button.show(); } { auto button = create_modal_dialog_button( "No", no_button ); hbox.pack_start( button, TRUE, FALSE, 0 ); - gtk_widget_show( GTK_WIDGET( button ) ); + button.show(); } dialog.ret = eIDNO; } diff --git a/libs/gtkutil/paned.cpp b/libs/gtkutil/paned.cpp index 1ad28d4e..4149f8b7 100644 --- a/libs/gtkutil/paned.cpp +++ b/libs/gtkutil/paned.cpp @@ -71,7 +71,7 @@ ui::HPaned create_split_views( ui::Widget topleft, ui::Widget topright, ui::Widg { auto vsplit = ui::VPaned(ui::New); gtk_paned_add1( GTK_PANED( hsplit ), GTK_WIDGET( vsplit ) ); - gtk_widget_show( GTK_WIDGET( vsplit ) ); + vsplit.show(); vsplit.connect( "size_allocate", G_CALLBACK( vpaned_allocate ), &g_vpaned1 ); vsplit.connect( "notify::position", G_CALLBACK( paned_position ), &g_vpaned1 ); @@ -82,7 +82,7 @@ ui::HPaned create_split_views( ui::Widget topleft, ui::Widget topright, ui::Widg { auto vsplit = ui::VPaned(ui::New); gtk_paned_add2( GTK_PANED( hsplit ), GTK_WIDGET( vsplit ) ); - gtk_widget_show( GTK_WIDGET( vsplit ) ); + vsplit.show(); vsplit.connect( "size_allocate", G_CALLBACK( vpaned_allocate ), &g_vpaned2 ); vsplit.connect( "notify::position", G_CALLBACK( paned_position ), &g_vpaned2 ); diff --git a/libs/gtkutil/window.cpp b/libs/gtkutil/window.cpp index 7fc62eae..3da0b3b1 100644 --- a/libs/gtkutil/window.cpp +++ b/libs/gtkutil/window.cpp @@ -28,7 +28,7 @@ inline void CHECK_RESTORE( ui::Widget w ){ if ( gpointer_to_int( g_object_get_data( G_OBJECT( w ), "was_mapped" ) ) != 0 ) { - gtk_widget_show( w ); + w.show(); } } @@ -138,7 +138,7 @@ void window_remove_minmax( ui::Window window ){ ui::ScrolledWindow create_scrolled_window( ui::Policy hscrollbar_policy, ui::Policy vscrollbar_policy, int border ){ auto scr = ui::ScrolledWindow(ui::New); - gtk_widget_show( GTK_WIDGET( scr ) ); + scr.show(); gtk_scrolled_window_set_policy( scr, (GtkPolicyType) hscrollbar_policy, (GtkPolicyType) vscrollbar_policy ); gtk_scrolled_window_set_shadow_type( scr, GTK_SHADOW_IN ); gtk_container_set_border_width( GTK_CONTAINER( scr ), border ); diff --git a/plugins/textool/2DView.cpp b/plugins/textool/2DView.cpp index f6e10185..2e3ef526 100644 --- a/plugins/textool/2DView.cpp +++ b/plugins/textool/2DView.cpp @@ -118,22 +118,22 @@ bool C2DView::OnRButtonUp( int x, int y ){ item = ui::MenuItem( "Validate (RETURN)" ); item.connect( "activate", G_CALLBACK( Textool_Validate ), NULL ); - gtk_widget_show( item ); + item.show(); gtk_menu_append( GTK_MENU( menu ), item ); item = ui::MenuItem( "Zoom in (INSERT)" ); item.connect( "activate", G_CALLBACK( view_ZoomIn ), this ); - gtk_widget_show( item ); + item.show(); gtk_menu_append( GTK_MENU( menu ), item ); item = ui::MenuItem( "Zoom out (DELETE)" ); item.connect( "activate", G_CALLBACK( view_ZoomOut ), this ); - gtk_widget_show( item ); + item.show(); gtk_menu_append( GTK_MENU( menu ), item ); item = ui::MenuItem( "Cancel (ESC)" ); item.connect( "activate", G_CALLBACK( Textool_Cancel ), NULL ); - gtk_widget_show( item ); + item.show(); gtk_menu_append( GTK_MENU( menu ), item ); gtk_menu_popup( GTK_MENU( menu ), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME ); diff --git a/plugins/textool/TexTool.cpp b/plugins/textool/TexTool.cpp index 96851a48..818d8d2f 100644 --- a/plugins/textool/TexTool.cpp +++ b/plugins/textool/TexTool.cpp @@ -67,20 +67,20 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ vbox = ui::VBox( FALSE, 10 ); window.add(vbox); - gtk_widget_show( vbox ); + vbox.show(); w = ui::Label( lpText ); vbox.pack_start( w, FALSE, FALSE, 2 ); gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT ); - gtk_widget_show( w ); + w.show(); w = gtk_hseparator_new(); vbox.pack_start( w, FALSE, FALSE, 2 ); - gtk_widget_show( w ); + w.show(); hbox = ui::HBox( FALSE, 10 ); vbox.pack_start( hbox, FALSE, FALSE, 2 ); - gtk_widget_show( hbox ); + hbox.show(); if ( mode == MB_OK ) { w = ui::Button( "Ok" ); @@ -89,7 +89,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); ret = IDOK; } else if ( mode == MB_OKCANCEL ) { @@ -99,13 +99,13 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = IDCANCEL; } else if ( mode == MB_YESNOCANCEL ) { @@ -115,19 +115,19 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDYES ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "No" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDNO ) ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "Cancel" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) ); - gtk_widget_show( w ); + w.show(); ret = IDCANCEL; } else /* if (mode == MB_YESNO) */ @@ -138,17 +138,17 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDYES ) ); gtk_widget_set_can_default( w, true ); gtk_widget_grab_default( w ); - gtk_widget_show( w ); + w.show(); w = ui::Button( "No" ); hbox.pack_start( w, TRUE, TRUE, 0 ); w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDNO ) ); - gtk_widget_show( w ); + w.show(); ret = IDNO; } - gtk_widget_show( window ); + window.show(); gtk_grab_add( window ); while ( loop )