Purge gtk_widget_show from radiant/*

[xonotic/netradiant.git] / radiant / commands.cpp

diff --git a/radiant/commands.cpp b/radiant/commands.cpp
index f463503e04ac95878256a8ab6550cb856f783f6c..cce8b9db8ec03a34e1998dbd6234310165736861 100644 (file)
--- a/radiant/commands.cpp
+++ b/radiant/commands.cpp
@@ -28,7 +28,6 @@
 #include "string/string.h"
 #include "versionlib.h"
 #include "gtkutil/messagebox.h"
-#include <gtk/gtk.h>
 #include "gtkmisc.h"
 
 typedef std::pair<Accelerator, int> ShortcutValue; // accelerator, isRegistered
@@ -392,8 +391,8 @@ void DoCommandListDlg(){
                return accelerator_window_key_press(widget, event, dialogptr);
        }, &dialog);
 
-       GtkAccelGroup* accel = ui::AccelGroup();
-       gtk_window_add_accel_group( window, accel );
+       auto accel = ui::AccelGroup();
+       window.add_accel_group( accel );
 
        GtkHBox* hbox = create_dialog_hbox( 4, 4 );
        gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( hbox ) );
@@ -403,7 +402,7 @@ void DoCommandListDlg(){
                gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( scr ), TRUE, TRUE, 0 );
 
                {
-                       GtkListStore* store = gtk_list_store_new( 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INT );
+                       ui::ListStore store = ui::ListStore(gtk_list_store_new( 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INT ));
 
                        ui::Widget view = ui::TreeView(ui::TreeModel(GTK_TREE_MODEL(store)));
                        dialog.m_list = GTK_TREE_VIEW( view );
@@ -422,7 +421,7 @@ void DoCommandListDlg(){
                                gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column );
                        }
 
-                       gtk_widget_show( view );
+                       view.show();
                        gtk_container_add( GTK_CONTAINER( scr ), view );
 
                        {
@@ -433,9 +432,9 @@ void DoCommandListDlg(){
                                class BuildCommandList : public CommandVisitor
                                {
                                TextFileOutputStream m_commandList;
-                               GtkListStore* m_store;
+                               ui::ListStore m_store;
 public:
-                               BuildCommandList( const char* filename, GtkListStore* store ) : m_commandList( filename ), m_store( store ){
+                               BuildCommandList( const char* filename, ui::ListStore store ) : m_commandList( filename ), m_store( store ){
                                }
                                void visit( const char* name, Accelerator& accelerator ){
                                        StringOutputStream modifiers;
@@ -474,12 +473,12 @@ public:
                gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( clearbutton ), FALSE, FALSE, 0 );
 
                ui::Widget spacer = ui::Image();
-               gtk_widget_show( spacer );
+               spacer.show();
                gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( spacer ), TRUE, TRUE, 0 );
 
-               GtkButton* button = create_modal_dialog_button( "Close", dialog.m_close_button );
+               auto button = create_modal_dialog_button( "Close", dialog.m_close_button );
                gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
-               widget_make_default( GTK_WIDGET( button ) );
+               widget_make_default( button );
                gtk_widget_grab_default( GTK_WIDGET( button ) );
                gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
                gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );