GTK: wrap gtk_box_pack_start

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

diff --git a/radiant/build.cpp b/radiant/build.cpp
index 8c733dd45ac196412460f7eac7fc414e587d78bd..b76b5ec468669e94aeb8307d1c80f4b7ce84e43b 100644 (file)
--- a/radiant/build.cpp
+++ b/radiant/build.cpp
@@ -653,8 +653,7 @@ void BSPCommandList_Construct( ui::ListStore store, Project& project ){
                store.append(0, (*i).first.c_str());
        }
 
-       GtkTreeIter lastIter;
-       gtk_list_store_append( store, &lastIter );
+       store.append();
 }
 
 class ProjectList
@@ -695,8 +694,7 @@ gboolean project_cell_edited( GtkCellRendererText* cell, gchar* path_string, gch
                project.push_back( Project::value_type( new_text, Build() ) );
 
                gtk_list_store_set( projectList->m_store, &iter, 0, new_text, -1 );
-               GtkTreeIter lastIter;
-               gtk_list_store_append( projectList->m_store, &lastIter );
+               projectList->m_store.append();
        }
 
        gtk_tree_path_free( path );
@@ -736,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;
@@ -753,8 +751,7 @@ gboolean project_selection_changed( GtkTreeSelection* selection, ui::ListStore s
                        {
                                store.append(0, (*i).c_str());
                        }
-                       GtkTreeIter lastIter;
-                       gtk_list_store_append( store, &lastIter );
+                       store.append();
                }
                else
                {
@@ -795,8 +792,7 @@ gboolean commands_cell_edited( GtkCellRendererText* cell, gchar* path_string, gc
 
                gtk_list_store_set( store, &iter, 0, new_text, -1 );
 
-               GtkTreeIter lastIter;
-               gtk_list_store_append( store, &lastIter );
+               store.append();
        }
 
        gtk_tree_path_free( path );
@@ -842,17 +838,17 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
                auto table1 = create_dialog_table( 2, 2, 4, 4, 4 );
                window.add(table1);
                {
-                       GtkVBox* vbox = create_dialog_vbox( 4 );
+                       auto vbox = create_dialog_vbox( 4 );
                        gtk_table_attach( table1, GTK_WIDGET( vbox ), 1, 2, 0, 1,
                                                          (GtkAttachOptions) ( GTK_FILL ),
                                                          (GtkAttachOptions) ( GTK_FILL ), 0, 0 );
                        {
-                               GtkButton* button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &modal );
-                               gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
+                               auto button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &modal );
+                               vbox.pack_start( button, FALSE, FALSE, 0 );
                        }
                        {
-                               GtkButton* button = create_dialog_button( "Cancel", G_CALLBACK( dialog_button_cancel ), &modal );
-                               gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
+                               auto button = create_dialog_button( "Cancel", G_CALLBACK( dialog_button_cancel ), &modal );
+                               vbox.pack_start( button, FALSE, FALSE, 0 );
                        }
                }
                {
@@ -961,7 +957,7 @@ void DoBuildMenu(){
                g_build_changed = true;
        }
 
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 }
 
 
@@ -1009,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();