GTK: wrap gtk_widget_set_size_request

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

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index c06c2904bebec5696388ef4e161a014bcd4fd5ef..f23f73237c4b29f0fa3cfcdad4079efa29f239a0 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -1631,7 +1631,7 @@ WaitDialog create_wait_dialog( const char* title, const char* text ){
                gtk_misc_set_alignment( GTK_MISC( dialog.m_label ), 0.0, 0.5 );
                gtk_label_set_justify( dialog.m_label, GTK_JUSTIFY_LEFT );
                dialog.m_label.show();
-               gtk_widget_set_size_request( dialog.m_label , 200, -1 );
+               dialog.m_label.dimensions(200, -1);
 
                dialog.m_window.add(dialog.m_label);
        }
@@ -1659,7 +1659,7 @@ bool MainFrame_isActiveApp(){
        for ( GList* i = list; i != 0; i = g_list_next( i ) )
        {
                //globalOutputStream() << "toplevel.. ";
-               if ( gtk_window_is_active( GTK_WINDOW( i->data ) ) ) {
+               if ( gtk_window_is_active( ui::Window::from( i->data ) ) ) {
                        //globalOutputStream() << "is active\n";
                        return true;
                }
@@ -2402,15 +2402,15 @@ ui::Widget create_main_statusbar( ui::Widget pStatusLabel[c_count_status] ){
                gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
                gtk_misc_set_padding( GTK_MISC( label ), 4, 2 );
                label.show();
-               gtk_table_attach_defaults( table, label , 0, 1, 0, 1 );
+               table.attach(label, {0, 1, 0, 1});
                pStatusLabel[c_command_status] = ui::Widget(label );
        }
 
-       for ( int i = 1; i < c_count_status; ++i )
+       for (unsigned int i = 1; (int) i < c_count_status; ++i)
        {
                auto frame = ui::Frame();
                frame.show();
-               gtk_table_attach_defaults( table, frame , i, i + 1, 0, 1 );
+               table.attach(frame, {i, i + 1, 0, 1});
                gtk_frame_set_shadow_type( frame, GTK_SHADOW_IN );
 
                auto label = ui::Label( "Label" );
@@ -2674,7 +2674,7 @@ ui::Window create_splash(){
        image.show();
        window.add(image);
 
-       gtk_widget_set_size_request( window , -1, -1 );
+       window.dimensions(-1, -1);
        window.show();
 
        return window;