Do not #include an header where a forward declaration suffixes. Do not

include wx/wx.h directly.

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index be21d3dcfa6a0188573f357ae5645471d793ccba..792ef32ad04131e7952eec43fc5e57d631c29292 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -16,9 +16,11 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/gdicmn.h"
-#include "wx/bitmap.h"
-#include "wx/dc.h"
+#include "wx/list.h"
+
+class WXDLLEXPORT wxDC;
+class WXDLLEXPORT wxBitmap;
+class WXDLLEXPORT wxColour;

 
 /*
  * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to
 
 /*
  * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to

diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index 3743ac84845de227a6552c4bd1efb78f3ed150b2..ccb9227047cc9ed3ac47c1c18247c67b101ddd34 100644 (file)
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -18,10 +18,8 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

-#include "wx/dynarray.h"

 #include "wx/event.h"
 #include "wx/control.h"
 #include "wx/event.h"
 #include "wx/control.h"

-#include "wx/generic/tabg.h"

 
 // ----------------------------------------------------------------------------
 // types
 
 // ----------------------------------------------------------------------------
 // types


@@ -30,30 +28,12 @@
 // fwd declarations
 class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;
 // fwd declarations
 class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;

+class WXDLLEXPORT wxTabView;

 
 // ----------------------------------------------------------------------------
 // wxNotebook
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxNotebook
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxNotebook;
-
-// This reuses wxTabView to draw the tabs.
-class WXDLLEXPORT wxNotebookTabView: public wxTabView
-{
-DECLARE_DYNAMIC_CLASS(wxNotebookTabView)
-public:
-  wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
-  ~wxNotebookTabView(void);
-
-  // Called when a tab is activated
-  virtual void OnTabActivate(int activateId, int deactivateId);
-  // Allows vetoing
-  virtual bool OnTabPreActivate(int activateId, int deactivateId);
-
-protected:
-   wxNotebook*      m_notebook;
-};
-

 class wxNotebook : public wxNotebookBase
 {
 public:
 class wxNotebook : public wxNotebookBase
 {
 public:

diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h
index b1fa37bd965031505c06f51dd5e3d0a0d64eebbe..d385c6ac694809053f055a4e92cc3710e2e30fd9 100644 (file)
--- a/include/wx/motif/bmpbuttn.h
+++ b/include/wx/motif/bmpbuttn.h
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/button.h"
 #endif
 
 #include "wx/button.h"

+#include "wx/bitmap.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index dc69dceae7089c98174c515325cfc62cd2990a4d..08fe446a8a37b526d01f308df765831ba809536c 100644 (file)
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -17,7 +17,6 @@
 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"

-#include "wx/gdicmn.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index 8ec642b7c9a0a7f36a6245ef0ffeeac625dbc4d1..93b7a10f7e42b6fb8699ef6b8cfca192d29d181d 100644 (file)
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -17,11 +17,7 @@
 #endif
 
 #include "wx/bitmap.h"
 #endif
 
 #include "wx/bitmap.h"

-#if wxUSE_IMAGE
-#include "wx/image.h"
-#endif
-
-
+#include "wx/list.h"

 
 /* Cursor for one display, so we can choose the correct one for
 * the current display.
 
 /* Cursor for one display, so we can choose the correct one for
 * the current display.

diff --git a/include/wx/propform.h b/include/wx/propform.h
index 723fc50333783c64387e77651337feddf83a9e3f..255b85204be299a92b52d0f78e0ec590b409a7d0 100644 (file)
--- a/include/wx/propform.h
+++ b/include/wx/propform.h
@@ -19,6 +19,9 @@
 #if wxUSE_PROPSHEET
 
 #include "wx/prop.h"
 #if wxUSE_PROPSHEET
 
 #include "wx/prop.h"

+#include "wx/panel.h"
+
+class WXDLLEXPORT wxPropertyFormView;

 
 ////
 //// Property form classes: for using an existing dialog or panel
 
 ////
 //// Property form classes: for using an existing dialog or panel

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 561c013ec39f3d2b6c01bd5f93208b8226e7df6e..e92f2c3b2c1d9b06c726f1df4a9f9abf8f9c00aa 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -21,7 +21,6 @@
 
 #if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXMOTIF__)
 
 
 #if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXMOTIF__)
 

-#include "wx/wx.h"

 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/palette.h"
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/palette.h"

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 308c87d287cb75d850c748534b70eff3566f9339..aa0e88d75652ccdfeedbb4676c0431264f99bc79 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -21,6 +21,7 @@
 #include "wx/generic/imaglist.h"
 #include "wx/icon.h"
 #include "wx/image.h"
 #include "wx/generic/imaglist.h"
 #include "wx/icon.h"
 #include "wx/image.h"

+#include "wx/dc.h"

 
 //-----------------------------------------------------------------------------
 //  wxImageList
 
 //-----------------------------------------------------------------------------
 //  wxImageList

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 118b9dd1f7760f57c94661bfcf2abdf739355c1d..0f6f0036aa4d5338dbb20fa3f2a35a3542ef4917 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -33,6 +33,7 @@
 #include  "wx/generic/imaglist.h"
 #include  "wx/notebook.h"
 #include  "wx/dcclient.h"
 #include  "wx/generic/imaglist.h"
 #include  "wx/notebook.h"
 #include  "wx/dcclient.h"

+#include  "wx/generic/tabg.h"

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -65,6 +66,27 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+// ============================================================================
+// Private class
+// ============================================================================
+
+// This reuses wxTabView to draw the tabs.
+class WXDLLEXPORT wxNotebookTabView: public wxTabView
+{
+DECLARE_DYNAMIC_CLASS(wxNotebookTabView)
+public:
+  wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
+  ~wxNotebookTabView(void);
+
+  // Called when a tab is activated
+  virtual void OnTabActivate(int activateId, int deactivateId);
+  // Allows vetoing
+  virtual bool OnTabPreActivate(int activateId, int deactivateId);
+
+protected:
+   wxNotebook*      m_notebook;
+};
+

 // ----------------------------------------------------------------------------
 // wxNotebook construction
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxNotebook construction
 // ----------------------------------------------------------------------------

diff --git a/src/generic/propform.cpp b/src/generic/propform.cpp
index 21dc41e4aea2c506c1113fdcd75fc4dff72bcc39..5fc2aa91e02ec6737a6d8da99b7fa809bc015a51 100644 (file)
--- a/src/generic/propform.cpp
+++ b/src/generic/propform.cpp
@@ -23,9 +23,12 @@
 #if wxUSE_PROPSHEET
 
 #ifndef WX_PRECOMP
 #if wxUSE_PROPSHEET
 
 #ifndef WX_PRECOMP

+    #include "wx/choice.h"
+    #include "wx/checkbox.h"
+    #include "wx/slider.h"
+    #include "wx/msgdlg.h"

 #endif
 
 #endif
 

-#include "wx/wx.h"

 #include "wx/propform.h"
 
 #include <ctype.h>
 #include "wx/propform.h"
 
 #include <ctype.h>

diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index 07f83c62dc8154b686a7061efd6114cfc37601c7..bb3fc77c3d7b86f88444d98e7cab80ddc0437b4d 100644 (file)
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -23,7 +23,8 @@
 #if wxUSE_TAB_DIALOG
 
 #ifndef WX_PRECOMP
 #if wxUSE_TAB_DIALOG
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+    #include "wx/settings.h"
+    #include "wx/intl.h"

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 4ee31d8bbc6adb2f832cf2ccea72c3d75131287e..ef6cb3a19289acef4bacfcafc13b1343db5f8564 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -18,6 +18,7 @@
 #define XtWindow XTWINDOW
 #endif
 
 #define XtWindow XTWINDOW
 #endif
 

+#include "wx/tab.h"

 #include "wx/mdi.h"
 #include "wx/menu.h"
 #include "wx/settings.h"
 #include "wx/mdi.h"
 #include "wx/menu.h"
 #include "wx/settings.h"

diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index a96885dd6cdd90f538c8c23bb0a62bd33ea8c1dc..c02fbac2444f56f43b1f19d40b33569fb3e6dd22 100644 (file)
--- a/src/motif/toolbar.cpp
+++ b/src/motif/toolbar.cpp
@@ -25,7 +25,7 @@
 #define XtDisplay XTDISPLAY
 #endif
 
 #define XtDisplay XTDISPLAY
 #endif
 

-#include "wx/wx.h"
+#include "wx/settings.h"

 #include "wx/app.h"
 #include "wx/timer.h"
 #include "wx/toolbar.h"
 #include "wx/app.h"
 #include "wx/timer.h"
 #include "wx/toolbar.h"