Wrap more GTK

diff --git a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp
index 52f4f70a06a6552c5dc7a33d3f07c07e32873b90..dd08de2bf9fea88c80f88b3943b148939ca32d88 100644 (file)
--- a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp
+++ b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp
@@ -91,13 +91,10 @@ static void dialog_button_callback( GtkWidget *widget, gpointer data ){
        *ret = (EMessageBoxReturn)gpointer_to_int( data );
 }
 
-static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){
-       int *loop;
-
-       gtk_widget_hide( widget );
-       loop = (int*)g_object_get_data( G_OBJECT( widget ), "loop" );
+static gint dialog_delete_callback( ui::Widget widget, GdkEvent* event, gpointer data ){
+       widget.hide();
+       int *loop = (int *) g_object_get_data(G_OBJECT(widget), "loop");
        *loop = 0;
-
        return TRUE;
 }
 
@@ -305,7 +302,7 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess
                gtk_main_iteration();
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return ret;
 }
@@ -400,7 +397,7 @@ EMessageBoxReturn DoIntersectBox( IntersectRS* rs ){
        rs->bDuplicateOnly = gtk_toggle_button_get_active( (GtkToggleButton*)check2 ) ? true : false;
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return ret;
 }
@@ -567,7 +564,7 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){
        }
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return ret;
 }
@@ -822,7 +819,7 @@ EMessageBoxReturn DoBuildStairsBox( BuildStairsRS* rs ){
        }
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return ret;
 // -djbob
@@ -1037,7 +1034,7 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){
        }
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return ret;
 //-djbob
@@ -1210,7 +1207,7 @@ EMessageBoxReturn DoPathPlotterBox( PathPlotterRS* rs ){
        }
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return ret;
 }
@@ -1278,7 +1275,7 @@ EMessageBoxReturn DoCTFColourChangeBox(){
                gtk_main_iteration();
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return ret;
 }
@@ -1609,7 +1606,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){
        }
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return ret;
 }
@@ -1876,7 +1873,7 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){
        }
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return ret;
 }
@@ -1988,7 +1985,7 @@ EMessageBoxReturn DoMakeChainBox( MakeChainRS* rs ){
        }
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return ret;
 }

diff --git a/contrib/brushexport/interface.cpp b/contrib/brushexport/interface.cpp
index e06040d3514f26e9c21c68070acf8cec715936d1..580b8dec24e13ed23a5ddc568207ad7fa8ff1c1f 100644 (file)
--- a/contrib/brushexport/interface.cpp
+++ b/contrib/brushexport/interface.cpp
@@ -216,7 +216,7 @@ void CreateWindow( void ){
 
 void DestroyWindow( void ){
        ASSERT_NOTNULL( g_brushexp_window );
-       gtk_widget_destroy( g_brushexp_window );
+       ui::Widget(g_brushexp_window).destroy();
        g_brushexp_window = 0;
 }
 

diff --git a/contrib/camera/dialogs.cpp b/contrib/camera/dialogs.cpp
index 9425521dacee936324954769e3cd38cc9dfecc4f..4504655c2c85e33df2ef9a4bf0aa8098bd259f65 100644 (file)
--- a/contrib/camera/dialogs.cpp
+++ b/contrib/camera/dialogs.cpp
@@ -171,7 +171,7 @@ static gint ci_new( GtkWidget *widget, gpointer data ){
        }
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return TRUE;
 }
@@ -463,7 +463,7 @@ static gint ci_rename( GtkWidget *widget, gpointer data ){
        }
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return TRUE;
 }
@@ -629,7 +629,7 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ){
        }
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return TRUE;
 }
@@ -952,7 +952,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ){
        }
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return TRUE;
 }

diff --git a/contrib/hydratoolz/plugin.cpp b/contrib/hydratoolz/plugin.cpp
index 5ca4fad153519b147f1832f441140feb4ede136d..52e79091f0729fbf2c349c7971ea72397413d81c 100644 (file)
--- a/contrib/hydratoolz/plugin.cpp
+++ b/contrib/hydratoolz/plugin.cpp
@@ -185,7 +185,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
                gtk_main_iteration();
 
        gtk_grab_remove( window );
-       gtk_widget_destroy( window );
+       window.destroy();
 
        return ret;
 }

diff --git a/contrib/prtview/AboutDialog.cpp b/contrib/prtview/AboutDialog.cpp
index 640730320455c56baa7fcafe22b543581e41f895..0e342f4091848bebce44d6cfcaf9bc5faff0f248 100644 (file)
--- a/contrib/prtview/AboutDialog.cpp
+++ b/contrib/prtview/AboutDialog.cpp
@@ -39,13 +39,10 @@ static void dialog_button_callback( GtkWidget *widget, gpointer data ){
        *ret = gpointer_to_int( data );
 }
 
