-DGTK_DISABLE_SINGLE_INCLUDES

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

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 35a7cb723d1991933d15750beac272bb7363f507..b75225ebf65c7832a30bc27be3f2c577b3055ec8 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -40,13 +40,7 @@
 #include <ctime>
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtktoolbar.h>
+#include <gtk/gtk.h>
 
 
 #include "cmdlib.h"
@@ -2404,7 +2398,7 @@ ui::Widget create_main_statusbar( ui::Widget pStatusLabel[c_count_status] ){
 
        for ( int i = 1; i < c_count_status; ++i )
        {
-               GtkFrame* frame = GTK_FRAME( gtk_frame_new( 0 ) );
+               GtkFrame* frame = ui::Frame();
                gtk_widget_show( GTK_WIDGET( frame ) );
                gtk_table_attach_defaults( table, GTK_WIDGET( frame ), i, i + 1, 0, 1 );
                gtk_frame_set_shadow_type( frame, GTK_SHADOW_IN );
@@ -2659,7 +2653,7 @@ void MainFrame::OnSleep(){
 
 
 ui::Window create_splash(){
-       ui::Window window = ui::Window(GTK_WINDOW( gtk_window_new( GTK_WINDOW_TOPLEVEL ) ));
+       ui::Window window = ui::Window( ui::window_type::TOP );
        gtk_window_set_decorated( window, FALSE );
        gtk_window_set_resizable( window, FALSE );
        gtk_window_set_modal( window, TRUE );
@@ -2703,7 +2697,7 @@ static gint mainframe_delete( ui::Widget widget, GdkEvent *event, gpointer data
 }
 
 void MainFrame::Create(){
-       ui::Window window = ui::Window(GTK_WINDOW( gtk_window_new( GTK_WINDOW_TOPLEVEL ) ));
+       ui::Window window = ui::Window( ui::window_type::TOP );
 
        GlobalWindowObservers_connectTopLevel( window );
 
@@ -2788,7 +2782,7 @@ void MainFrame::Create(){
 
        if ( CurrentStyle() == eRegular || CurrentStyle() == eRegularLeft ) {
                {
-                       ui::Widget vsplit = ui::Widget(gtk_vpaned_new());
+                       ui::Widget vsplit = ui::VPaned();
                        m_vSplit = vsplit;
                        gtk_box_pack_start( GTK_BOX( vbox ), vsplit, TRUE, TRUE, 0 );
                        gtk_widget_show( vsplit );
@@ -2798,7 +2792,7 @@ void MainFrame::Create(){
                        gtk_paned_pack2( GTK_PANED( vsplit ), console_window, FALSE, TRUE );
 
                        {
-                               ui::Widget hsplit = ui::Widget(gtk_hpaned_new());
+                               ui::Widget hsplit = ui::HPaned();
                                gtk_widget_show( hsplit );
                                m_hSplit = hsplit;
                                gtk_paned_add1( GTK_PANED( vsplit ), hsplit );
@@ -2809,7 +2803,7 @@ void MainFrame::Create(){
                                ui::Widget xy_window = ui::Widget(GTK_WIDGET( create_framed_widget( m_pXYWnd->GetWidget() ) ));
 
                                {
-                                       ui::Widget vsplit2 = ui::Widget(gtk_vpaned_new());
+                                       ui::Widget vsplit2 = ui::VPaned();
                                        gtk_widget_show( vsplit2 );
                                        m_vSplit2 = vsplit2;