Remove <gtk/gtk.h> from radiant/dialog.h

diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index d77b519b3575ba83fa299527d6a09db3eaa896b1..cf5bc385e93bc31d417419c0bee53b1f384e9c36 100644 (file)
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -25,9 +25,11 @@
 // Leonardo Zide (leo@lokigames.com)
 //
 
-#include <gdk/gdkkeysyms.h>
 #include "camwindow.h"
 
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
 #include "debugging/debugging.h"
 
 #include "iscenegraph.h"

diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp
index c576ba4659c19dd335adc58e17a27d2a882b6a4e..84b2ee2ae50a4c2380a5d8e081b063e15db43111 100644 (file)
--- a/radiant/dialog.cpp
+++ b/radiant/dialog.cpp
@@ -28,6 +28,8 @@
 
 #include "dialog.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 
 

diff --git a/radiant/dialog.h b/radiant/dialog.h
index c2bd20a881123897c93b48233561da956d39b977..f4ce16673e7f7f8ffbe4fac55acfa87567587e54 100644 (file)
--- a/radiant/dialog.h
+++ b/radiant/dialog.h
@@ -24,7 +24,6 @@
 
 #include <list>
 #include <uilib/uilib.h>
-#include <gtk/gtk.h>
 
 #include "gtkutil/dialog.h"
 #include "generic/callback.h"
@@ -162,27 +161,27 @@ ui::SpinButton addSpinner( ui::Widget vbox, const char* name, double value, doub
 
 protected:
 
-void AddBoolToggleData( GtkToggleButton& object, const BoolImportCallback& importCallback, const BoolExportCallback& exportCallback );
-void AddIntRadioData( GtkRadioButton& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback );
-void AddTextEntryData( GtkEntry& object, const StringImportCallback& importCallback, const StringExportCallback& exportCallback );
-void AddIntEntryData( GtkEntry& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback );
-void AddSizeEntryData( GtkEntry& object, const SizeImportCallback& importCallback, const SizeExportCallback& exportCallback );
-void AddFloatEntryData( GtkEntry& object, const FloatImportCallback& importCallback, const FloatExportCallback& exportCallback );
-void AddFloatSpinnerData( GtkSpinButton& object, const FloatImportCallback& importCallback, const FloatExportCallback& exportCallback );
-void AddIntSpinnerData( GtkSpinButton& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback );
-void AddIntAdjustmentData( GtkAdjustment& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback );
-void AddIntComboData( GtkComboBox& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback );
-
-void AddDialogData( GtkToggleButton& object, bool& data );
-void AddDialogData( GtkRadioButton& object, int& data );
-void AddDialogData( GtkEntry& object, CopiedString& data );
-void AddDialogData( GtkEntry& object, int& data );
-void AddDialogData( GtkEntry& object, std::size_t& data );
-void AddDialogData( GtkEntry& object, float& data );
-void AddDialogData( GtkSpinButton& object, float& data );
-void AddDialogData( GtkSpinButton& object, int& data );
-void AddDialogData( GtkAdjustment& object, int& data );
-void AddDialogData( GtkComboBox& object, int& data );
+void AddBoolToggleData( struct _GtkToggleButton& object, const BoolImportCallback& importCallback, const BoolExportCallback& exportCallback );
+void AddIntRadioData( struct _GtkRadioButton& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback );
+void AddTextEntryData( struct _GtkEntry& object, const StringImportCallback& importCallback, const StringExportCallback& exportCallback );
+void AddIntEntryData( struct _GtkEntry& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback );
+void AddSizeEntryData( struct _GtkEntry& object, const SizeImportCallback& importCallback, const SizeExportCallback& exportCallback );
+void AddFloatEntryData( struct _GtkEntry& object, const FloatImportCallback& importCallback, const FloatExportCallback& exportCallback );
+void AddFloatSpinnerData( struct _GtkSpinButton& object, const FloatImportCallback& importCallback, const FloatExportCallback& exportCallback );
+void AddIntSpinnerData( struct _GtkSpinButton& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback );
+void AddIntAdjustmentData( struct _GtkAdjustment& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback );
+void AddIntComboData( struct _GtkComboBox& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback );
+
+void AddDialogData( struct _GtkToggleButton& object, bool& data );
+void AddDialogData( struct _GtkRadioButton& object, int& data );
+void AddDialogData( struct _GtkEntry& object, CopiedString& data );
+void AddDialogData( struct _GtkEntry& object, int& data );
+void AddDialogData( struct _GtkEntry& object, std::size_t& data );
+void AddDialogData( struct _GtkEntry& object, float& data );
+void AddDialogData( struct _GtkSpinButton& object, float& data );
+void AddDialogData( struct _GtkSpinButton& object, int& data );
+void AddDialogData( struct _GtkAdjustment& object, int& data );
+void AddDialogData( struct _GtkComboBox& object, int& data );
 };
 
 #endif