-static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){
-       int *loop;
-
-       gtk_widget_hide( widget );
-       loop = (int*)g_object_get_data( G_OBJECT( widget ), "loop" );
+static gint dialog_delete_callback( ui::Widget widget, GdkEvent* event, gpointer data ){
+       widget.hide();
+       int *loop = (int *) g_object_get_data(G_OBJECT(widget), "loop");
        *loop = 0;
-
        return TRUE;
 }
 
@@ -91,7 +88,7 @@ void DoAboutDlg(){
                gtk_main_iteration();
 
        gtk_grab_remove(dlg);
-       gtk_widget_destroy(dlg);
+       dlg.destroy();
 }
 
 

diff --git a/contrib/prtview/ConfigDialog.cpp b/contrib/prtview/ConfigDialog.cpp
index 7599690d038a23b6a9aa34e133bf18f8feb0d510..86828d090c12f5c3cd6a6bbb4ff695bd8ead1f4a 100644 (file)
--- a/contrib/prtview/ConfigDialog.cpp
+++ b/contrib/prtview/ConfigDialog.cpp
@@ -40,13 +40,10 @@ static void dialog_button_callback( GtkWidget *widget, gpointer data ){
        *ret = gpointer_to_int( data );
 }
 
-static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){
-       int *loop;
-
-       gtk_widget_hide( widget );
-       loop = (int*)g_object_get_data( G_OBJECT( widget ), "loop" );
+static gint dialog_delete_callback( ui::Widget widget, GdkEvent* event, gpointer data ){
+       widget.hide();
+       int *loop = (int *) g_object_get_data(G_OBJECT(widget), "loop");
        *loop = 0;
-
        return TRUE;
 }
 
@@ -83,7 +80,7 @@ static int DoColor( PackedColour *c ){
        gtk_color_selection_get_current_color( GTK_COLOR_SELECTION( gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dlg)) ), &clr );
 
        gtk_grab_remove( dlg );
-       gtk_widget_destroy( dlg );
+       dlg.destroy();
 
        if ( ret == IDOK ) {
                *c = RGB( clr.red / (65535 / 255), clr.green / (65535 / 255), clr.blue / (65535 / 255));
@@ -476,5 +473,5 @@ void DoConfigDialog(){
                gtk_main_iteration();
 
        gtk_grab_remove( dlg );
-       gtk_widget_destroy( dlg );
+       dlg.destroy();
 }

diff --git a/contrib/prtview/LoadPortalFileDialog.cpp b/contrib/prtview/LoadPortalFileDialog.cpp
index 9a5348f1dfdcb0f51a65dca70a32dc94188e45e2..b924e7fdbad1819379a05e39f7c5de7bc12c63ab 100644 (file)
--- a/contrib/prtview/LoadPortalFileDialog.cpp
+++ b/contrib/prtview/LoadPortalFileDialog.cpp
@@ -45,13 +45,10 @@ static void dialog_button_callback( GtkWidget *widget, gpointer data ){
        *ret = gpointer_to_int( data );
 }
 
-static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){
-       int *loop;
-
-       gtk_widget_hide( widget );
-       loop = (int*)g_object_get_data( G_OBJECT( widget ), "loop" );
+static gint dialog_delete_callback( ui::Widget widget, GdkEvent* event, gpointer data ){
+       widget.hide();
+       int *loop = (int *) g_object_get_data(G_OBJECT(widget), "loop");
        *loop = 0;
-
        return TRUE;
 }
 
@@ -70,7 +67,7 @@ static void change_clicked( GtkWidget *widget, gpointer data ){
        {
                filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_sel));
        }
-       gtk_widget_destroy (file_sel);
+       ui::Widget(file_sel).destroy();
 
        if ( filename != NULL ) {
                strcpy( portals.fn, filename );
@@ -164,7 +161,7 @@ int DoLoadPortalFileDialog(){
        }
 
        gtk_grab_remove( dlg );
-       gtk_widget_destroy( dlg );
+       dlg.destroy();
 
        return ret;
 }

diff --git a/contrib/sunplug/sunplug.cpp b/contrib/sunplug/sunplug.cpp
index afa4b20d821e46c5a3de2214a30ba0eb2f17731f..ad9e11f20a07aa6a1440a9b2418c2d789d3b4ba4 100644 (file)
--- a/contrib/sunplug/sunplug.cpp
+++ b/contrib/sunplug/sunplug.cpp
@@ -125,13 +125,13 @@ static gboolean delete_event( GtkWidget *widget, GdkEvent *event, gpointer data
 }
 
 // destroy widget if destroy signal is passed to widget
