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

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

diff --git a/radiant/build.cpp b/radiant/build.cpp
index a7500ef4d1b91d1edaa56f37ccdf33ff2ddc184d..830bf2f025f2fe3306d3c3efb27c36d6949ff52c 100644 (file)
--- a/radiant/build.cpp
+++ b/radiant/build.cpp
@@ -633,14 +633,13 @@ void build_commands_write( const char* filename ){
 
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
 
 #include "gtkutil/dialog.h"
 #include "gtkutil/closure.h"
 #include "gtkutil/window.h"
 #include "gtkdlgs.h"
 
-void Build_refreshMenu( GtkMenu* menu );
+void Build_refreshMenu( ui::Menu menu );
 
 
 void BSPCommandList_Construct( ui::ListStore store, Project& project ){
@@ -843,8 +842,8 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
        ui::Widget buildView;
 
        {
-               GtkTable* table1 = create_dialog_table( 2, 2, 4, 4, 4 );
-               gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( table1 ) );
+               auto table1 = create_dialog_table( 2, 2, 4, 4, 4 );
+               window.add(table1);
                {
                        GtkVBox* vbox = create_dialog_vbox( 4 );
                        gtk_table_attach( table1, GTK_WIDGET( vbox ), 1, 2, 0, 1,
@@ -860,13 +859,13 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
                        }
                }
                {
-                       GtkFrame* frame = create_dialog_frame( "Build menu" );
+                       auto frame = create_dialog_frame( "Build menu" );
                        gtk_table_attach( table1, GTK_WIDGET( frame ), 0, 1, 0, 1,
                                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
                        {
-                               GtkScrolledWindow* scr = create_scrolled_window( GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, 4 );
-                               gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( scr ) );
+                               auto scr = create_scrolled_window( GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, 4 );
+                               frame.add(scr);
 
                                {
                                        auto store = ui::ListStore(gtk_list_store_new( 1, G_TYPE_STRING ));
@@ -884,11 +883,11 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
                                        GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) );
                                        gtk_tree_selection_set_mode( selection, GTK_SELECTION_BROWSE );
 
-                                       gtk_widget_show( view );
+                                       view.show();
 
                                        buildView = view;
                                        projectList.m_store = store;
-                                       gtk_container_add( GTK_CONTAINER( scr ), view );
+                                       scr.add(view);
 
                                        g_signal_connect( G_OBJECT( view ), "key_press_event", G_CALLBACK( project_key_press ), &projectList );
 
@@ -897,13 +896,13 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
                        }
                }
                {
-                       GtkFrame* frame = create_dialog_frame( "Commandline" );
+                       auto frame = create_dialog_frame( "Commandline" );
                        gtk_table_attach( table1, GTK_WIDGET( frame ), 0, 1, 1, 2,
                                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
                        {
-                               GtkScrolledWindow* scr = create_scrolled_window( GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, 4 );
-                               gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( scr ) );
+                               auto scr = create_scrolled_window( GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, 4 );
+                               frame.add(scr);
 
                                {
                                        ui::ListStore store = ui::ListStore(gtk_list_store_new( 1, G_TYPE_STRING ));
@@ -921,9 +920,9 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
                                        GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) );
                                        gtk_tree_selection_set_mode( selection, GTK_SELECTION_BROWSE );
 
-                                       gtk_widget_show( view );
+                                       view.show();
 
-                                       gtk_container_add( GTK_CONTAINER( scr ), view );
+                                       scr.add(view);
 
                                        g_object_unref( G_OBJECT( store ) );
 
@@ -974,8 +973,6 @@ void DoBuildMenu(){
 #include "preferences.h"
 #include "qe3.h"
 
-typedef struct _GtkMenuItem GtkMenuItem;
-
 class BuildMenuItem
 {
 const char* m_name;
@@ -994,9 +991,9 @@ typedef std::list<BuildMenuItem> BuildMenuItems;
 BuildMenuItems g_BuildMenuItems;
 
 
-GtkMenu* g_bsp_menu;
+ui::Menu g_bsp_menu{nullptr};
 
-void Build_constructMenu( GtkMenu* menu ){
+void Build_constructMenu( ui::Menu menu ){
        for ( Project::iterator i = g_build_project.begin(); i != g_build_project.end(); ++i )
        {
                g_BuildMenuItems.push_back( BuildMenuItem( ( *i ).first.c_str(), 0 ) );
@@ -1011,10 +1008,10 @@ void Build_constructMenu( GtkMenu* menu ){
 }
 
 
-void Build_refreshMenu( GtkMenu* menu ){
+void Build_refreshMenu( ui::Menu menu ){
        for ( BuildMenuItems::iterator i = g_BuildMenuItems.begin(); i != g_BuildMenuItems.end(); ++i )
        {
-               gtk_container_remove( GTK_CONTAINER( menu ), GTK_WIDGET( ( *i ).m_item ) );
+               gtk_container_remove( menu, GTK_WIDGET( ( *i ).m_item ) );
        }
 
        g_BuildMenuItems.clear();