GTK: wrap gtk_widget_set_size_request

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

diff --git a/radiant/entityinspector.cpp b/radiant/entityinspector.cpp
index 2aefe7d1f548115de7ace0efdd1b2944800aa14a..8fd73db5d56b52d5f5d1579e01d1ac365485891f 100644 (file)
--- a/radiant/entityinspector.cpp
+++ b/radiant/entityinspector.cpp
@@ -888,7 +888,7 @@ void SurfaceFlags_setEntityClass( EntityClass* eclass ){
 }
 
 void EntityClassList_selectEntityClass( EntityClass* eclass ){
-       GtkTreeModel* model = GTK_TREE_MODEL( g_entlist_store );
+       GtkTreeModel* model = g_entlist_store;
        GtkTreeIter iter;
        for ( gboolean good = gtk_tree_model_get_iter_first( model, &iter ); good != FALSE; good = gtk_tree_model_iter_next( model, &iter ) )
        {
@@ -1316,8 +1316,8 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){
                                {
                                        ui::ListStore store = ui::ListStore(gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_POINTER ));
 
-                                       auto view = ui::TreeView( ui::TreeModel( GTK_TREE_MODEL( store ) ));
-                                       gtk_tree_view_set_enable_search( GTK_TREE_VIEW( view ), FALSE );
+                                       auto view = ui::TreeView( ui::TreeModel(store ));
+                                       gtk_tree_view_set_enable_search(view, FALSE );
                                        gtk_tree_view_set_headers_visible( view, FALSE );
                                        view.connect( "button_press_event", G_CALLBACK( EntityClassList_button_press ), 0 );
                                        view.connect( "key_press_event", G_CALLBACK( EntityClassList_keypress ), 0 );
@@ -1352,7 +1352,7 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){
 
                                {
                                        auto text = ui::TextView(ui::New);
-                                       gtk_widget_set_size_request( text , 0, -1 ); // allow shrinking
+                                       text.dimensions(0, -1); // allow shrinking
                                        gtk_text_view_set_wrap_mode( text, GTK_WRAP_WORD );
                                        gtk_text_view_set_editable( text, FALSE );
                                        text.show();
@@ -1400,24 +1400,24 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){
                                        {
                                                ui::ListStore store = ui::ListStore(gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_STRING ));
 
-                                               ui::Widget view = ui::TreeView(ui::TreeModel( GTK_TREE_MODEL( store ) ));
-                                               gtk_tree_view_set_enable_search( GTK_TREE_VIEW( view ), FALSE );
-                                               gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( view ), FALSE );
+                                               auto view = ui::TreeView(ui::TreeModel(store ));
+                                               gtk_tree_view_set_enable_search(view, FALSE );
+                                               gtk_tree_view_set_headers_visible(view, FALSE );
 
                                                {
                                                        auto renderer = ui::CellRendererText(ui::New);
                                                        GtkTreeViewColumn* column = ui::TreeViewColumn( "", renderer, {{"text", 0}} );
-                                                       gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column );
+                                                       gtk_tree_view_append_column(view, column );
                                                }
 
                                                {
                                                        auto renderer = ui::CellRendererText(ui::New);
                                                        GtkTreeViewColumn* column = ui::TreeViewColumn( "", renderer, {{"text", 1}} );
-                                                       gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column );
+                                                       gtk_tree_view_append_column(view, column );
                                                }
 
                                                {
-                                                       auto selection = ui::TreeSelection(gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) ));
+                                                       auto selection = ui::TreeSelection(gtk_tree_view_get_selection(view ));
                                                        selection.connect( "changed", G_CALLBACK( EntityProperties_selection_changed ), 0 );
                                                }