X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fentitylist.cpp;h=dad00e4e0c8780950e526fd498e9ad0c37341af0;hp=f8847255c51b8ba1063645981059a805a82cabd1;hb=cb5c74a45f6154d14e5c0309c41e7a4eb0f947f1;hpb=225950494a606af9aac2bc2f06ece70cb2146481

diff --git a/radiant/entitylist.cpp b/radiant/entitylist.cpp
index f8847255..dad00e4e 100644
--- a/radiant/entitylist.cpp
+++ b/radiant/entitylist.cpp
@@ -24,6 +24,7 @@
 #include "iselection.h"
 
 #include <uilib/uilib.h>
+#include <gtk/gtk.h>
 
 #include "string/string.h"
 #include "scenelib.h"
@@ -114,22 +115,22 @@ void entitylist_treeviewcolumn_celldatafunc( GtkTreeViewColumn* column, GtkCellR
 	if ( node != 0 ) {
 		gtk_cell_renderer_set_fixed_size( renderer, -1, -1 );
 		char* name = const_cast<char*>( node_get_name( *node ) );
-		g_object_set( G_OBJECT( renderer ), "text", name, "visible", TRUE, 0 );
+		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 ) );
 		if ( instance->childSelected() ) {
-			g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_ACTIVE], 0 );
+			g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_ACTIVE], NULL );
 		}
 		else
 		{
-			g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_NORMAL], 0 );
+			g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_NORMAL], NULL );
 		}
 	}
 	else
 	{
 		gtk_cell_renderer_set_fixed_size( renderer, -1, 0 );
-		g_object_set( G_OBJECT( renderer ), "text", "", "visible", FALSE, 0 );
+		g_object_set( G_OBJECT( renderer ), "text", "", "visible", FALSE, NULL );
 	}
 }
 
@@ -291,7 +292,7 @@ void EntityList_constructWindow( ui::Window main_window ){
 	getEntityList().m_window = window;
 
 	{
-		auto scr = create_scrolled_window( GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
+		auto scr = create_scrolled_window( ui::Policy::AUTOMATIC, ui::Policy::AUTOMATIC );
 		window.add(scr);
 
 		{
@@ -306,8 +307,8 @@ void EntityList_constructWindow( ui::Window main_window ){
 			GtkTreeSelection* select = gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) );
 			gtk_tree_selection_set_mode( select, GTK_SELECTION_MULTIPLE );
 
-			g_signal_connect( G_OBJECT( view ), "row_expanded", G_CALLBACK( entitylist_treeview_row_expanded ), 0 );
-			g_signal_connect( G_OBJECT( view ), "row_collapsed", G_CALLBACK( entitylist_treeview_rowcollapsed ), 0 );
+			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 );