Wrap more GTK

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

diff --git a/radiant/entitylist.cpp b/radiant/entitylist.cpp
index 8b6a4690fbd69c798f704f63774a4fec111a3ba6..ac90ccf12ba85b6a364280cdcd0e6677c8c07367 100644 (file)
--- a/radiant/entitylist.cpp
+++ b/radiant/entitylist.cpp
@@ -61,7 +61,7 @@ WindowPositionTracker m_positionTracker;
 
 ui::Window m_window;
 GtkTreeView* m_tree_view;
-GraphTreeModel* m_tree_model;
+ui::TreeModel m_tree_model{ui::null};
 bool m_selection_disabled;
 
 EntityList() :
@@ -118,7 +118,7 @@ void entitylist_treeviewcolumn_celldatafunc( GtkTreeViewColumn* column, GtkCellR
                g_object_set( G_OBJECT( renderer ), "text", name, "visible", TRUE, NULL );
 
                //globalOutputStream() << "rendering cell " << makeQuoted(name) << "\n";
-               GtkStyle* style = gtk_widget_get_style( GTK_WIDGET( getEntityList().m_tree_view ) );
+               GtkStyle* style = gtk_widget_get_style( ui::TreeView( getEntityList().m_tree_view ) );
                if ( instance->childSelected() ) {
                        g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_ACTIVE], NULL );
                }
@@ -197,7 +197,7 @@ gboolean treemodel_update_selection( GtkTreeModel* model, GtkTreePath* path, Gtk
        return FALSE;
 }
 
-void EntityList_UpdateSelection( GtkTreeModel* model, GtkTreeView* view ){
+void EntityList_UpdateSelection( ui::TreeModel model, GtkTreeView* view ){
        EntityList_DisconnectSignals( view );
        gtk_tree_model_foreach( model, treemodel_update_selection, view );
        EntityList_ConnectSignals( view );
@@ -209,7 +209,7 @@ void RedrawEntityList(){
        {
        case EntityList::eInsertRemove:
        case EntityList::eSelection:
-               EntityList_UpdateSelection( GTK_TREE_MODEL( getEntityList().m_tree_model ), getEntityList().m_tree_view );
+               EntityList_UpdateSelection( getEntityList().m_tree_model, getEntityList().m_tree_view );
        default:
                break;
        }
@@ -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(){
@@ -268,13 +268,13 @@ gint graph_tree_model_compare_name( GtkTreeModel *model, GtkTreeIter *a, GtkTree
 
 extern GraphTreeModel* scene_graph_get_tree_model();
 void AttachEntityTreeModel(){
-       getEntityList().m_tree_model = scene_graph_get_tree_model();
+       getEntityList().m_tree_model = ui::TreeModel::from(scene_graph_get_tree_model());
 
-       gtk_tree_view_set_model( getEntityList().m_tree_view, GTK_TREE_MODEL( getEntityList().m_tree_model ) );
+       gtk_tree_view_set_model( getEntityList().m_tree_view, getEntityList().m_tree_model );
 }
 
 void DetachEntityTreeModel(){
-       getEntityList().m_tree_model = 0;
+       getEntityList().m_tree_model = ui::TreeModel(ui::null);
 
        gtk_tree_view_set_model( getEntityList().m_tree_view, 0 );
 }
@@ -296,25 +296,25 @@ void EntityList_constructWindow( ui::Window main_window ){
                window.add(scr);
 
                {
-                       ui::Widget view = ui::TreeView(ui::New);
-                       gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( view ), FALSE );
+            auto view = ui::TreeView(ui::New);
+                       gtk_tree_view_set_headers_visible(view, FALSE );
 
                        auto renderer = ui::CellRendererText(ui::New);
                        GtkTreeViewColumn* column = gtk_tree_view_column_new();
                        gtk_tree_view_column_pack_start( column, renderer, TRUE );
                        gtk_tree_view_column_set_cell_data_func( column, renderer, entitylist_treeviewcolumn_celldatafunc, 0, 0 );
 
-                       GtkTreeSelection* select = gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) );
+                       GtkTreeSelection* select = gtk_tree_view_get_selection(view );
                        gtk_tree_selection_set_mode( select, GTK_SELECTION_MULTIPLE );
 
                        view.connect( "row_expanded", G_CALLBACK( entitylist_treeview_row_expanded ), 0 );
                        view.connect( "row_collapsed", G_CALLBACK( entitylist_treeview_rowcollapsed ), 0 );
 
-                       gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column );
+                       gtk_tree_view_append_column(view, column );
 
                        view.show();
                        scr.add(view);
-                       getEntityList().m_tree_view = GTK_TREE_VIEW( view );
+                       getEntityList().m_tree_view = view;
                }
        }