Remove unnecessary header dependencies. Fix resulting compilation

problems for wxMSW, wxGTK, wxMotif, wxX11 and wxMac in default
configuration. Non-default configurations will probably need some more
fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 35bde85fc1db93c886903e9974b9d5cbf8633371..105693a20204adccbf133e4cabd08c5f20738884 100644 (file)
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -17,8 +17,6 @@
     #pragma interface "fontenum.h"
 #endif
 
-#include "wx/font.h"
-
 // ----------------------------------------------------------------------------
 // wxFontEnumerator enumerates all available fonts on the system or only the
 // fonts with given attributes

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 3cd8a18402c172002f2aaf31131663073e7320df..7b6cd783cd36f5dc8e06c642f172d3124d28e4d0 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -20,13 +20,10 @@
     #pragma interface "gdicmn.h"
 #endif
 
-#include "wx/object.h"
+#include "wx/setup.h"
 #include "wx/list.h"
-#include "wx/hash.h"
 #include "wx/string.h"
-#include "wx/setup.h"
-#include "wx/colour.h"
-#include "wx/font.h"
+#include "wx/fontenc.h"
 
 // ---------------------------------------------------------------------------
 // forward declarations

diff --git a/include/wx/image.h b/include/wx/image.h
index 257fd9773bcdb45ad3713dcf86d2235794bc2b32..a165ad27949b1d21ad65820d365a5f04c8a9fd61 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -18,7 +18,9 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
-#include "wx/bitmap.h"
+#if WXWIN_COMPATIBILITY_2_2
+#  include "wx/bitmap.h"
+#endif
 #include "wx/hashmap.h"
 
 #if wxUSE_STREAMS
@@ -35,6 +37,7 @@
 
 class WXDLLEXPORT wxImageHandler;
 class WXDLLEXPORT wxImage;
+class WXDLLEXPORT wxPalette;
 
 //-----------------------------------------------------------------------------
 // wxImageHandler

diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h
index 8158bf673138cc8c0ac74b8aa035d2e34c5a27ce..fc9809c153019507fff3b62128525ddd798560d8 100644 (file)
--- a/include/wx/mac/listbox.h
+++ b/include/wx/mac/listbox.h
@@ -20,6 +20,8 @@
 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------
+#include  "wx/dynarray.h"
+
 
 #if wxUSE_OWNER_DRAWN
   class WXDLLEXPORT wxOwnerDrawn;

diff --git a/include/wx/motif/brush.h b/include/wx/motif/brush.h
index 513d7fc9c3b198446f7437ebaf8e6369a6201f92..a0a5e51b7c9556a8c166a4e12ef85a607e6c7473 100644 (file)
--- a/include/wx/motif/brush.h
+++ b/include/wx/motif/brush.h
@@ -19,6 +19,7 @@
 #include "wx/gdicmn.h"
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
+#include "wx/colour.h"
 
 class WXDLLEXPORT wxBrush;
 

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 61ce98dfe90382df9b98d5fae6d2884c8638241a..2a96b98338c985e010ed857b8e3f309e165311bd 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -18,6 +18,7 @@
 
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
+#include "wx/colour.h"
 
 typedef WXDWORD wxMSWDash;
 

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 390a7007b973206fd9497eda4659ecb9919cd9d9..a1308f5b479de9772c16cf9b5b70e615a5ceec9f 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -213,6 +213,7 @@ extern LONG APIENTRY _EXPORT
 #if wxUSE_GUI
 
 #include <wx/gdicmn.h>
+#include <wx/colour.h>
 
 // make conversion from wxColour and COLORREF a bit less painful
 inline COLORREF wxColourToRGB(const wxColour& c)

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 0ae464c94ea8bc1ca4cc06b0b28cf8f58fb3e8d3..4e53a2509a1ee3489803552abaa1b6aa75449c9b 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -21,6 +21,7 @@
 #if wxUSE_STATUSBAR
 
 #include "wx/list.h"
+#include "wx/dynarray.h"
 
 WX_DECLARE_LIST(wxString, wxListString);
 

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index 4f1af7fb6597fcd9c1df8ef2d42a8f75cae256fe..9f46b920cbd81741b0b06aac626ca788431c40df 100644 (file)
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -24,6 +24,7 @@
 
 #include "wx/window.h"  // for wxClientData
 #include "wx/event.h"
+#include "wx/dynarray.h"
 
 // ----------------------------------------------------------------------------
 // wxTreeItemId identifies an element of the tree. In this implementation, it's

diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index 363f523ac8947f42ac50c9e37b5018e31f516fed..01ad0a276c177c6211674338a9f6bdf96de85cdd 100644 (file)
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/scrolwin.h"    // for wxScrollHelper
+#include "wx/dynarray.h"
 
 // ----------------------------------------------------------------------------
 // the actions supported by this control

diff --git a/include/wx/window.h b/include/wx/window.h
index 1b12bc2884b787dd0d898fb5b22d09b513a83ae0..590aaec3816b0748e9c8080f3c8efb4b13ec75c6 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -33,7 +33,6 @@
 #include "wx/validate.h"        // for wxDefaultValidator (always include it)
 
 #if wxUSE_PALETTE
-    #include "wx/dcclient.h"
     #include "wx/palette.h"
 #endif // wxUSE_PALETTE
 

diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index 784d7bdfab11dfbd6eeff229564443e21a5f6af5..229050812f200b935d9cee6a648858e3edb8386f 100644 (file)
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -21,6 +21,7 @@
 
 #ifndef WX_PRECOMP
 #  include "wx/defs.h"
+#  include "wx/palette.h"
 #endif
 
 #if wxUSE_STREAMS && wxUSE_GIF

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 54a0b03dc756587951b65e9b37a3d1ac2f94ab96..cd9bf9886ab75b704036dbaf4d6a8c5216c41e41 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -24,6 +24,7 @@
     #include "wx/icon.h"
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/bitmap.h"
 #endif
 
 #ifndef _WX_IMAGE_H_

diff --git a/src/common/image.cpp b/src/common/image.cpp
index e43c7da643d454df744ab5d66613ef3123e6528d..9d3502abf2d20409453d7433b1048c4e421706db 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -31,6 +31,7 @@
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/module.h"
+#include "wx/hash.h"
 
 // For memcpy
 #include <string.h>

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 975252e0e1446ec3a12d563ee1c7fc24cc6c5ffd..f4d6852e66a0204715859e07dba3ba7678445cf2 100644 (file)
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -21,6 +21,7 @@
 
 #ifndef WX_PRECOMP
 #  include "wx/defs.h"
+#  include "wx/palette.h"
 #endif
 
 #if wxUSE_IMAGE && wxUSE_PCX

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 55ab6ade5e23ce4966754747a349eb4380031928..429aa9e5ffff89b6f4c3a502d985fc018250faa9 100644 (file)
--- a/src/common/lboxcmn.cpp
+++ b/src/common/lboxcmn.cpp
@@ -32,6 +32,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/listbox.h"
+    #include "wx/dynarray.h"
 #endif
 
 // ============================================================================

diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp
index 1d1e1500fb7c06e7635ca3def11144298c96b6d1..d3d894f41a5cc16b03c367ce663d836892e65b8b 100644 (file)
--- a/src/common/quantize.cpp
+++ b/src/common/quantize.cpp
@@ -42,6 +42,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/palette.h"
 #endif
 
 #include "wx/image.h"

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 2962b83ab413bee83fb9ab72a23fcb250775c506..d54ce77bdfb25226d542d23cf3bdee019c93ee37 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -44,6 +44,7 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/statusbr.h"
+    #include "wx/dcclient.h"
 #endif //WX_PRECOMP
 
 #if wxUSE_CONSTRAINTS

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 10a1c4f423bbb5044cd3bd338a6782f9d766f66b..a1b704fcd5183cc410220ab7eda61472a5f96977 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -55,6 +55,7 @@
 #include "wx/imaglist.h"
 #include "wx/dir.h"
 #include "wx/artprov.h"
+#include "wx/hash.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"

diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index bb3fc77c3d7b86f88444d98e7cab80ddc0437b4d..d1b044d937946fc250e28bbc41521094b6eb0a6b 100644 (file)
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -25,6 +25,7 @@
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/intl.h"
+    #include "wx/dcclient.h"
 #endif
 
 #include <stdio.h>

diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index f20993f3cb664031e7cc2147a8b07100790fcafa..dd6720c868b0e433a5ab53e558d5f1915eb5c26f 100644 (file)
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -12,6 +12,7 @@
 #endif
 
 #include "wx/brush.h"
+#include "wx/colour.h"
 
 #include <gdk/gdk.h>
 

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 4d3b511afab77065d2b0b0c0df1d7e01c669e3d2..c57698a100ec6cb66f9b848f5c97b229aa761c5b 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/gdicmn.h"
+#include "wx/colour.h"
 #include "wx/gtk/private.h"
 
 #include <gdk/gdk.h>

diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp
index 11f787bd324d12392c91d48f3c38e350227e877e..66470bcc89f3ed6f3ca0ede37e108b9065e95585 100644 (file)
--- a/src/gtk/pen.cpp
+++ b/src/gtk/pen.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/pen.h"
+#include "wx/colour.h"
 
 #include <gdk/gdk.h>
 

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index f20993f3cb664031e7cc2147a8b07100790fcafa..dd6720c868b0e433a5ab53e558d5f1915eb5c26f 100644 (file)
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -12,6 +12,7 @@
 #endif
 
 #include "wx/brush.h"
+#include "wx/colour.h"
 
 #include <gdk/gdk.h>
 

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index 4d3b511afab77065d2b0b0c0df1d7e01c669e3d2..c57698a100ec6cb66f9b848f5c97b229aa761c5b 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/gdicmn.h"
+#include "wx/colour.h"
 #include "wx/gtk/private.h"
 
 #include <gdk/gdk.h>

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index 11f787bd324d12392c91d48f3c38e350227e877e..66470bcc89f3ed6f3ca0ede37e108b9065e95585 100644 (file)
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/pen.h"
+#include "wx/colour.h"
 
 #include <gdk/gdk.h>
 

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 330ba91007c4832e081619f1eb5a84c50e43bd55..b40531cea5e5a8b231248c09e46ee29acca1b3c6 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -36,6 +36,7 @@
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/evtloop.h"
+#include "wx/hash.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 2b8dc03fff49feb9146ceb56a66a0b6dd5e8c92e..18dc34e554286a5fca291f671c6e7793032f14d7 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -36,6 +36,7 @@
 #include "wx/utils.h"
 #include "wx/log.h"
 #include "wx/app.h"
+#include "wx/icon.h"
 
 #ifdef __VMS__
     #pragma message disable nosimpint

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index ef6cb3a19289acef4bacfcafc13b1343db5f8564..95be276fbc57694a223fa8217731e05b67cd85ed 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -22,6 +22,7 @@
 #include "wx/mdi.h"
 #include "wx/menu.h"
 #include "wx/settings.h"
+#include "wx/icon.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 4ee8f71d5bbe4f496f16e6781f869b5a10a8ab53..88dff304623123608f3426bd8eebbcb8fe990ec0 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -46,6 +46,7 @@
 #include "wx/menuitem.h"
 #include "wx/log.h"
 #include "wx/evtloop.h"
+#include "wx/hash.h"
 
 #if  wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 4ccdedbe1e30c38160c24cf93f617b3f39568708..268a0931cb617fb9c8f1dfa191266f91b5632d60 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -35,6 +35,7 @@
     #include "wx/bitmap.h"
     #include "wx/icon.h"
     #include "wx/cursor.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/ptr_scpd.h"

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index fbbbdd1d50ad0b3750dbd6b32657073b42f0d462..5c2371a2bb91eb345b0bd94659de2d6e5be21485 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -27,6 +27,7 @@
 #include "wx/evtloop.h"
 #include "wx/timer.h"
 #include "wx/filename.h"
+#include "wx/hash.h"
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"

diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp
index 7f524c415569880eefc53f535019645b4f435618..85614366cbf96a29f801358b91bb3279ff1065e2 100644 (file)
--- a/src/x11/brush.cpp
+++ b/src/x11/brush.cpp
@@ -16,6 +16,7 @@
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/brush.h"
+#include "wx/colour.h"
 
 //-----------------------------------------------------------------------------
 // wxBrush

diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index c3b1b6411f646ef743dbc88f025cffe11a4c40a9..29847609ae07b54ae0ded4b8bcfb5e69d436c88c 100644 (file)
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -19,6 +19,7 @@
 #include "wx/panel.h"
 #include "wx/clipbrd.h"
 #include "wx/tokenzr.h"
+#include "wx/dcclient.h"
 
 #include "wx/univ/inphand.h"
 #include "wx/univ/renderer.h"

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 8ee15a5f5d7162d67cd3d5614638e3843bb27a77..cf10d5730f57893cab180d493dce9ff6012005a9 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -42,6 +42,7 @@
 #include "wx/log.h"
 #include "wx/fontutil.h"
 #include "wx/univ/renderer.h"
+#include "wx/hash.h"
 
 #if  wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"