-DGTK_DISABLE_SINGLE_INCLUDES

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a39ab7ab8d89c01cbfdd9ddda6de8cc2a05be0bb..70c60542638fb01fad595ebb674c50078f35576f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,8 @@ find_package(OpenGL REQUIRED)
 
 add_definitions(-DRADIANT_EXECUTABLE="${RADIANT_EXECUTABLE}")
 
+add_definitions(-DGTK_DISABLE_SINGLE_INCLUDES)
+
 if(NOT WIN32)
     add_definitions(
         -DPOSIX=1

diff --git a/contrib/brushexport/plugin.cpp b/contrib/brushexport/plugin.cpp
index 49b3df06dc94d09450c17b159a9f4aadb0db3e81..8e498987317783abd092ce0e18208ba6db4b4378 100644 (file)
--- a/contrib/brushexport/plugin.cpp
+++ b/contrib/brushexport/plugin.cpp
@@ -24,7 +24,6 @@
 #include "qerplugin.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtktreeview.h>
 
 #include "debugging/debugging.h"
 #include "string/string.h"

diff --git a/libs/gtkutil/accelerator.cpp b/libs/gtkutil/accelerator.cpp
index 3b9924f98f9094472c18574b1888f7b46787a790..c80d982ad07ced3681be8dfc5ff9a10f82c443e9 100644 (file)
--- a/libs/gtkutil/accelerator.cpp
+++ b/libs/gtkutil/accelerator.cpp
@@ -25,8 +25,7 @@
 
 #include <map>
 #include <set>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 
 #include "generic/callback.h"
 #include "generic/bitfield.h"

diff --git a/libs/gtkutil/accelerator.h b/libs/gtkutil/accelerator.h
index d1cd344e5e130c53cbc664a5d470d8f804cc2fd0..a02572e7985f363dd40fe5066225feb639386c5a 100644 (file)
--- a/libs/gtkutil/accelerator.h
+++ b/libs/gtkutil/accelerator.h
@@ -22,9 +22,7 @@
 #if !defined( INCLUDED_GTKUTIL_ACCELERATOR_H )
 #define INCLUDED_GTKUTIL_ACCELERATOR_H
 
-#include <gdk/gdktypes.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkkeys.h>
+#include <gdk/gdk.h>
 
 #include "generic/callback.h"
 

diff --git a/libs/gtkutil/button.cpp b/libs/gtkutil/button.cpp
index fc1e58d7bb955b4d06d9789a90b21b1a336275bf..d565c974c9c512d7183e798ebfac6169db65ea42 100644 (file)
--- a/libs/gtkutil/button.cpp
+++ b/libs/gtkutil/button.cpp
@@ -21,7 +21,7 @@
 
 #include "button.h"
 
-#include <gtk/gtkradiobutton.h>
+#include <gtk/gtk.h>
 
 #include "stream/textstream.h"
 #include "stream/stringstream.h"

diff --git a/libs/gtkutil/clipboard.cpp b/libs/gtkutil/clipboard.cpp
index c8073aba478bf6922a77be881b769c4461544de9..0d96b3fbe75c13ed7ed1bdd189ca1056e0a56599 100644 (file)
--- a/libs/gtkutil/clipboard.cpp
+++ b/libs/gtkutil/clipboard.cpp
@@ -83,7 +83,7 @@ void clipboard_paste( ClipboardPasteFunc paste ){
 
 #else
 
-#include <gtk/gtkclipboard.h>
+#include <gtk/gtk.h>
 
 enum
 {

diff --git a/libs/gtkutil/container.h b/libs/gtkutil/container.h
index b6b6afa4f43e1199e1e269ffd3bf7797bc272d86..e633d81c841ad7a03043b04b2486256b6efbd89a 100644 (file)
--- a/libs/gtkutil/container.h
+++ b/libs/gtkutil/container.h
@@ -22,7 +22,7 @@
 #if !defined( INCLUDED_GTKUTIL_CONTAINER_H )
 #define INCLUDED_GTKUTIL_CONTAINER_H
 
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 
 inline GtkWidget* container_add_widget( GtkContainer* container, GtkWidget* widget ){
        gtk_container_add( container, widget );

diff --git a/libs/gtkutil/cursor.cpp b/libs/gtkutil/cursor.cpp
index f0538a5089963bad6a1c7f5279b2bce7c73c4daa..287b97de397e35f4bd9a9e260ef25a093db1d8b8 100644 (file)
--- a/libs/gtkutil/cursor.cpp
+++ b/libs/gtkutil/cursor.cpp
@@ -24,8 +24,7 @@
 #include "stream/textstream.h"
 
 #include <string.h>
-#include <gdk/gdkcursor.h>
-#include <gdk/gdkpixmap.h>
+#include <gdk/gdk.h>
 
 
 GdkCursor* create_blank_cursor(){

diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h
index dfcc962c1d1d8ff1a02b3a9500c921b2023222d3..4e7d4facf397df64233fb4b0e64a898a47fbedda 100644 (file)
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -23,9 +23,7 @@
 #define INCLUDED_GTKUTIL_CURSOR_H
 
 #include <glib.h>
-#include <gdk/gdkevents.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "debugging/debugging.h"
 

diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index 17b9ac7a693f04eab4a627295da312f5b5d844ad..fce53163ebf66f3f36896db3424b961447006265 100644 (file)
--- a/libs/gtkutil/dialog.cpp
+++ b/libs/gtkutil/dialog.cpp
@@ -21,16 +21,7 @@
 
 #include "dialog.h"
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include "button.h"
 #include "window.h"

diff --git a/libs/gtkutil/dialog.h b/libs/gtkutil/dialog.h
index 5a87731e1819ba0c2bd53fdb3770b6e8865c9319..b3e5017c5a9dcce1d9e726a724b6c90ed6e445c8 100644 (file)
--- a/libs/gtkutil/dialog.h
+++ b/libs/gtkutil/dialog.h
@@ -25,7 +25,7 @@
 #include "generic/callback.h"
 #include "generic/arrayrange.h"
 #include "qerplugin.h"
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 
 typedef int gint;
 typedef gint gboolean;

diff --git a/libs/gtkutil/entry.h b/libs/gtkutil/entry.h
index 972514d0db92fb5d2f2430618a5c26db86b51c40..821659c1f67ebf9a0e59b54c79c7cd4560aa1129 100644 (file)
--- a/libs/gtkutil/entry.h
+++ b/libs/gtkutil/entry.h
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 #include <cstdlib>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 
 inline void entry_set_string( GtkEntry* entry, const char* string ){
        gtk_entry_set_text( entry, string );

diff --git a/libs/gtkutil/filechooser.cpp b/libs/gtkutil/filechooser.cpp
index 92bc5e6cda51cfda5ebc80173fc7d09674e572f3..177e752eee7a9fb31d6d0d8ef774d7ae14aebaa6 100644 (file)
--- a/libs/gtkutil/filechooser.cpp
+++ b/libs/gtkutil/filechooser.cpp
@@ -25,11 +25,7 @@
 
 #include <list>
 #include <vector>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "string/string.h"

diff --git a/libs/gtkutil/frame.cpp b/libs/gtkutil/frame.cpp
index 53fb462d8bad954900b9151021fcdad165bf7696..87f75f3654669309a02e80deb8ffe6db87c47fd3 100644 (file)
--- a/libs/gtkutil/frame.cpp
+++ b/libs/gtkutil/frame.cpp
@@ -21,7 +21,7 @@
 
 #include "frame.h"
 
-#include <gtk/gtkframe.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 GtkFrame* create_framed_widget( GtkWidget* widget ){

diff --git a/libs/gtkutil/glwidget.cpp b/libs/gtkutil/glwidget.cpp
index 746b8f0f9202d34b92a8a0c079ff98591a0ff4e4..1c9c275b24e592a3a3f6660f5457b0cf3b1f2804 100644 (file)
--- a/libs/gtkutil/glwidget.cpp
+++ b/libs/gtkutil/glwidget.cpp
@@ -27,7 +27,7 @@
 
 #include "igl.h"
 
-#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtk.h>
 #include <gtk/gtkglwidget.h>
 
 #include "pointer.h"

diff --git a/libs/gtkutil/image.cpp b/libs/gtkutil/image.cpp
index 63a6d7441987a5be37d20c3039485e0a21e78b6a..4b91bd258a24798d2f99bec3875e00df3cb3fc7a 100644 (file)
--- a/libs/gtkutil/image.cpp
+++ b/libs/gtkutil/image.cpp
@@ -21,8 +21,7 @@
 
 #include "image.h"
 
-#include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "string/string.h"
 #include "stream/stringstream.h"

diff --git a/libs/gtkutil/menu.cpp b/libs/gtkutil/menu.cpp
index 5dfad4c14cc7b17d15c90e5e3ac1712c17c32c9d..1cdc373a51024ebb04d59f401c30da6cfae72eac 100644 (file)
--- a/libs/gtkutil/menu.cpp
+++ b/libs/gtkutil/menu.cpp
@@ -22,11 +22,7 @@
 #include "menu.h"
 
 #include <ctype.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtktearoffmenuitem.h>
-#include <gtk/gtkaccellabel.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "generic/callback.h"

diff --git a/libs/gtkutil/messagebox.cpp b/libs/gtkutil/messagebox.cpp
index d07deddc88389838da67fcba0f98c76f6749e22f..ae0f24d728c4576157a208a575da7079c5a0355b 100644 (file)
--- a/libs/gtkutil/messagebox.cpp
+++ b/libs/gtkutil/messagebox.cpp
@@ -22,15 +22,7 @@
 #include "messagebox.h"
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "dialog.h"
 #include "widget.h"

diff --git a/libs/gtkutil/nonmodal.h b/libs/gtkutil/nonmodal.h
index 864779bd1603e8a6912723dacffb426a9ca15a23..d251ca4c4f73fa6a1101579474b261b299978164 100644 (file)
--- a/libs/gtkutil/nonmodal.h
+++ b/libs/gtkutil/nonmodal.h
@@ -22,9 +22,7 @@
 #if !defined( INCLUDED_GTKUTIL_NONMODAL_H )
 #define INCLUDED_GTKUTIL_NONMODAL_H
 
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkradiobutton.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "generic/callback.h"
@@ -36,7 +34,7 @@ typedef struct _GtkEntry GtkEntry;
 
 
 inline gboolean escape_clear_focus_widget( GtkWidget* widget, GdkEventKey* event, gpointer data ){
-       if ( event->keyval == GDK_Escape ) {
+       if ( event->keyval == GDK_KEY_Escape ) {
                gtk_window_set_focus( GTK_WINDOW( gtk_widget_get_toplevel( GTK_WIDGET( widget ) ) ), NULL );
                return TRUE;
        }

diff --git a/libs/gtkutil/paned.cpp b/libs/gtkutil/paned.cpp
index ec83344d3605fe33d63d4bf854f3a91a60128408..446a8bb4f2d409984cbf79101d29bda5402ebaef 100644 (file)
--- a/libs/gtkutil/paned.cpp
+++ b/libs/gtkutil/paned.cpp
@@ -21,8 +21,7 @@
 
 #include "paned.h"
 
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkvpaned.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "frame.h"

diff --git a/libs/gtkutil/toolbar.cpp b/libs/gtkutil/toolbar.cpp
index ef7c99a4e0ab9e315107eccfffb7020452f2e723..7b32ae0ea8d7e21f4c74855ed9879329b0444881 100644 (file)
--- a/libs/gtkutil/toolbar.cpp
+++ b/libs/gtkutil/toolbar.cpp
@@ -21,8 +21,7 @@
 
 #include "toolbar.h"
 
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "generic/callback.h"

diff --git a/libs/gtkutil/widget.h b/libs/gtkutil/widget.h
index ceb92409f8bf9c6553fdc193812ca3b41f43ecdf..4e83e8952de33b7c6d268ffeba90e1093efe5948 100644 (file)
--- a/libs/gtkutil/widget.h
+++ b/libs/gtkutil/widget.h
@@ -23,7 +23,7 @@
 #define INCLUDED_GTKUTIL_WIDGET_H
 
 #include <list>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "generic/callback.h"
 #include "warnings.h"
 #include "debugging/debugging.h"

diff --git a/libs/gtkutil/window.cpp b/libs/gtkutil/window.cpp
index 2c34e509fccaf45dce1a77f2623343eb3acc246b..b7be2d0ef2e46b84d55cda0caa6e81a97fe0418a 100644 (file)
--- a/libs/gtkutil/window.cpp
+++ b/libs/gtkutil/window.cpp
@@ -21,7 +21,7 @@
 
 #include "window.h"
 
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "pointer.h"

diff --git a/libs/gtkutil/window.h b/libs/gtkutil/window.h
index 1a7161e6dfd34d1b32c63889d86002995b7ac4c6..96b9be00fdf0d567fcc2aced266ccd717d4cda1a 100644 (file)
--- a/libs/gtkutil/window.h
+++ b/libs/gtkutil/window.h
@@ -22,7 +22,7 @@
 #if !defined( INCLUDED_GTKUTIL_WINDOW_H )
 #define INCLUDED_GTKUTIL_WINDOW_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "debugging/debugging.h"
 #include "generic/callback.h"

diff --git a/libs/gtkutil/xorrectangle.h b/libs/gtkutil/xorrectangle.h
index 35d72e5f55ecdea85fb4d8c5c2cd43b00055fab9..52d4c6e8f01e7d15cee2cd28f5115dbae60e55f9 100644 (file)
--- a/libs/gtkutil/xorrectangle.h
+++ b/libs/gtkutil/xorrectangle.h
@@ -22,7 +22,7 @@
 #if !defined ( INCLUDED_XORRECTANGLE_H )
 #define INCLUDED_XORRECTANGLE_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 #include "math/vector.h"
 

diff --git a/radiant/brushmanip.cpp b/radiant/brushmanip.cpp
index de5dca552ef64b11fae7dfbf51850fb271307864..9056be4f9bd2dd862e9a0ad16293216c4363e372 100644 (file)
--- a/radiant/brushmanip.cpp
+++ b/radiant/brushmanip.cpp
@@ -36,6 +36,7 @@
 #include "preferences.h"
 
 #include <list>
+#include <gdk/gdkkeysyms.h>
 
 void Brush_ConstructCuboid( Brush& brush, const AABB& bounds, const char* shader, const TextureProjection& projection ){
        const unsigned char box[3][2] = { { 0, 1 }, { 2, 0 }, { 1, 2 } };
@@ -1367,9 +1368,9 @@ void Brush_registerCommands(){
        GlobalCommands_insert( "Brush8Sided", BrushMakeSided::SetCaller( g_brushmakesided8 ), Accelerator( '8', (GdkModifierType)GDK_CONTROL_MASK ) );
        GlobalCommands_insert( "Brush9Sided", BrushMakeSided::SetCaller( g_brushmakesided9 ), Accelerator( '9', (GdkModifierType)GDK_CONTROL_MASK ) );
 
-       GlobalCommands_insert( "ClipSelected", FreeCaller<ClipSelected>(), Accelerator( GDK_Return ) );
-       GlobalCommands_insert( "SplitSelected", FreeCaller<SplitSelected>(), Accelerator( GDK_Return, (GdkModifierType)GDK_SHIFT_MASK ) );
-       GlobalCommands_insert( "FlipClip", FreeCaller<FlipClipper>(), Accelerator( GDK_Return, (GdkModifierType)GDK_CONTROL_MASK ) );
+       GlobalCommands_insert( "ClipSelected", FreeCaller<ClipSelected>(), Accelerator( GDK_KEY_Return ) );
+       GlobalCommands_insert( "SplitSelected", FreeCaller<SplitSelected>(), Accelerator( GDK_KEY_Return, (GdkModifierType)GDK_SHIFT_MASK ) );
+       GlobalCommands_insert( "FlipClip", FreeCaller<FlipClipper>(), Accelerator( GDK_KEY_Return, (GdkModifierType)GDK_CONTROL_MASK ) );
 
        GlobalCommands_insert( "MakeDetail", FreeCaller<Select_MakeDetail>(), Accelerator( 'M', (GdkModifierType)GDK_CONTROL_MASK ) );
        GlobalCommands_insert( "MakeStructural", FreeCaller<Select_MakeStructural>(), Accelerator( 'S', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );

diff --git a/radiant/build.cpp b/radiant/build.cpp
index 03ebf652462ebf082ccdbe0fbed65d29e0864988..0e85d94286958319d42fe92c27d67e3e9aa07e65 100644 (file)
--- a/radiant/build.cpp
+++ b/radiant/build.cpp
@@ -634,14 +634,7 @@ void build_commands_write( const char* filename ){
 
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 #include "gtkutil/dialog.h"
 #include "gtkutil/closure.h"

diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index 54c79647fad19c07797e26fb7b130d12ac94be20..542d019d8d80a457311a5c389b839a8f5e73981e 100644 (file)
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -25,6 +25,7 @@
 // Leonardo Zide (leo@lokigames.com)
 //
 
+#include <gdk/gdkkeysyms.h>
 #include "camwindow.h"
 
 #include "debugging/debugging.h"
@@ -911,27 +912,27 @@ void KeyEvent_disconnect( const char* name ){
 }
 
 void CamWnd_registerCommands( CamWnd& camwnd ){
-       GlobalKeyEvents_insert( "CameraForward", Accelerator( GDK_Up ),
+       GlobalKeyEvents_insert( "CameraForward", Accelerator( GDK_KEY_Up ),
                                                        ReferenceCaller<camera_t, Camera_MoveForward_KeyDown>( camwnd.getCamera() ),
                                                        ReferenceCaller<camera_t, Camera_MoveForward_KeyUp>( camwnd.getCamera() )
                                                        );
-       GlobalKeyEvents_insert( "CameraBack", Accelerator( GDK_Down ),
+       GlobalKeyEvents_insert( "CameraBack", Accelerator( GDK_KEY_Down ),
                                                        ReferenceCaller<camera_t, Camera_MoveBack_KeyDown>( camwnd.getCamera() ),
                                                        ReferenceCaller<camera_t, Camera_MoveBack_KeyUp>( camwnd.getCamera() )
                                                        );
-       GlobalKeyEvents_insert( "CameraLeft", Accelerator( GDK_Left ),
+       GlobalKeyEvents_insert( "CameraLeft", Accelerator( GDK_KEY_Left ),
                                                        ReferenceCaller<camera_t, Camera_RotateLeft_KeyDown>( camwnd.getCamera() ),
                                                        ReferenceCaller<camera_t, Camera_RotateLeft_KeyUp>( camwnd.getCamera() )
                                                        );
-       GlobalKeyEvents_insert( "CameraRight", Accelerator( GDK_Right ),
+       GlobalKeyEvents_insert( "CameraRight", Accelerator( GDK_KEY_Right ),
                                                        ReferenceCaller<camera_t, Camera_RotateRight_KeyDown>( camwnd.getCamera() ),
                                                        ReferenceCaller<camera_t, Camera_RotateRight_KeyUp>( camwnd.getCamera() )
                                                        );
-       GlobalKeyEvents_insert( "CameraStrafeRight", Accelerator( GDK_period ),
+       GlobalKeyEvents_insert( "CameraStrafeRight", Accelerator( GDK_KEY_period ),
                                                        ReferenceCaller<camera_t, Camera_MoveRight_KeyDown>( camwnd.getCamera() ),
                                                        ReferenceCaller<camera_t, Camera_MoveRight_KeyUp>( camwnd.getCamera() )
                                                        );
-       GlobalKeyEvents_insert( "CameraStrafeLeft", Accelerator( GDK_comma ),
+       GlobalKeyEvents_insert( "CameraStrafeLeft", Accelerator( GDK_KEY_comma ),
                                                        ReferenceCaller<camera_t, Camera_MoveLeft_KeyDown>( camwnd.getCamera() ),
                                                        ReferenceCaller<camera_t, Camera_MoveLeft_KeyUp>( camwnd.getCamera() )
                                                        );

diff --git a/radiant/commands.cpp b/radiant/commands.cpp
index 4232549c767af862ea485d4ee2e12fa51f0ed7db..d904368e40fe5a1c2dfd7447ceb3241cc62ded43 100644 (file)
--- a/radiant/commands.cpp
+++ b/radiant/commands.cpp
@@ -27,8 +27,7 @@
 #include "string/string.h"
 #include "versionlib.h"
 #include "gtkutil/messagebox.h"
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 #include "gtkmisc.h"
 
 typedef std::pair<Accelerator, int> ShortcutValue; // accelerator, isRegistered
@@ -148,9 +147,8 @@ void connect_accelerator( const char *name ){
 }
 
 
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcellrenderertext.h>
 #include <uilib/uilib.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "gtkutil/dialog.h"
 #include "mainframe.h"
@@ -247,20 +245,20 @@ bool accelerator_window_key_press( ui::Widget widget, GdkEventKey *event, gpoint
 #else
        switch ( event->keyval )
        {
-       case GDK_Shift_L:
-       case GDK_Shift_R:
-       case GDK_Control_L:
-       case GDK_Control_R:
-       case GDK_Caps_Lock:
-       case GDK_Shift_Lock:
-       case GDK_Meta_L:
-       case GDK_Meta_R:
-       case GDK_Alt_L:
-       case GDK_Alt_R:
-       case GDK_Super_L:
-       case GDK_Super_R:
-       case GDK_Hyper_L:
-       case GDK_Hyper_R:
+       case GDK_KEY_Shift_L:
+       case GDK_KEY_Shift_R:
+       case GDK_KEY_Control_L:
+       case GDK_KEY_Control_R:
+       case GDK_KEY_Caps_Lock:
+       case GDK_KEY_Shift_Lock:
+       case GDK_KEY_Meta_L:
+       case GDK_KEY_Meta_R:
+       case GDK_KEY_Alt_L:
+       case GDK_KEY_Alt_R:
+       case GDK_KEY_Super_L:
+       case GDK_KEY_Super_R:
+       case GDK_KEY_Hyper_L:
+       case GDK_KEY_Hyper_R:
                return false;
        }
 #endif

diff --git a/radiant/console.cpp b/radiant/console.cpp
index 11e56c6db477bfc10a97f9e51038b79881f22ab3..42e6ac7f8555194b9e04806383910734535c315c 100644 (file)
--- a/radiant/console.cpp
+++ b/radiant/console.cpp
@@ -22,10 +22,7 @@
 #include "console.h"
 
 #include <time.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "gtkutil/accelerator.h"

diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp
index 3c4f98feb7d3d312b978bf7362332ee3523100c7..727ac358aa3d106d6fe12e59751a6ea7a6f902d2 100644 (file)
--- a/radiant/dialog.cpp
+++ b/radiant/dialog.cpp
@@ -35,18 +35,7 @@
 
 #include <cstdlib>
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkhscale.h>
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
 
 #include "stream/stringstream.h"
 #include "convert.h"

diff --git a/radiant/entityinspector.cpp b/radiant/entityinspector.cpp
index 83166da1294bb753c98ebfe7731201df97a90a4c..9708bd4266983e60cc3f93649d0ab26784eb2aab 100644 (file)
--- a/radiant/entityinspector.cpp
+++ b/radiant/entityinspector.cpp
@@ -33,22 +33,7 @@
 #include <map>
 #include <set>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 

diff --git a/radiant/entitylist.cpp b/radiant/entitylist.cpp
index 0303e55ada74e90b7ce571c5e329b5fc0a7f4f4a..936dd520acb754c082aa9b6c48f2c326607ea853 100644 (file)
--- a/radiant/entitylist.cpp
+++ b/radiant/entitylist.cpp
@@ -23,10 +23,7 @@
 
 #include "iselection.h"
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "string/string.h"

diff --git a/radiant/feedback.cpp b/radiant/feedback.cpp
index 54679a53af0df04ff81cabd2e89c2b60309be8d2..bb565b843db58c585cc4e2323b26016bc174ce57 100644 (file)
--- a/radiant/feedback.cpp
+++ b/radiant/feedback.cpp
@@ -32,12 +32,7 @@
 #include "igl.h"
 #include "iselection.h"
 
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 #include "map.h"
 #include "dialog.h"

diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp
index b19fc04f4722268cfe53f2efa9f2daf4e56f4c5b..125461737c618ad6c47bdf36319785e4385f091b 100644 (file)
--- a/radiant/findtexturedialog.cpp
+++ b/radiant/findtexturedialog.cpp
@@ -31,17 +31,7 @@
 
 #include "ishaders.h"
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkarrow.h>
+#include <gtk/gtk.h>
 
 #include "gtkutil/window.h"
 #include "stream/stringstream.h"

diff --git a/radiant/groupdialog.cpp b/radiant/groupdialog.cpp
index 7e4b67c129c3df7115544c91f6ba30f0e2d1b3f6..6c95a5f53165b6ca3f4c01ef5d51efdbdc3ae02e 100644 (file)
--- a/radiant/groupdialog.cpp
+++ b/radiant/groupdialog.cpp
@@ -32,10 +32,7 @@
 
 #include <vector>
 
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 #include "gtkutil/widget.h"
 #include "gtkutil/accelerator.h"
@@ -46,7 +43,6 @@
 #include "commands.h"
 
 
-#include <gtk/gtkwidget.h>
 #include "gtkutil/window.h"
 
 class GroupDlg

diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index 5c76cf61d73905fe489f143a182c5463d17a11e6..a481ee11c32d5a3cabbd9fd25541fe8549dfd4b4 100644 (file)
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -45,22 +45,7 @@
 #include "iselection.h"
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "os/path.h"

diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp
index e988544b0b26fd00600cea846c413246c2ac6619..efa03ca70fb9ce083c4d1ed4a50ae50e0edf2dff 100644 (file)
--- a/radiant/gtkmisc.cpp
+++ b/radiant/gtkmisc.cpp
@@ -34,8 +34,7 @@
 
 #include "gtkmisc.h"
 
-#include <gtk/gtkcolorseldialog.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 #include "uilib/uilib.h"
 
 #include "math/vector.h"

diff --git a/radiant/gtkmisc.h b/radiant/gtkmisc.h
index 3588c252749a626262f54d877366571c3e2351d7..755c7330f4182ddae5c49ebc68ea8f6be830d46e 100644 (file)
--- a/radiant/gtkmisc.h
+++ b/radiant/gtkmisc.h
@@ -31,7 +31,7 @@
 #if !defined( INCLUDED_GTKMISC_H )
 #define INCLUDED_GTKMISC_H
 
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 inline void process_gui(){

diff --git a/radiant/main.cpp b/radiant/main.cpp
index d72aa6c87e27ad1d507014e61311839202f8c4a3..1167cc762a7aaeb838b8abf95ec97803eedc1626 100644 (file)
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -70,7 +70,7 @@
 #include "iundo.h"
 
 #include "uilib/uilib.h"
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include "cmdlib.h"
 #include "os/file.h"

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 7c1dea162ed8906a06037432b4fffea5acaa8601..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"

diff --git a/radiant/map.cpp b/radiant/map.cpp
index 0dcf97913e9a7b6eb778abd6c7e4b6941b800d83..1c228181a7b1b6e788fac6053f7b4bcf0666fc19 100644 (file)
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -41,15 +41,8 @@ MapModules& ReferenceAPI_getMapModules();
 
 #include <set>
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 #include "uilib/uilib.h"
 
 #include "scenelib.h"
@@ -2056,12 +2049,12 @@ void DoFind(){
                                GtkButton* button = create_dialog_button( "Find", G_CALLBACK( dialog_button_ok ), &dialog );
                                gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
                                widget_make_default( GTK_WIDGET( button ) );
-                               gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
+                               gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
                        }
                        {
                                GtkButton* button = create_dialog_button( "Close", G_CALLBACK( dialog_button_cancel ), &dialog );
                                gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
-                               gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
+                               gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
                        }
                }
        }

diff --git a/radiant/mru.cpp b/radiant/mru.cpp
index a30de609a79808468bd0fc4909e6def0547b5ffb..67690be118b7eecb1622a83cd408aa148e66f5f1 100644 (file)
--- a/radiant/mru.cpp
+++ b/radiant/mru.cpp
@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include "os/file.h"
 #include "generic/callback.h"

diff --git a/radiant/multimon.cpp b/radiant/multimon.cpp
index 281a5bffa030f820802c2a349853f3169f92e246..6fd4100372c20ea39bbaf7b04c38878dce46a1d2 100644 (file)
--- a/radiant/multimon.cpp
+++ b/radiant/multimon.cpp
@@ -44,7 +44,7 @@ void MultiMonitor_constructPreferences( PreferencesPage& page ){
 #include "preferencesystem.h"
 #include "stringio.h"
 
-#include <gdk/gdkdisplay.h>
+#include <gdk/gdk.h>
 
 namespace
 {

diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp
index 2975e08b6420845e063008be25eb6de2610d1f01..bbe466c10e633165171d6c446853100cbfd8d4ac 100644 (file)
--- a/radiant/patchdialog.cpp
+++ b/radiant/patchdialog.cpp
@@ -31,15 +31,7 @@
 
 #include "debugging/debugging.h"
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtk.h>
 
 #include "gtkutil/idledraw.h"
 #include "gtkutil/entry.h"

diff --git a/radiant/patchmanip.cpp b/radiant/patchmanip.cpp
index 91f0acf51a9dcdf7635e367d458edecc7b501cb3..897cbd6dd217a3c5199805f1c61b63b3983f4c5c 100644 (file)
--- a/radiant/patchmanip.cpp
+++ b/radiant/patchmanip.cpp
@@ -19,6 +19,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <gdk/gdkkeysyms.h>
 #include "patchmanip.h"
 
 #include "debugging/debugging.h"
@@ -723,13 +724,13 @@ void Patch_registerCommands(){
        GlobalCommands_insert( "PatchCone", FreeCaller<Patch_Cone>() );
        GlobalCommands_insert( "PatchSphere", FreeCaller<Patch_Sphere>() );
        GlobalCommands_insert( "SimplePatchMesh", FreeCaller<Patch_Plane>(), Accelerator( 'P', (GdkModifierType)GDK_SHIFT_MASK ) );
-       GlobalCommands_insert( "PatchInsertInsertColumn", FreeCaller<Patch_InsertInsertColumn>(), Accelerator( GDK_KP_Add, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
+       GlobalCommands_insert( "PatchInsertInsertColumn", FreeCaller<Patch_InsertInsertColumn>(), Accelerator( GDK_KEY_KP_Add, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
        GlobalCommands_insert( "PatchInsertAddColumn", FreeCaller<Patch_InsertAddColumn>() );
-       GlobalCommands_insert( "PatchInsertInsertRow", FreeCaller<Patch_InsertInsertRow>(), Accelerator( GDK_KP_Add, (GdkModifierType)GDK_CONTROL_MASK ) );
+       GlobalCommands_insert( "PatchInsertInsertRow", FreeCaller<Patch_InsertInsertRow>(), Accelerator( GDK_KEY_KP_Add, (GdkModifierType)GDK_CONTROL_MASK ) );
        GlobalCommands_insert( "PatchInsertAddRow", FreeCaller<Patch_InsertAddRow>() );
        GlobalCommands_insert( "PatchDeleteFirstColumn", FreeCaller<Patch_DeleteFirstColumn>() );
-       GlobalCommands_insert( "PatchDeleteLastColumn", FreeCaller<Patch_DeleteLastColumn>(), Accelerator( GDK_KP_Subtract, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
-       GlobalCommands_insert( "PatchDeleteFirstRow", FreeCaller<Patch_DeleteFirstRow>(), Accelerator( GDK_KP_Subtract, (GdkModifierType)GDK_CONTROL_MASK ) );
+       GlobalCommands_insert( "PatchDeleteLastColumn", FreeCaller<Patch_DeleteLastColumn>(), Accelerator( GDK_KEY_KP_Subtract, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
+       GlobalCommands_insert( "PatchDeleteFirstRow", FreeCaller<Patch_DeleteFirstRow>(), Accelerator( GDK_KEY_KP_Subtract, (GdkModifierType)GDK_CONTROL_MASK ) );
        GlobalCommands_insert( "PatchDeleteLastRow", FreeCaller<Patch_DeleteLastRow>() );
        GlobalCommands_insert( "InvertCurve", FreeCaller<Patch_Invert>(), Accelerator( 'I', (GdkModifierType)GDK_CONTROL_MASK ) );
        GlobalCommands_insert( "RedisperseRows", FreeCaller<Patch_RedisperseRows>(), Accelerator( 'E', (GdkModifierType)GDK_CONTROL_MASK ) );
@@ -837,12 +838,7 @@ void Patch_constructMenu( GtkMenu* menu ){
 }
 
 
-#include <gtk/gtkbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include "gtkutil/dialog.h"
 #include "gtkutil/widget.h"
 

diff --git a/radiant/pluginmenu.cpp b/radiant/pluginmenu.cpp
index 2f34e5e50a58494669bfb52b6b04cf4890ad7c43..b79e81ca3b8b0608148d27c130ce7e5235857834 100644 (file)
--- a/radiant/pluginmenu.cpp
+++ b/radiant/pluginmenu.cpp
@@ -23,8 +23,7 @@
 
 #include "stream/textstream.h"
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 
 #include "gtkutil/pointer.h"
 #include "gtkutil/menu.h"

diff --git a/radiant/plugintoolbar.cpp b/radiant/plugintoolbar.cpp
index 9c762f46be3be90a22c09c4fabab7437f41d39a1..17dd4ce7f4f68f370690fd575a4425a2bb9a11ea 100644 (file)
--- a/radiant/plugintoolbar.cpp
+++ b/radiant/plugintoolbar.cpp
@@ -25,7 +25,7 @@
 #include "itoolbar.h"
 #include "modulesystem.h"
 
-#include <gtk/gtktoolbar.h>
+#include <gtk/gtk.h>
 
 #include "stream/stringstream.h"
 #include "gtkutil/image.h"

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 86454c66e01f65c2bf8ec7555bbbd5ba4521fd52..00723ab75a268d5ee18e54d1774da1ef1d642ded 100644 (file)
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -30,20 +30,7 @@
 
 #include "debugging/debugging.h"
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 
 #include "generic/callback.h"
 #include "math/vector.h"

diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp
index ee54ab8dbff03e9935c0d2604955bcda4f8ca715..d97a65efb6d5419049806328dd823303fca0a5c3 100644 (file)
--- a/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@ -41,7 +41,7 @@
 
 #include <map>
 
-#include <gtk/gtktearoffmenuitem.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "stream/textfilestream.h"

diff --git a/radiant/select.cpp b/radiant/select.cpp
index fa04701ebffd76cc02f5f66f43ac7de348770668..0586d417029bd62e6d149cee7b4afd0639a3736f 100644 (file)
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -830,10 +830,7 @@ void Selection_destroy(){
 
 
 #include "gtkdlgs.h"
-#include <gtk/gtkbox.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 

diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp
index dc59b3324f6486ea9ad69ced04e30f74f4db11b6..245eb06d3fbcf4e407a03e648934eb0378b678ff 100644 (file)
--- a/radiant/surfacedialog.cpp
+++ b/radiant/surfacedialog.cpp
@@ -35,15 +35,8 @@
 #include "iundo.h"
 #include "iselection.h"
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkcheckbutton.h> //Shamus: For Textool
 
 #include "signal/isignal.h"
 #include "generic/object.h"

diff --git a/radiant/textureentry.h b/radiant/textureentry.h
index 3406d2a00e3d40c08bb277b1bfcc0bccca31afa9..451513735351206cf515c71529680a2a229ad4b4 100644 (file)
--- a/radiant/textureentry.h
+++ b/radiant/textureentry.h
@@ -23,8 +23,7 @@
 #define INCLUDED_TEXTUREENTRY_H
 
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include "gtkutil/idledraw.h"
 
 #include "generic/static.h"

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 2b53597b9b86685834bd32274e7d678422592da9..f9f2b8708c3b19777d90bd283727b6b686ac2873 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -41,11 +41,6 @@
 #include <vector>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkrange.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkvscrollbar.h>
 #include <uilib/uilib.h>
 
 #include "signal/signal.h"

diff --git a/radiant/treemodel.cpp b/radiant/treemodel.cpp
index 7c6cae68c984ddf90486014ec7948bde9d87e83a..18cf5f8307de8e88c9e6eaede7310e09d55c4997 100644 (file)
--- a/radiant/treemodel.cpp
+++ b/radiant/treemodel.cpp
@@ -24,9 +24,7 @@
 #include "debugging/debugging.h"
 
 #include <map>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreednd.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "iscenegraph.h"

diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp
index 7ca793133e3a4f03e923a66dacd5826db4c45d4a..bd7e11ca41f9807c09b997dc9325e590d165493b 100644 (file)
--- a/radiant/watchbsp.cpp
+++ b/radiant/watchbsp.cpp
@@ -36,7 +36,7 @@
 #include "watchbsp.h"
 
 #include <algorithm>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include "cmdlib.h"
 #include "convert.h"

diff --git a/radiant/windowobservers.cpp b/radiant/windowobservers.cpp
index 24857c4d2058dacdea65f54ae4814d8b67f7e6c2..d30d0e3c0da30b989473e5761e9045e31f8c6981 100644 (file)
--- a/radiant/windowobservers.cpp
+++ b/radiant/windowobservers.cpp
@@ -22,7 +22,7 @@
 #include "windowobservers.h"
 
 #include <vector>
-#include <gdk/gdkevents.h>
+#include <gdk/gdk.h>
 #include "generic/bitfield.h"
 
 namespace

diff --git a/radiant/windowobservers.h b/radiant/windowobservers.h
index fbe620c80716e5475d0989eb973d777774d74938..9785d9dc9df3d552ed6a2b41e93c74bf27e612ec 100644 (file)
--- a/radiant/windowobservers.h
+++ b/radiant/windowobservers.h
@@ -24,7 +24,7 @@
 
 #include "windowobserver.h"
 
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #include <uilib/uilib.h>
 
 #include "math/vector.h"

diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp
index fafb1dad417304a3e0386d4a25a0443707c1b838..a4e91441b8f1cb43268bd64a4f0750d1bb0f52df 100644 (file)
--- a/radiant/xywindow.cpp
+++ b/radiant/xywindow.cpp
@@ -39,9 +39,9 @@
 #include "image.h"
 #include "gtkutil/messagebox.h"
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "generic/callback.h"
 #include "string/string.h"
@@ -2746,14 +2746,14 @@ void XYWindow_Construct(){
        GlobalToggles_insert( "ToggleView", ToggleShown::ToggleCaller( g_xy_top_shown ), ToggleItem::AddCallbackCaller( g_xy_top_shown.m_item ), Accelerator( 'V', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
        GlobalToggles_insert( "ToggleSideView", ToggleShown::ToggleCaller( g_yz_side_shown ), ToggleItem::AddCallbackCaller( g_yz_side_shown.m_item ) );
        GlobalToggles_insert( "ToggleFrontView", ToggleShown::ToggleCaller( g_xz_front_shown ), ToggleItem::AddCallbackCaller( g_xz_front_shown.m_item ) );
-       GlobalCommands_insert( "NextView", FreeCaller<XY_Next>(), Accelerator( GDK_Tab, (GdkModifierType)GDK_CONTROL_MASK ) );
-       GlobalCommands_insert( "ZoomIn", FreeCaller<XY_ZoomIn>(), Accelerator( GDK_Delete ) );
-       GlobalCommands_insert( "ZoomOut", FreeCaller<XY_ZoomOut>(), Accelerator( GDK_Insert ) );
-       GlobalCommands_insert( "ViewTop", FreeCaller<XY_Top>(), Accelerator( GDK_KP_Home ) );
-       GlobalCommands_insert( "ViewSide", FreeCaller<XY_Side>(), Accelerator( GDK_KP_Page_Down ) );
-       GlobalCommands_insert( "ViewFront", FreeCaller<XY_Front>(), Accelerator( GDK_KP_End ) );
+       GlobalCommands_insert( "NextView", FreeCaller<XY_Next>(), Accelerator( GDK_KEY_Tab, (GdkModifierType)GDK_CONTROL_MASK ) );
+       GlobalCommands_insert( "ZoomIn", FreeCaller<XY_ZoomIn>(), Accelerator( GDK_KEY_Delete ) );
+       GlobalCommands_insert( "ZoomOut", FreeCaller<XY_ZoomOut>(), Accelerator( GDK_KEY_Insert ) );
+       GlobalCommands_insert( "ViewTop", FreeCaller<XY_Top>(), Accelerator( GDK_KEY_KP_Home ) );
+       GlobalCommands_insert( "ViewSide", FreeCaller<XY_Side>(), Accelerator( GDK_KEY_KP_Page_Down ) );
+       GlobalCommands_insert( "ViewFront", FreeCaller<XY_Front>(), Accelerator( GDK_KEY_KP_End ) );
        GlobalCommands_insert( "Zoom100", FreeCaller<XY_Zoom100>() );
-       GlobalCommands_insert( "CenterXYView", FreeCaller<XY_Focus>(), Accelerator( GDK_Tab, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
+       GlobalCommands_insert( "CenterXYView", FreeCaller<XY_Focus>(), Accelerator( GDK_KEY_Tab, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
 
        GlobalPreferenceSystem().registerPreference( "ClipCaulk", BoolImportStringCaller( g_clip_useCaulk ), BoolExportStringCaller( g_clip_useCaulk ) );