X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Ffeedback.cpp;h=44e9dd71e0421fc300c3dc1dc3e20787df808f03;hb=83113718a4fb6a8e2318841f16f8a0b0eb85675c;hp=bb565b843db58c585cc4e2323b26016bc174ce57;hpb=c52a4bd4da209e657018e8d799dcb488cd848e4c;p=xonotic%2Fnetradiant.git

diff --git a/radiant/feedback.cpp b/radiant/feedback.cpp
index bb565b84..44e9dd71 100644
--- a/radiant/feedback.cpp
+++ b/radiant/feedback.cpp
@@ -27,13 +27,13 @@
 
 #include "feedback.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 
 #include "igl.h"
 #include "iselection.h"
 
-#include <gtk/gtk.h>
-
 #include "map.h"
 #include "dialog.h"
 #include "mainframe.h"
@@ -265,7 +265,7 @@ void CDbgDlg::Init(){
 		g_ptr_array_remove_index( m_pFeedbackElements, 0 );
 	}
 
-	if ( m_clist != NULL ) {
+	if ( m_clist ) {
 		gtk_list_store_clear( m_clist );
 	}
 }
@@ -291,37 +291,37 @@ void CDbgDlg::Push( ISAXHandler *pHandler ){
 }
 
 ui::Window CDbgDlg::BuildDialog(){
-	ui::Window window = MainFrame_getWindow().create_floating_window("Q3Map debug window" );
+	auto window = MainFrame_getWindow().create_floating_window("Q3Map debug window" );
 
-	ui::Widget scr = ui::ScrolledWindow();
-	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(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 renderer = ui::CellRendererText();
+			auto renderer = ui::CellRendererText(ui::New);
 			GtkTreeViewColumn* column = ui::TreeViewColumn( "", renderer, {{"text", 0}} );
 			gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column );
 		}
 
 		{
-			GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) );
+			auto selection = ui::TreeSelection(gtk_tree_view_get_selection( GTK_TREE_VIEW( 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;
 	}