-static void destroy( GtkWidget *widget, gpointer data ){
-       gtk_widget_destroy( widget );
+static void destroy( ui::Widget widget, gpointer data ){
+       widget.destroy();
 }
 
 // function for close button to destroy the toplevel widget
 static void close_window( GtkWidget *widget, gpointer data ){
-       gtk_widget_destroy( gtk_widget_get_toplevel( widget ) );
+       ui::Widget(gtk_widget_get_toplevel( widget ) ).destroy();
 }
 
 // callback function to assign the optimal mapcoords to the spinboxes

diff --git a/contrib/ufoaiplug/ufoai_gtk.cpp b/contrib/ufoaiplug/ufoai_gtk.cpp
index fa683feb41e432d3d1ab7d80275f610e958bb40d..5b287c89b69b3bb14f81aec0aa33737e7adcc8db 100644 (file)
--- a/contrib/ufoaiplug/ufoai_gtk.cpp
+++ b/contrib/ufoaiplug/ufoai_gtk.cpp
@@ -39,15 +39,15 @@ static gboolean delete_event( GtkWidget *widget, GdkEvent *event, gpointer data
 /**
  * @brief destroy widget if destroy signal is passed to widget
  */
-static void destroy( GtkWidget *widget, gpointer data ){
-       gtk_widget_destroy( widget );
+static void destroy( ui::Widget widget, gpointer data ){
+       widget.destroy();
 }
 
 /**
  * @brief function for close button to destroy the toplevel widget
  */
 static void close_window( GtkWidget *widget, gpointer data ){
-       gtk_widget_destroy( gtk_widget_get_toplevel( widget ) );
+       ui::Widget(gtk_widget_get_toplevel( widget ) ).destroy();
 }
 
 /* =============================== */

diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index 88ca8d323ec3b2020698c9080db58d839f72952a..20bd9cbab5ca8dbf1989fafc67e08ebc32551774 100644 (file)
--- a/libs/gtkutil/dialog.cpp
+++ b/libs/gtkutil/dialog.cpp
@@ -95,7 +95,7 @@ EMessageBoxReturn modal_dialog_show( ui::Window window, ModalDialog& dialog ){
                gtk_main_iteration();
        }
 
-       gtk_widget_hide( GTK_WIDGET( window ) );
+       window.hide();
        gtk_grab_remove( GTK_WIDGET( window ) );
 
        return dialog.ret;
@@ -152,7 +152,7 @@ gboolean dialog_button_no( ui::Widget widget, ModalDialog* data ){
 }
 
 gboolean dialog_delete_callback( ui::Widget widget, GdkEventAny* event, ModalDialog* data ){
-       gtk_widget_hide( widget );
+       widget.hide();
        data->loop = false;
        return TRUE;
 }

diff --git a/libs/gtkutil/filechooser.cpp b/libs/gtkutil/filechooser.cpp
index a06c4c93e76b30cc21c9e9efa3782918a600a376..c2c74c2f3d660e496b732ec3da435f5fde7d577b 100644 (file)
--- a/libs/gtkutil/filechooser.cpp
+++ b/libs/gtkutil/filechooser.cpp
@@ -230,7 +230,7 @@ const char* file_dialog_show( GtkWidget* parent, bool open, const char* title, c
                g_file_dialog_file[0] = '\0';
        }
 
-       gtk_widget_destroy( dialog );
+       ui::Widget(dialog).destroy();
 
        // don't return an empty filename
        if ( g_file_dialog_file[0] == '\0' ) {
@@ -260,7 +260,7 @@ char* dir_dialog( ui::Widget parent, const char* title, const char* path ){
                filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( dialog ) );
        }
 
-       gtk_widget_destroy( dialog );
+       ui::Widget(dialog).destroy();
 
        return filename;
 }

diff --git a/libs/gtkutil/messagebox.cpp b/libs/gtkutil/messagebox.cpp
index 97b8db5460bb3a0d8b1d6f7819ddf0768b29409d..1441b00df3063f79781c1eafcb7e6ae3dbc1ff01 100644 (file)
--- a/libs/gtkutil/messagebox.cpp
+++ b/libs/gtkutil/messagebox.cpp
@@ -190,7 +190,7 @@ EMessageBoxReturn gtk_MessageBox( ui::Widget parent, const char* text, const cha
 
        modal_dialog_show( window, dialog );
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 
        return dialog.ret;
 }

diff --git a/libs/gtkutil/widget.cpp b/libs/gtkutil/widget.cpp
index 579ade807641312fddf03fdd4ddfcf01c9837104..162f992a8a53ff0b95a56130d2a0ed978386a75d 100644 (file)
--- a/libs/gtkutil/widget.cpp
+++ b/libs/gtkutil/widget.cpp
@@ -1,20 +1,6 @@
 #include "widget.h"
 #include <gtk/gtk.h>
 
-void widget_set_visible(ui::Widget widget, bool shown)
-{
-    if (shown) {
-        widget.show();
-    } else {
-        gtk_widget_hide(widget);
-    }
-}
-
-bool widget_is_visible(ui::Widget widget)
-{
-    return gtk_widget_get_visible(widget) != FALSE;
-}
-
 void widget_queue_draw(ui::Widget &widget)
 {
     gtk_widget_queue_draw(widget);
@@ -63,19 +49,19 @@ void ToggleShown::set(bool shown)
     if (!m_widget) {
         m_shownDeferred = shown;
     } else {
-        widget_set_visible(m_widget, shown);
+        m_widget.visible(shown);
     }
 }
 
 void ToggleShown::toggle()
 {
-    widget_toggle_visible(m_widget);
+    m_widget.visible(!m_widget.visible());
 }
 
 void ToggleShown::connect(ui::Widget widget)
 {
     m_widget = widget;
-    widget_set_visible(m_widget, m_shownDeferred);
+    m_widget.visible(m_shownDeferred);
     m_widget.connect("notify::visible", G_CALLBACK(notify_visible), this);
     m_widget.connect("destroy", G_CALLBACK(destroy), this);
     update();

diff --git a/libs/gtkutil/widget.h b/libs/gtkutil/widget.h
index a81054d449927b0344259154cd294a4af7b6a283..76b318dc3906fa8b3694f79813859f81b0a2547a 100644 (file)
--- a/libs/gtkutil/widget.h
+++ b/libs/gtkutil/widget.h
@@ -29,15 +29,6 @@
 #include "warnings.h"
 #include "debugging/debugging.h"
 
-void widget_set_visible(ui::Widget widget, bool shown);
-
-bool widget_is_visible(ui::Widget widget);
-
-inline void widget_toggle_visible(ui::Widget widget)
-{
-    widget_set_visible(widget, !widget_is_visible(widget));
-}
-
 class ToggleItem {
     BoolExportCallback m_exportCallback;
     typedef std::list<BoolImportCallback> ImportCallbacks;

diff --git a/libs/gtkutil/window.cpp b/libs/gtkutil/window.cpp
index 6986d6d977d44de67a3b03e3b98358821ee70308..7fc62eae7d6239c0a8ad19f0e4ae7769b223091e 100644 (file)
--- a/libs/gtkutil/window.cpp
+++ b/libs/gtkutil/window.cpp
@@ -34,7 +34,7 @@ inline void CHECK_RESTORE( ui::Widget w ){
 
 inline void CHECK_MINIMIZE( ui::Widget w ){
        g_object_set_data( G_OBJECT( w ), "was_mapped", gint_to_pointer( gtk_widget_get_visible( w ) ) );
-       gtk_widget_hide( w );
+       w.hide();
 }
 
 static gboolean main_window_iconified( ui::Widget widget, GdkEventWindowState* event, gpointer data ){
@@ -96,7 +96,7 @@ ui::Window create_floating_window( const char* title, ui::Window parent ){
 }
 
 void destroy_floating_window( ui::Window window ){
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 }
 
 gint window_realize_remove_sysmenu( ui::Widget widget, gpointer data ){
@@ -105,7 +105,7 @@ gint window_realize_remove_sysmenu( ui::Widget widget, gpointer data ){
 }
 
 gboolean persistent_floating_window_delete( ui::Window floating, GdkEvent *event, ui::Window main_window ){
-       gtk_widget_hide( GTK_WIDGET( floating ) );
+       floating.hide();
        return TRUE;
 }
 

diff --git a/libs/uilib/uilib.cpp b/libs/uilib/uilib.cpp
index 4832d92ffaec570a49318cd813b8c96d7eb17041..d3cd197251f15251a941a0b11879d006da0f12ce 100644 (file)
--- a/libs/uilib/uilib.cpp
+++ b/libs/uilib/uilib.cpp
@@ -97,11 +97,25 @@ namespace ui {
         return gtk_widget_get_visible(this) != 0;
     }
 
+    void IWidget::visible(bool shown)
+    {
+        if (shown) {
+            this.show();
+        } else {
+            this.hide();
+        }
+    }
+
     void IWidget::show()
     {
         gtk_widget_show(this);
     }
 
+    void IWidget::hide()
+    {
+        gtk_widget_hide(this);
+    }
+
     Dimensions IWidget::dimensions()
     {
         GtkAllocation allocation;
@@ -114,6 +128,11 @@ namespace ui {
         gtk_widget_set_size_request(this, width, height);
     }
 
+    void IWidget::destroy()
+    {
+        gtk_widget_destroy(this);
+    }
+
     IMPL(Container, GTK_CONTAINER);
 
     void IContainer::add(Widget widget)

diff --git a/libs/uilib/uilib.h b/libs/uilib/uilib.h
index b4d315c96327dc72d0b0bf0d6638e4b8dd40595e..5d8a48fb11a7ff6f88f63e4fb5ebd9800ec634ff 100644 (file)
--- a/libs/uilib/uilib.h
+++ b/libs/uilib/uilib.h
@@ -259,9 +259,12 @@ namespace ui {
                  bool want_save = false
          );
          bool visible();
+         void visible(bool shown);
          void show();
+         void hide();
          Dimensions dimensions();
          void dimensions(int width, int height);
+         void destroy();
     );
 
     WRAP(Container, Widget, _GtkContainer, (),

diff --git a/radiant/build.cpp b/radiant/build.cpp
index 13938ce10bd4c058d15494781f0b8e18d7e3b583..83767446ec417d4b301a07b13c24fdb197d8a191 100644 (file)
--- a/radiant/build.cpp
+++ b/radiant/build.cpp
@@ -734,7 +734,7 @@ Build* g_current_build = 0;
 gboolean project_selection_changed( GtkTreeSelection* selection, ui::ListStore store ){
        Project& project = g_build_project;
 
-       gtk_list_store_clear( store );
+       store.clear();
 
        GtkTreeIter iter;
        GtkTreeModel* model;
@@ -957,7 +957,7 @@ void DoBuildMenu(){
                g_build_changed = true;
        }
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 }
 
 
@@ -1005,7 +1005,7 @@ void Build_constructMenu( ui::Menu menu ){
 void Build_refreshMenu( ui::Menu menu ){
        for ( BuildMenuItems::iterator i = g_BuildMenuItems.begin(); i != g_BuildMenuItems.end(); ++i )
        {
-               gtk_container_remove( menu, GTK_WIDGET( ( *i ).m_item ) );
+               menu.remove(ui::Widget(GTK_WIDGET((*i).m_item)));
        }
 
        g_BuildMenuItems.clear();

diff --git a/radiant/commands.cpp b/radiant/commands.cpp
index 70aa49752c87bd653b26652ac8fa1202ed340238..6b42e65a785627af0a755c205e0370e1d2139e07 100644 (file)
--- a/radiant/commands.cpp
+++ b/radiant/commands.cpp
@@ -482,7 +482,7 @@ public:
        }
 
        modal_dialog_show( window, dialog );
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 }
 
 #include "profile/profile.h"

diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp
index 8133cdb0cb07494f1bd4779ff30fa57c29288450..701a8f1eca7495b7a63ddd5c3e550a01808b5f32 100644 (file)
--- a/radiant/dialog.cpp
+++ b/radiant/dialog.cpp
@@ -319,7 +319,7 @@ void Dialog::ShowDlg(){
 void Dialog::HideDlg(){
        ASSERT_MESSAGE( m_window, "dialog was not constructed" );
        exportData();
-       gtk_widget_hide( GTK_WIDGET( m_window ) );
+       m_window.hide();
 }
 
 static gint delete_event_callback( ui::Widget widget, GdkEvent* event, gpointer data ){
@@ -338,7 +338,7 @@ void Dialog::Create(){
 void Dialog::Destroy(){
        ASSERT_MESSAGE( m_window, "dialog cannot be destroyed" );
 
-       gtk_widget_destroy( GTK_WIDGET( m_window ) );
+       m_window.destroy();
        m_window = ui::Window{ui::null};
 }
 
@@ -445,7 +445,7 @@ EMessageBoxReturn Dialog::DoModal(){
                exportData();
        }
 
-       gtk_widget_hide( GTK_WIDGET( m_window ) );
+       m_window.hide();
 
        PostModal( m_modal.ret );
 

diff --git a/radiant/entityinspector.cpp b/radiant/entityinspector.cpp
index 42889c61ce7639828f43127b5068e02e81d76d50..8c67825ebb8419d95b3a3cb467388ab684f39101 100644 (file)
--- a/radiant/entityinspector.cpp
+++ b/radiant/entityinspector.cpp
@@ -820,7 +820,7 @@ void EntityClassList_fill(){
 }
 
 void EntityClassList_clear(){
-       gtk_list_store_clear( g_entlist_store );
+       g_entlist_store.clear();
 }
 
 void SetComment( EntityClass* eclass ){
@@ -861,9 +861,9 @@ void SurfaceFlags_setEntityClass( EntityClass* eclass ){
                        auto widget = ui::Widget(GTK_WIDGET(g_entitySpawnflagsCheck[i]));
                        auto label = ui::Label(GTK_LABEL(gtk_bin_get_child(GTK_BIN(widget))));
                        label.text(" ");
-                       gtk_widget_hide( widget );
+                       widget.hide();
                        g_object_ref( widget );
-                       gtk_container_remove( GTK_CONTAINER( g_spawnflagsTable ), widget );
+                       ui::Container(GTK_CONTAINER(g_spawnflagsTable)).remove(widget);
                }
        }
 
@@ -1041,7 +1041,7 @@ void EntityInspector_updateKeyValues(){
        CopiedString strKey( g_entityKeyEntry.text() );
        CopiedString strVal( g_entityValueEntry.text() );
 
-       gtk_list_store_clear( store );
+       store.clear();
        // Walk through list and add pairs
        for ( KeyValues::iterator i = g_selectedKeyValues.begin(); i != g_selectedKeyValues.end(); ++i )
        {

diff --git a/radiant/entitylist.cpp b/radiant/entitylist.cpp
index 8b6a4690fbd69c798f704f63774a4fec111a3ba6..8f677c2fef4e96214a5f5bea5402da81df94ed0f 100644 (file)
--- a/radiant/entitylist.cpp
+++ b/radiant/entitylist.cpp
@@ -244,7 +244,7 @@ void entitylist_treeview_row_expanded( GtkTreeView* view, GtkTreeIter* iter, Gtk
 
 
 void EntityList_SetShown( bool shown ){
-       widget_set_visible( getEntityList().m_window, shown );
+       getEntityList().m_window.visible(shown);
 }
 
 void EntityList_toggleShown(){

diff --git a/radiant/feedback.cpp b/radiant/feedback.cpp
index 1fc3611f22ae469d19d7b6fd0562fa11ac7296ab..a465ed6cff72918a5936b65abb216aa923ba6b19 100644 (file)
--- a/radiant/feedback.cpp
+++ b/radiant/feedback.cpp
@@ -266,7 +266,7 @@ void CDbgDlg::Init(){
        }
 
        if ( m_clist ) {
-               gtk_list_store_clear( m_clist );
+               m_clist.clear();
        }
 }
 
@@ -279,7 +279,7 @@ void CDbgDlg::Push( ISAXHandler *pHandler ){
        }
 
        // put stuff in the list
-       gtk_list_store_clear( m_clist );
+       m_clist.clear();
        for ( std::size_t i = 0; i < static_cast<std::size_t>( m_pFeedbackElements->len ); ++i )
        {
                m_clist.append(0, GetElement(i)->getName());

diff --git a/radiant/groupdialog.cpp b/radiant/groupdialog.cpp
index 1eeb35b2a65ceb85d61f58bef1fb9fc3c169d336..261d625b5d79ace378487b5ca8e37b41313ad7f3 100644 (file)
--- a/radiant/groupdialog.cpp
+++ b/radiant/groupdialog.cpp
@@ -60,7 +60,7 @@ void Show(){
        m_window.show();
 }
 void Hide(){
-       gtk_widget_hide( GTK_WIDGET( m_window ) );
+       m_window.hide();
 }
 
 WindowPositionTracker m_position_tracker;
@@ -134,7 +134,7 @@ ui::Widget GroupDialog_addPage( const char* tabLabel, ui::Widget widget, const S
 
 
 bool GroupDialog_isShown(){
-       return widget_is_visible( g_GroupDlg.m_window );
+       return g_GroupDlg.m_window.visible();
 }
 void GroupDialog_setShown( bool shown ){
        shown ? g_GroupDlg.Show() : g_GroupDlg.Hide();

diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index 278edab17b521e982a6f0e566e257204c9fe6a2e..6c70e557e11133c7becda286cd3b3369e07d65a0 100644 (file)
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -360,7 +360,7 @@ void DoProjectSettings(){
                        ProjectSettingsDialog_ok( dialog );
                }
 
-               gtk_widget_destroy( GTK_WIDGET( window ) );
+               window.destroy();
        }
 }
 
@@ -414,7 +414,7 @@ void DoSides( int type, int axis ){
                Scene_BrushConstructPrefab( GlobalSceneGraph(), (EBrushPrefab)type, atoi( str ), TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ) );
        }
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 }
 
 // =============================================================================
@@ -581,7 +581,7 @@ void DoAbout(){
 
        modal_dialog_show( window, dialog );
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 }
 
 // =============================================================================
@@ -697,7 +697,7 @@ EMessageBoxReturn DoTextureLayout( float *fx, float *fy ){
                last_used_texture_layout_scale_y = *fy;
        }
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 
        return ret;
 }
@@ -714,7 +714,7 @@ static gint editor_delete( ui::Widget widget, gpointer data ){
                return TRUE;
        }
 
-       gtk_widget_hide( text_editor );
+       text_editor.hide();
 
        return TRUE;
 }
@@ -738,7 +738,7 @@ static void editor_close( ui::Widget widget, gpointer data ){
                return;
        }
 
-       gtk_widget_hide( text_editor );
+       text_editor.hide();
 }
 
 static void CreateGtkTextEditor(){
@@ -797,7 +797,7 @@ static void DoGtkTextEditor( const char* filename, guint cursorpos ){
 
        if ( f == 0 ) {
                globalOutputStream() << "Unable to load file " << filename << " in shader editor.\n";
-               gtk_widget_hide( text_editor );
+               text_editor.hide();
        }
        else
        {
@@ -909,7 +909,7 @@ EMessageBoxReturn DoLightIntensityDlg( int *intensity ){
                *intensity = atoi( gtk_entry_get_text( intensity_entry ) );
        }
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 
        return ret;
 }
@@ -973,7 +973,7 @@ EMessageBoxReturn DoShaderTagDlg( CopiedString* tag, const char* title ){
                *tag = gtk_entry_get_text( textentry );
        }
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 
        return ret;
 }
@@ -1024,7 +1024,7 @@ EMessageBoxReturn DoShaderInfoDlg( const char* name, const char* filename, const
 
        EMessageBoxReturn ret = modal_dialog_show( window, dialog );
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 
        return ret;
 }

diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp
index 76ad6e162c9939ca00e747fa47fb16becd1430e4..0f210221993c8277a9489872749bae7bf0a5fc59 100644 (file)
--- a/radiant/gtkmisc.cpp
+++ b/radiant/gtkmisc.cpp
@@ -121,7 +121,7 @@ bool color_dialog( ui::Widget parent, Vector3& color, const char* title ){
                color[2] = clr.blue / 65535.0f;
        }
 
-       gtk_widget_destroy( dlg );
+       dlg.destroy();
 
        return ok;
 }

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 5868e28883361840efc1d645b8f4b49776cc9b17..26d6b1b290b9521acd7e7af3aec69dce93f2b4f3 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -2532,16 +2532,16 @@ MainFrame::MainFrame() : m_idleRedrawStatusText( RedrawStatusTextCaller( *this )
 MainFrame::~MainFrame(){
        SaveWindowInfo();
 
-       gtk_widget_hide( GTK_WIDGET( m_window ) );
+       m_window.hide();
 
        Shutdown();
 
        for ( std::vector<ui::Widget>::iterator i = g_floating_windows.begin(); i != g_floating_windows.end(); ++i )
        {
-               gtk_widget_destroy( *i );
+               i->destroy();
        }
 
-       gtk_widget_destroy( GTK_WIDGET( m_window ) );
+       m_window.destroy();
 }
 
 void MainFrame::SetActiveXY( XYWnd* p ){
@@ -2689,7 +2689,7 @@ void show_splash(){
 }
 
 void hide_splash(){
-       gtk_widget_destroy( GTK_WIDGET( splash_screen ) );
+       splash_screen.destroy();
 }
 
 WindowPositionTracker g_posCamWnd;
@@ -2752,9 +2752,9 @@ void MainFrame::Create(){
        GtkToolbar* main_toolbar = create_main_toolbar( CurrentStyle() );
        gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( main_toolbar ), FALSE, FALSE, 0 );
 
-       GtkToolbar* plugin_toolbar = create_plugin_toolbar();
+       auto plugin_toolbar = create_plugin_toolbar();
        if ( !g_Layout_enablePluginToolbar.m_value ) {
-               gtk_widget_hide( GTK_WIDGET( plugin_toolbar ) );
+               plugin_toolbar.hide();
        }
        gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( plugin_toolbar ), FALSE, FALSE, 0 );
 

diff --git a/radiant/map.cpp b/radiant/map.cpp
index 1905c60b3901f332f9d966fe1f35b7fbfdb40b6b..fff85c1f2ebe397ba7cfc91ad0d6b17885c856fe 100644 (file)
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -896,7 +896,7 @@ void DoMapInfo(){
        // save before exit
        window_get_position( window, g_posMapInfoWnd );
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+    window.destroy();
 }
 
 
@@ -2114,7 +2114,7 @@ void DoFind(){
                SelectBrush( atoi( entstr ), atoi( brushstr ) );
        }
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+    window.destroy();
 }
 
 void Map_constructPreferences( PreferencesPage& page ){

diff --git a/radiant/mru.cpp b/radiant/mru.cpp
index 9aef5dcb1019b32abb8b6704fad49f0bcf6bf2e2..71133c55f2ea8fecf2d29f8f7588a9211be5ee25 100644 (file)
--- a/radiant/mru.cpp
+++ b/radiant/mru.cpp
@@ -165,7 +165,7 @@ void MRU_Activate( std::size_t index ){
                }
                else
                {
-                       gtk_widget_hide( GTK_WIDGET( MRU_items[MRU_used] ) );
+                       ui::MenuItem(MRU_items[MRU_used]).hide();
                }
        }
 }
@@ -194,23 +194,23 @@ LoadMRU g_load_mru4( 4 );
 
 void MRU_constructMenu( ui::Menu menu ){
        {
-               GtkMenuItem* item = create_menu_item_with_mnemonic( menu, "_1", LoadMRUCaller( g_load_mru1 ) );
+               auto item = create_menu_item_with_mnemonic( menu, "_1", LoadMRUCaller( g_load_mru1 ) );
                gtk_widget_set_sensitive( GTK_WIDGET( item ), FALSE );
                MRU_AddWidget( item, 0 );
        }
        {
-               GtkMenuItem* item = create_menu_item_with_mnemonic( menu, "_2", LoadMRUCaller( g_load_mru2 ) );
-               gtk_widget_hide( GTK_WIDGET( item ) );
+               auto item = create_menu_item_with_mnemonic( menu, "_2", LoadMRUCaller( g_load_mru2 ) );
+               item.hide();
                MRU_AddWidget( item, 1 );
        }
        {
-               GtkMenuItem* item = create_menu_item_with_mnemonic( menu, "_3", LoadMRUCaller( g_load_mru3 ) );
-               gtk_widget_hide( GTK_WIDGET( item ) );
+               auto item = create_menu_item_with_mnemonic( menu, "_3", LoadMRUCaller( g_load_mru3 ) );
+               item.hide();
                MRU_AddWidget( item, 2 );
        }
        {
-               GtkMenuItem* item = create_menu_item_with_mnemonic( menu, "_4", LoadMRUCaller( g_load_mru4 ) );
-               gtk_widget_hide( GTK_WIDGET( item ) );
+               auto item = create_menu_item_with_mnemonic( menu, "_4", LoadMRUCaller( g_load_mru4 ) );
+               item.hide();
                MRU_AddWidget( item, 3 );
        }
 }

diff --git a/radiant/patchmanip.cpp b/radiant/patchmanip.cpp
index 677abbd54010b06743e10e16e1415e24fa12f88b..2bb141a1670c1e0c1cf738f328cd57649cc61fa5 100644 (file)
--- a/radiant/patchmanip.cpp
+++ b/radiant/patchmanip.cpp
@@ -959,7 +959,7 @@ void DoNewPatchDlg( EPatchPrefab prefab, int minrows, int mincols, int defrows,
                Scene_PatchConstructPrefab( GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ), prefab, GlobalXYWnd_getCurrentViewType(), w, h );
        }
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 }
 
 
@@ -1125,7 +1125,7 @@ EMessageBoxReturn DoCapDlg( ECapDialog* type ){
                }
        }
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 
        return ret;
 }

diff --git a/radiant/pluginmenu.cpp b/radiant/pluginmenu.cpp
index 69e5c0841eaaa6898abc56a3ae1221db3dd082f7..cd05d714a835b5ce94f7627e06e4368dbb9366f2 100644 (file)
--- a/radiant/pluginmenu.cpp
+++ b/radiant/pluginmenu.cpp
@@ -149,7 +149,7 @@ void PluginsMenu_clear(){
        GList* lst = g_list_find( gtk_container_get_children( GTK_CONTAINER( g_plugins_menu ) ), GTK_WIDGET( g_plugins_menu_separator ) );
        while ( lst->next )
        {
-               gtk_container_remove( GTK_CONTAINER( g_plugins_menu ), GTK_WIDGET( lst->next->data ) );
+               g_plugins_menu.remove(ui::Widget(GTK_WIDGET(lst->next->data)));
                lst = g_list_find( gtk_container_get_children( GTK_CONTAINER( g_plugins_menu ) ),  GTK_WIDGET( g_plugins_menu_separator ) );
        }
 }

diff --git a/radiant/select.cpp b/radiant/select.cpp
index 20c6f73069b952afd49283fadf5d61da49488dbd..3c3b20603e3f89b5e937628ab35f35ae2a57cb83 100644 (file)
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -887,7 +887,7 @@ static gboolean rotatedlg_apply( ui::Widget widget, RotateDialog* rotateDialog )
 }
 
 static gboolean rotatedlg_cancel( ui::Widget widget, RotateDialog* rotateDialog ){
-       gtk_widget_hide( GTK_WIDGET( rotateDialog->window ) );
+       rotateDialog->window.hide();
 
        gtk_spin_button_set_value( rotateDialog->x, 0.0f ); // reset to 0 on close
        gtk_spin_button_set_value( rotateDialog->y, 0.0f );
@@ -898,7 +898,7 @@ static gboolean rotatedlg_cancel( ui::Widget widget, RotateDialog* rotateDialog
 
 static gboolean rotatedlg_ok( ui::Widget widget, RotateDialog* rotateDialog ){
        rotatedlg_apply( widget, rotateDialog );
-       gtk_widget_hide( GTK_WIDGET( rotateDialog->window ) );
+       rotateDialog->window.hide();
        return TRUE;
 }
 
@@ -1039,7 +1039,7 @@ static gboolean scaledlg_apply( ui::Widget widget, ScaleDialog* scaleDialog ){
 }
 
 static gboolean scaledlg_cancel( ui::Widget widget, ScaleDialog* scaleDialog ){
-       gtk_widget_hide( GTK_WIDGET( scaleDialog->window ) );
+       scaleDialog->window.hide();
 
        scaleDialog->x.text("1.0");
        scaleDialog->y.text("1.0");
@@ -1050,7 +1050,7 @@ static gboolean scaledlg_cancel( ui::Widget widget, ScaleDialog* scaleDialog ){
 
 static gboolean scaledlg_ok( ui::Widget widget, ScaleDialog* scaleDialog ){
        scaledlg_apply( widget, scaleDialog );
-       gtk_widget_hide( GTK_WIDGET( scaleDialog->window ) );
+       scaleDialog->window.hide();
        return TRUE;
 }
 

diff --git a/radiant/textureentry.cpp b/radiant/textureentry.cpp
index c4bac5a1b9b81b1789aa4328c76d25aac5628751..6e6e9de827e69f1721cb0f9d037494e8c60d299e 100644 (file)
--- a/radiant/textureentry.cpp
+++ b/radiant/textureentry.cpp
@@ -55,7 +55,7 @@ void EntryCompletion<StringList>::fill()
 template<class StringList>
 void EntryCompletion<StringList>::clear()
 {
-    gtk_list_store_clear(m_store);
+    m_store.clear();
 }
 
 template<class StringList>

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 5c0e6467a8de186565d197d0a36052fefcc68e42..b743fdddf65f89dfbb6359b2630465b4a61bfbc9 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -674,7 +674,7 @@ void TextureBrowser_activeShadersChanged( TextureBrowser& textureBrowser ){
 void TextureBrowser_importShowScrollbar( TextureBrowser& textureBrowser, bool value ){
        textureBrowser.m_showTextureScrollbar = value;
        if ( textureBrowser.m_texture_scroll != 0 ) {
-               widget_set_visible( textureBrowser.m_texture_scroll, textureBrowser.m_showTextureScrollbar );
+               textureBrowser.m_texture_scroll.visible(textureBrowser.m_showTextureScrollbar);
                TextureBrowser_updateScroll( textureBrowser );
        }
 }
@@ -1299,7 +1299,7 @@ enum
 void BuildStoreAssignedTags( ui::ListStore store, const char* shader, TextureBrowser* textureBrowser ){
        GtkTreeIter iter;
 
-       gtk_list_store_clear( store );
+       store.clear();
 
        std::vector<CopiedString> assigned_tags;
        TagBuilder.GetShaderTags( shader, assigned_tags );
@@ -1319,7 +1319,7 @@ void BuildStoreAvailableTags(   ui::ListStore storeAvailable,
        std::set<CopiedString>::const_iterator iterAll;
        gchar* tag_assigned;
 
-       gtk_list_store_clear( storeAvailable );
+       storeAvailable.clear();
 
        bool row = gtk_tree_model_get_iter_first( GTK_TREE_MODEL( storeAssigned ), &iterAssigned ) != 0;
 
@@ -1379,7 +1379,7 @@ gboolean TextureBrowser_button_press( ui::Widget widget, GdkEventButton* event,
 
                        if ( GlobalTextureBrowser().m_tags ) {
                                textureBrowser->m_rmbSelected = false;
-                               gtk_widget_hide( textureBrowser->m_tag_frame );
+                               textureBrowser->m_tag_frame.hide();
                        }
                }
        }
@@ -1828,7 +1828,7 @@ void TextureBrowser_removeTags(){
 }
 
 void TextureBrowser_buildTagList(){
-       gtk_list_store_clear( g_TextureBrowser.m_all_tags_list );
+       g_TextureBrowser.m_all_tags_list.clear();
 
        std::set<CopiedString>::iterator iter;
 
@@ -1915,7 +1915,7 @@ void TextureBrowser_toggleSearchButton(){
                gtk_widget_show_all( g_TextureBrowser.m_search_button );
        }
        else {
-               gtk_widget_hide( g_TextureBrowser.m_search_button );
+               g_TextureBrowser.m_search_button.hide();
        }
 }
 
@@ -2047,7 +2047,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){
                auto vadjustment = ui::Adjustment(gtk_range_get_adjustment( GTK_RANGE( g_TextureBrowser.m_texture_scroll ) ));
                vadjustment.connect( "value_changed", G_CALLBACK( TextureBrowser_verticalScroll ), &g_TextureBrowser );
 
-               widget_set_visible( g_TextureBrowser.m_texture_scroll, g_TextureBrowser.m_showTextureScrollbar );
+               g_TextureBrowser.m_texture_scroll.visible(g_TextureBrowser.m_showTextureScrollbar);
        }
        { // gl_widget
                g_TextureBrowser.m_gl_widget = glwidget_new( FALSE );

diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp
index 61a7a021cdc645b57a8e08ec45aef153de05e876..40f881d11ad939fab4692dfa406f3c4fba046c11 100644 (file)
--- a/radiant/xywindow.cpp
+++ b/radiant/xywindow.cpp
@@ -861,7 +861,7 @@ XYWnd::~XYWnd(){
        onDestroyed();
 
        if ( m_mnuDrop ) {
-               gtk_widget_destroy( GTK_WIDGET( m_mnuDrop ) );
+               m_mnuDrop.destroy();
                m_mnuDrop = ui::Menu(ui::null);
        }
 
@@ -2570,7 +2570,7 @@ void realise(){
 void unrealise(){
        if ( ++m_unrealised == 1 ) {
                if ( XYWnd::m_mnuDrop ) {
-                       gtk_widget_destroy( GTK_WIDGET( XYWnd::m_mnuDrop ) );
+                       XYWnd::m_mnuDrop.destroy();
                        XYWnd::m_mnuDrop = ui::Menu(ui::null);
                }
        }