X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fentitylist.cpp;h=602ea1e5416da12a0ca2e058272721f1bc472151;hp=35cbc847789c3d0f70e725680bf5bbb39a00478f;hb=69b4f74e6c95e22d6c6ce10d0e137c875fd83cc4;hpb=465884e260039bad1a333c51b6013edd361a63cd

diff --git a/radiant/entitylist.cpp b/radiant/entitylist.cpp
index 35cbc847..602ea1e5 100644
--- a/radiant/entitylist.cpp
+++ b/radiant/entitylist.cpp
@@ -71,8 +71,8 @@ EntityList() :
 	m_selection_disabled( false ){
 }
 
-bool visible() const {
-	return gtk_widget_get_visible( m_window );
+bool visible() {
+	return m_window.visible();
 }
 };
 
@@ -115,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 ) );
+		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], 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 );
 	}
 }
 
@@ -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(){
@@ -296,10 +296,10 @@ void EntityList_constructWindow( ui::Window main_window ){
 		window.add(scr);
 
 		{
-			ui::Widget view = ui::TreeView();
+			ui::Widget view = ui::TreeView(ui::New);
 			gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( view ), FALSE );
 
-			auto renderer = ui::CellRendererText();
+			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 );