diff --git a/radiant/feedback.cpp b/radiant/feedback.cpp
index 00512547b8b059f3b9339c8e131d5bfa9bbd11b5..4ef14154c2baaf1d5a0750e144e05c3f94c665d5 100644 (file)
--- a/radiant/feedback.cpp
+++ b/radiant/feedback.cpp
@@ -27,6 +27,8 @@
 
 #include "feedback.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 
 #include "igl.h"

diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp
index e4319c1e0d01cde0c25f1c81fa09783af2f0078b..04983314e13bd7824bc3dc5513d7ad27e595ea52 100644 (file)
--- a/radiant/findtexturedialog.cpp
+++ b/radiant/findtexturedialog.cpp
@@ -27,6 +27,8 @@
 
 #include "findtexturedialog.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 
 #include "ishaders.h"

diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index 3ad56a8b88775621b33a6bdf30b6ffdab745c05c..2ba4ea3de453a8b05278b6274dfa2f2b3bd19dcf 100644 (file)
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -36,6 +36,8 @@
 
 #include "gtkdlgs.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 #include "version.h"
 #include "aboutmsg.h"

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index eb3fdff44f5ab33e6092cab370e725c91031339c..4af997f9c024638476e1301dd2b733e3164ce323 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -27,6 +27,8 @@
 
 #include "mainframe.h"
 
+#include <gtk/gtk.h>
+
 #include "ifilesystem.h"
 #include "iundo.h"
 #include "editable.h"

diff --git a/radiant/map.cpp b/radiant/map.cpp
index 518886f690e9bf7f6cdb05dfb5cc6df95d29fa16..7b362552219b7a30e13d9c5af7f37b8e7936705b 100644 (file)
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -21,6 +21,8 @@
 
 #include "map.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 
 #include "imap.h"

diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp
index 2121b9286ff8c88e8daa5ef4dbcb832a8d01d857..c13280c4e58a16e313e704bd71dd4b246cb20162 100644 (file)
--- a/radiant/patchdialog.cpp
+++ b/radiant/patchdialog.cpp
@@ -27,6 +27,8 @@
 
 #include "patchdialog.h"
 
+#include <gtk/gtk.h>
+
 #include "itexdef.h"
 
 #include "debugging/debugging.h"

diff --git a/radiant/patchmanip.cpp b/radiant/patchmanip.cpp
index 16d5d5e2e2c7b30e2fbeed8c67fe5882a7d3efd5..8b9123b1c3feec1ccbe93a6c59dbfad3ed279a16 100644 (file)
--- a/radiant/patchmanip.cpp
+++ b/radiant/patchmanip.cpp
@@ -19,9 +19,11 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <gdk/gdkkeysyms.h>
 #include "patchmanip.h"
 
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
 #include "debugging/debugging.h"
 
 

diff --git a/radiant/pluginmenu.cpp b/radiant/pluginmenu.cpp
index e3b278c5fede6e64c406616333b0e5289d4871fc..4227bba1085073df0fb7d8df3e5904b92fbdd10a 100644 (file)
--- a/radiant/pluginmenu.cpp
+++ b/radiant/pluginmenu.cpp
@@ -21,6 +21,8 @@
 
 #include "pluginmenu.h"
 
+#include <gtk/gtk.h>
+
 #include "stream/textstream.h"
 
 #include "gtkutil/pointer.h"

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 46ed23ffb1f4b004850ef41735e713f5cf3d91ee..82100d613e086f9f492170f57108d0e8bfefb81c 100644 (file)
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -26,6 +26,8 @@
 //
 
 #include "preferences.h"
+
+#include <gtk/gtk.h>
 #include "environment.h"
 
 #include "debugging/debugging.h"

diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp
index 193a0a49c2e8edf740e6d551554f459c669b7379..7d685bae3465b5152f82114afa28adcdc9c93ac7 100644 (file)
--- a/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@ -34,6 +34,8 @@
 
 #include "qe3.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 
 #include "ifilesystem.h"

diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp
index f4e621cbc7652c3b118353d2984a985e7a793234..ab0fc4fc75ea6b3d803536686ad4343b9c5daaeb 100644 (file)
--- a/radiant/surfacedialog.cpp
+++ b/radiant/surfacedialog.cpp
@@ -27,6 +27,8 @@
 
 #include "surfacedialog.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 #include "warnings.h"
 

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 08f55508950fbca912b540c94c03ac89d5269324..3ab5900c2a577da06a522ce727a3bd3ccd530f08 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -27,6 +27,8 @@
 
 #include "texwindow.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 #include "warnings.h"
 

diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp
index 0d457d2c4d7132302d31e5e3c953348d989269b8..d375ef8ef70e4e204b9df0270ef7266c6aa26cd3 100644 (file)
--- a/radiant/xywindow.cpp
+++ b/radiant/xywindow.cpp
@@ -27,6 +27,8 @@
 
 #include "xywindow.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 
 #include "ientity.h"