Remove <gtk/gtk.h> from gtkutil/container.h

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

diff --git a/radiant/console.cpp b/radiant/console.cpp
index 044648f9ff6467e3a882089c7a8a83e7fed43e27..f7bdc929c233b7eb2b924354f3b2627ceeee6681 100644 (file)
--- a/radiant/console.cpp
+++ b/radiant/console.cpp
@@ -93,7 +93,7 @@ void console_populate_popup( GtkTextView* textview, ui::Menu menu, gpointer user
        ui::Widget item(ui::MenuItem( "Clear" ));
        g_signal_connect( G_OBJECT( item ), "activate", G_CALLBACK( console_clear ), 0 );
        item.show();
-       container_add_widget( menu, item );
+       menu.add(item);
 }
 
 gboolean destroy_set_null( ui::Window widget, ui::Widget* p ){
@@ -104,7 +104,7 @@ gboolean destroy_set_null( ui::Window widget, ui::Widget* p ){
 WidgetFocusPrinter g_consoleWidgetFocusPrinter( "console" );
 
 ui::Widget Console_constructWindow( ui::Window toplevel ){
-       ui::Widget scr = ui::ScrolledWindow();
+       auto scr = ui::ScrolledWindow();
        gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scr ), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
        gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scr ), GTK_SHADOW_IN );
        scr.show();
@@ -114,7 +114,7 @@ ui::Widget Console_constructWindow( ui::Window toplevel ){
                gtk_widget_set_size_request( text, 0, -1 ); // allow shrinking
                gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( text ), GTK_WRAP_WORD );
                gtk_text_view_set_editable( GTK_TEXT_VIEW( text ), FALSE );
-               gtk_container_add( GTK_CONTAINER( scr ), text );
+               scr.add(text);
                text.show();
                g_console = text;