radiant/vfs: rework vfs loading, attempt to load wads and paks, ref #139

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

diff --git a/radiant/feedback.cpp b/radiant/feedback.cpp
index 00512547b8b059f3b9339c8e131d5bfa9bbd11b5..33f6552b90f40b8400b447a5a1bc8152b9a5b595 100644 (file)
--- a/radiant/feedback.cpp
+++ b/radiant/feedback.cpp
@@ -27,6 +27,8 @@
 
 #include "feedback.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 
 #include "igl.h"
@@ -221,13 +223,13 @@ void CWindingMsg::Draw2D( VIEWTYPE vt ){
 }
 
 // triggered when the user selects an entry in the feedback box
-static void feedback_selection_changed( GtkTreeSelection* selection, gpointer data ){
+static void feedback_selection_changed( ui::TreeSelection selection, gpointer data ){
        g_DbgDlg.DropHighlight();
 
        GtkTreeModel* model;
        GtkTreeIter selected;
        if ( gtk_tree_selection_get_selected( selection, &model, &selected ) ) {
-               GtkTreePath* path = gtk_tree_model_get_path( model, &selected );
+               auto path = gtk_tree_model_get_path( model, &selected );
                g_DbgDlg.SetHighlight( gtk_tree_path_get_indices( path )[0] );
                gtk_tree_path_free( path );
        }
@@ -264,7 +266,7 @@ void CDbgDlg::Init(){
        }
 
        if ( m_clist ) {
-               gtk_list_store_clear( m_clist );
+               m_clist.clear();
        }
 }
 
@@ -277,12 +279,10 @@ 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 )
        {
-               GtkTreeIter iter;
-               gtk_list_store_append( m_clist, &iter );
-               gtk_list_store_set( m_clist, &iter, 0, GetElement( i )->getName(), -1 );
+               m_clist.append(0, GetElement(i)->getName());
        }
 
        ShowDlg();
@@ -291,35 +291,35 @@ void CDbgDlg::Push( ISAXHandler *pHandler ){
 ui::Window CDbgDlg::BuildDialog(){
        auto window = MainFrame_getWindow().create_floating_window("Q3Map debug window" );
 
-       auto scr = ui::ScrolledWindow();
+       auto scr = ui::ScrolledWindow(ui::New);
        scr.show();
        window.add(scr);
        gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scr ), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC );
        gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scr ), GTK_SHADOW_IN );
 
        {
-               ui::ListStore store = ui::ListStore(gtk_list_store_new( 1, G_TYPE_STRING ));
+               ui::ListStore store = ui::ListStore::from(gtk_list_store_new( 1, G_TYPE_STRING ));
 
-               ui::Widget view = ui::TreeView(ui::TreeModel( GTK_TREE_MODEL( store ) ));
-               gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( view ), FALSE );
+               auto view = ui::TreeView(ui::TreeModel::from(store._handle));
+               gtk_tree_view_set_headers_visible(view, FALSE );
 
                {
-                       auto renderer = ui::CellRendererText();
-                       GtkTreeViewColumn* column = ui::TreeViewColumn( "", renderer, {{"text", 0}} );
-                       gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column );
+                       auto renderer = ui::CellRendererText(ui::New);
+                       auto column = ui::TreeViewColumn( "", renderer, {{"text", 0}} );
+                       gtk_tree_view_append_column(view, column );
                }
 
                {
-                       GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) );
+                       auto selection = ui::TreeSelection::from(gtk_tree_view_get_selection(view ));
                        gtk_tree_selection_set_mode( selection, GTK_SELECTION_BROWSE );
-                       g_signal_connect( G_OBJECT( selection ), "changed", G_CALLBACK( feedback_selection_changed ), NULL );
+                       selection.connect( "changed", G_CALLBACK( feedback_selection_changed ), NULL );
                }
 
                view.show();
 
                scr.add(view);
 
-               g_object_unref( G_OBJECT( store ) );
+               store.unref();
 
                m_clist = store;
        }