X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Ffeedback.cpp;h=33f6552b90f40b8400b447a5a1bc8152b9a5b595;hb=154772140a25f808acd01f9f6701717fe2b2fe18;hp=1d2856f58e8267ff54c0dcf6225234dfc307c341;hpb=b7e36c120eb1546a6c6f97f30e42ab7f9a559c61;p=xonotic%2Fnetradiant.git

diff --git a/radiant/feedback.cpp b/radiant/feedback.cpp
index 1d2856f5..33f6552b 100644
--- a/radiant/feedback.cpp
+++ b/radiant/feedback.cpp
@@ -27,18 +27,13 @@
 
 #include "feedback.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 
 #include "igl.h"
 #include "iselection.h"
 
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkscrolledwindow.h>
-
 #include "map.h"
 #include "dialog.h"
 #include "mainframe.h"
@@ -228,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 );
 	}
@@ -270,8 +265,8 @@ void CDbgDlg::Init(){
 		g_ptr_array_remove_index( m_pFeedbackElements, 0 );
 	}
 
-	if ( m_clist != NULL ) {
-		gtk_list_store_clear( m_clist );
+	if ( m_clist ) {
+		m_clist.clear();
 	}
 }
 
@@ -279,54 +274,52 @@ void CDbgDlg::Push( ISAXHandler *pHandler ){
 	// push in the list
 	g_ptr_array_add( m_pFeedbackElements, (void *)pHandler );
 
-	if ( GetWidget() == 0 ) {
+	if ( !GetWidget() ) {
 		Create();
 	}
 
 	// 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();
 }
 
-GtkWindow* CDbgDlg::BuildDialog(){
-	GtkWindow* window = create_floating_window( "Q3Map debug window", MainFrame_getWindow() );
+ui::Window CDbgDlg::BuildDialog(){
+	auto window = MainFrame_getWindow().create_floating_window("Q3Map debug window" );
 
-	GtkWidget* scr = gtk_scrolled_window_new( NULL, NULL );
-	gtk_widget_show( scr );
-	gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( scr ) );
+	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 );
 
 	{
-		GtkListStore* store = gtk_list_store_new( 1, G_TYPE_STRING );
+		ui::ListStore store = ui::ListStore::from(gtk_list_store_new( 1, G_TYPE_STRING ));
 
-		GtkWidget* view = gtk_tree_view_new_with_model( 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 );
 
 		{
-			GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
-			GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes( "", renderer, "text", 0, NULL );
-			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 );
 		}
 
-		gtk_widget_show( view );
+		view.show();
 
-		gtk_container_add( GTK_CONTAINER( scr ), view );
+		scr.add(view);
 
-		g_object_unref( G_OBJECT( store ) );
+		store.unref();
 
 		m_clist = store;
 	}