added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support)

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

docs/tech/tn0016.txt

@@ -201,6 +201,7 @@ g) Update dlimpexp.h to define WXMAKINGDLL_FOO if WXMAKINGDLL is defined (add
             #define WXDLLIMPEXP_NET
             #define WXDLLIMPEXP_DATA_NET(type) type
         #endif
+   Don't forget to add WXDLLIMPEXP_FWD_FOO definitions too.
    Use WXDLLIMPEXP_FOO when declaring wxFoo classes and functions.
 
 h) Add this code to one of wxFoo's files (the more often used, the better):

include/wx/accel.h

@@ -18,9 +18,9 @@
 
 #include "wx/object.h"
 
-class WXDLLEXPORT wxAcceleratorTable;
+class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
-class WXDLLEXPORT wxMenuItem;
+class WXDLLIMPEXP_FWD_CORE wxMenuItem;
-class WXDLLEXPORT wxKeyEvent;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -137,7 +137,7 @@ private:
     wxMenuItem *m_item;
 
     // for compatibility with old code, use accessors now!
-    friend class WXDLLEXPORT wxMenu;
+    friend class WXDLLIMPEXP_FWD_CORE wxMenu;
 };
 
 // ----------------------------------------------------------------------------

include/wx/access.h

@@ -224,10 +224,10 @@ typedef enum
 // All functions return an indication of success, failure, or not implemented.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxAccessible;
+class WXDLLIMPEXP_FWD_CORE wxAccessible;
-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLEXPORT wxPoint;
+class WXDLLIMPEXP_FWD_CORE wxPoint;
-class WXDLLEXPORT wxRect;
+class WXDLLIMPEXP_FWD_CORE wxRect;
 class WXDLLEXPORT wxAccessibleBase : public wxObject
 {
     DECLARE_NO_COPY_CLASS(wxAccessibleBase)

include/wx/animate.h

@@ -21,7 +21,7 @@
 #include "wx/timer.h"
 #include "wx/bitmap.h"
 
-class WXDLLIMPEXP_ADV wxAnimation;
+class WXDLLIMPEXP_FWD_ADV wxAnimation;
 
 extern WXDLLIMPEXP_DATA_ADV(wxAnimation) wxNullAnimation;
 extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxAnimationCtrlNameStr[];

include/wx/animdecod.h

@@ -17,8 +17,8 @@
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
-class WXDLLIMPEXP_BASE wxInputStream;
+class WXDLLIMPEXP_FWD_BASE wxInputStream;
-class WXDLLIMPEXP_CORE wxImage;
+class WXDLLIMPEXP_FWD_CORE wxImage;
 
 /*
 

include/wx/app.h

@@ -22,15 +22,15 @@
 #include "wx/init.h"        // we must declare wxEntry()
 #include "wx/intl.h"        // for wxLayoutDirection
 
-class WXDLLIMPEXP_BASE wxAppConsole;
+class WXDLLIMPEXP_FWD_BASE wxAppConsole;
-class WXDLLIMPEXP_BASE wxAppTraits;
+class WXDLLIMPEXP_FWD_BASE wxAppTraits;
-class WXDLLIMPEXP_BASE wxCmdLineParser;
+class WXDLLIMPEXP_FWD_BASE wxCmdLineParser;
-class WXDLLIMPEXP_BASE wxEventLoopBase;
+class WXDLLIMPEXP_FWD_BASE wxEventLoopBase;
-class WXDLLIMPEXP_BASE wxLog;
+class WXDLLIMPEXP_FWD_BASE wxLog;
-class WXDLLIMPEXP_BASE wxMessageOutput;
+class WXDLLIMPEXP_FWD_BASE wxMessageOutput;
 
 #if wxUSE_GUI
-    struct WXDLLIMPEXP_CORE wxVideoMode;
+    struct WXDLLIMPEXP_FWD_CORE wxVideoMode;
 #endif
 
 // ----------------------------------------------------------------------------

include/wx/apptrait.h

@@ -15,20 +15,20 @@
 #include "wx/string.h"
 #include "wx/platinfo.h"
 
-class WXDLLIMPEXP_BASE wxArrayString;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
-class WXDLLIMPEXP_BASE wxConfigBase;
+class WXDLLIMPEXP_FWD_BASE wxConfigBase;
-class WXDLLIMPEXP_BASE wxEventLoopBase;
+class WXDLLIMPEXP_FWD_BASE wxEventLoopBase;
 #if wxUSE_FONTMAP
-    class WXDLLEXPORT wxFontMapper;
+    class WXDLLIMPEXP_FWD_CORE wxFontMapper;
 #endif // wxUSE_FONTMAP
-class WXDLLIMPEXP_BASE wxLog;
+class WXDLLIMPEXP_FWD_BASE wxLog;
-class WXDLLIMPEXP_BASE wxMessageOutput;
+class WXDLLIMPEXP_FWD_BASE wxMessageOutput;
-class WXDLLIMPEXP_BASE wxObject;
+class WXDLLIMPEXP_FWD_BASE wxObject;
-class WXDLLEXPORT wxRendererNative;
+class WXDLLIMPEXP_FWD_CORE wxRendererNative;
-class WXDLLIMPEXP_BASE wxStandardPathsBase;
+class WXDLLIMPEXP_FWD_BASE wxStandardPathsBase;
-class WXDLLIMPEXP_BASE wxString;
+class WXDLLIMPEXP_FWD_BASE wxString;
-class WXDLLIMPEXP_BASE wxTimer;
+class WXDLLIMPEXP_FWD_BASE wxTimer;
-class WXDLLIMPEXP_BASE wxTimerImpl;
+class WXDLLIMPEXP_FWD_BASE wxTimerImpl;
 
 class GSocketGUIFunctionsTable;
 

include/wx/artprov.h

@@ -17,8 +17,8 @@
 #include "wx/icon.h"
 #include "wx/iconbndl.h"
 
-class WXDLLEXPORT wxArtProvidersList;
+class WXDLLIMPEXP_FWD_CORE wxArtProvidersList;
-class WXDLLEXPORT wxArtProviderCache;
+class WXDLLIMPEXP_FWD_CORE wxArtProviderCache;
 class wxArtProviderModule;
 
 // ----------------------------------------------------------------------------

include/wx/aui/framemanager.h

@@ -417,7 +417,7 @@ public:
 
 
 
-class WXDLLIMPEXP_AUI wxAuiFloatingFrame;
+class WXDLLIMPEXP_FWD_AUI wxAuiFloatingFrame;
 
 class WXDLLIMPEXP_AUI wxAuiManager : public wxEvtHandler
 {

include/wx/aui/tabmdi.h

@@ -28,9 +28,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_AUI wxAuiMDIParentFrame;
+class WXDLLIMPEXP_FWD_AUI wxAuiMDIParentFrame;
-class WXDLLIMPEXP_AUI wxAuiMDIClientWindow;
+class WXDLLIMPEXP_FWD_AUI wxAuiMDIClientWindow;
-class WXDLLIMPEXP_AUI wxAuiMDIChildFrame;
+class WXDLLIMPEXP_FWD_AUI wxAuiMDIChildFrame;
 
 //-----------------------------------------------------------------------------
 // wxAuiMDIParentFrame

include/wx/bitmap.h

@@ -20,12 +20,12 @@
 #include "wx/gdicmn.h"  // for wxBitmapType
 #include "wx/colour.h"
 
-class WXDLLEXPORT wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLEXPORT wxBitmapHandler;
+class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
-class WXDLLEXPORT wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLEXPORT wxImage;
+class WXDLLIMPEXP_FWD_CORE wxImage;
-class WXDLLEXPORT wxMask;
+class WXDLLIMPEXP_FWD_CORE wxMask;
-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;
 
 // ----------------------------------------------------------------------------
 // wxVariant support

include/wx/bookctrl.h

@@ -25,8 +25,8 @@
 
 WX_DEFINE_EXPORTED_ARRAY_PTR(wxWindow *, wxArrayPages);
 
-class WXDLLEXPORT wxImageList;
+class WXDLLIMPEXP_FWD_CORE wxImageList;
-class WXDLLEXPORT wxBookCtrlBaseEvent;
+class WXDLLIMPEXP_FWD_CORE wxBookCtrlBaseEvent;
 
 // ----------------------------------------------------------------------------
 // constants

include/wx/buffer.h

@@ -17,7 +17,7 @@
 
 #include <stdlib.h>             // malloc() and free()
 
-class WXDLLIMPEXP_BASE wxCStrData;
+class WXDLLIMPEXP_FWD_BASE wxCStrData;
 
 // ----------------------------------------------------------------------------
 // Special classes for (wide) character strings: they use malloc/free instead

include/wx/button.h

@@ -45,7 +45,7 @@
 
 #include "wx/control.h"
 
-class WXDLLEXPORT wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
 extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
 

include/wx/calctrl.h

@@ -159,7 +159,7 @@ private:
 // wxCalendarCtrl events
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxCalendarCtrl;
+class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
 
 class WXDLLIMPEXP_ADV wxCalendarEvent : public wxDateEvent
 {

include/wx/caret.h

@@ -20,8 +20,8 @@
 // forward declarations
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLEXPORT wxWindowBase;
+class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 
 // ----------------------------------------------------------------------------
 // headers we have to include

include/wx/choicebk.h

@@ -19,7 +19,7 @@
 #include "wx/bookctrl.h"
 #include "wx/choice.h"
 
-class WXDLLEXPORT wxChoice;
+class WXDLLIMPEXP_FWD_CORE wxChoice;
 
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED;
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING;

include/wx/clipbrd.h

@@ -20,9 +20,9 @@
 #include "wx/object.h"
 #include "wx/chartype.h"
 
-class WXDLLEXPORT wxDataFormat;
+class WXDLLIMPEXP_FWD_CORE wxDataFormat;
-class WXDLLEXPORT wxDataObject;
+class WXDLLIMPEXP_FWD_CORE wxDataObject;
-class WXDLLEXPORT wxClipboard;
+class WXDLLIMPEXP_FWD_CORE wxClipboard;
 
 // ----------------------------------------------------------------------------
 // wxClipboard represents the system clipboard. Normally, you should use

include/wx/clrpicker.h

@@ -20,7 +20,7 @@
 #include "wx/pickerbase.h"
 
 
-class WXDLLIMPEXP_CORE wxColourPickerEvent;
+class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent;
 
 extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[];
 extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[];

include/wx/cmdline.h

@@ -20,7 +20,7 @@
 
 #if wxUSE_CMDLINE_PARSER
 
-class WXDLLIMPEXP_BASE wxDateTime;
+class WXDLLIMPEXP_FWD_BASE wxDateTime;
 
 // ----------------------------------------------------------------------------
 // constants

include/wx/cmdproc.h

@@ -16,7 +16,7 @@
 #include "wx/object.h"
 #include "wx/list.h"
 
-class WXDLLEXPORT wxMenu;
+class WXDLLIMPEXP_FWD_CORE wxMenu;
 
 // ----------------------------------------------------------------------------
 // wxCommand: a single command capable of performing itself

include/wx/cmndata.h

@@ -23,7 +23,7 @@
 #endif
 
 
-class WXDLLEXPORT wxPrintNativeDataBase;
+class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
 
 
 class WXDLLEXPORT wxColourData: public wxObject

include/wx/cocoa/NSWindow.h

@@ -17,8 +17,8 @@
 
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
-class WXDLLEXPORT wxMenuBar;
+class WXDLLIMPEXP_FWD_CORE wxMenuBar;
-class WXDLLEXPORT wxTopLevelWindowCocoa;
+class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowCocoa;
 
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
 DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);

include/wx/cocoa/bitmap.h

@@ -15,11 +15,11 @@
 #include "wx/palette.h"
 
 // Bitmap
-class WXDLLEXPORT wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLEXPORT wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLEXPORT wxCursor;
+class WXDLLIMPEXP_FWD_CORE wxCursor;
-class WXDLLEXPORT wxImage;
+class WXDLLIMPEXP_FWD_CORE wxImage;
-class WXDLLEXPORT wxPixelDataBase;
+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 
 // ========================================================================
 // wxMask

include/wx/cocoa/brush.h

@@ -16,7 +16,7 @@
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
 
 // ========================================================================
 // wxBrush

include/wx/cocoa/choice.h

@@ -15,7 +15,7 @@
 //#include "wx/cocoa/NSPopUpButton.h"
 #include "wx/cocoa/NSMenu.h"
 
-class WXDLLIMPEXP_BASE wxSortedArrayString;
+class WXDLLIMPEXP_FWD_BASE wxSortedArrayString;
 
 // ========================================================================
 // wxChoice

include/wx/cocoa/cursor.h

@@ -18,8 +18,8 @@ class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 {
     DECLARE_NO_COPY_CLASS(wxCursorRefData)
 
-    friend class WXDLLEXPORT wxBitmap;
+    friend class WXDLLIMPEXP_FWD_CORE wxBitmap;
-    friend class WXDLLEXPORT wxCursor;
+    friend class WXDLLIMPEXP_FWD_CORE wxCursor;
 public:
     wxCursorRefData();
     virtual ~wxCursorRefData();

include/wx/cocoa/dc.h

@@ -14,7 +14,7 @@
 
 DECLARE_WXCOCOA_OBJC_CLASS(NSAffineTransform);
 
-class WXDLLEXPORT wxDC;
+class WXDLLIMPEXP_FWD_CORE wxDC;
 WX_DECLARE_LIST(wxDC, wxCocoaDCStack);
 
 //=========================================================================

include/wx/cocoa/font.h

@@ -14,7 +14,7 @@
 
 class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {
-    friend class WXDLLEXPORT wxFont;
+    friend class WXDLLIMPEXP_FWD_CORE wxFont;
 public:
     wxFontRefData()
         : m_fontId(0)

include/wx/cocoa/frame.h

@@ -12,8 +12,8 @@
 #ifndef _WX_COCOA_FRAME_H_
 #define _WX_COCOA_FRAME_H_
 
-class WXDLLEXPORT wxMenuBar;
+class WXDLLIMPEXP_FWD_CORE wxMenuBar;
-class WXDLLEXPORT wxStatusBar;
+class WXDLLIMPEXP_FWD_CORE wxStatusBar;
 
 class WXDLLEXPORT wxFrame: public wxFrameBase
 {

include/wx/cocoa/glcanvas.h

@@ -18,7 +18,7 @@
 // Include gl.h from the OpenGL framework
 #include <OpenGL/gl.h>
 
-class WXDLLIMPEXP_GL wxGLCanvas;
+class WXDLLIMPEXP_FWD_GL wxGLCanvas;
 DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLContext);
 DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLView);
 

include/wx/cocoa/mdi.h

@@ -16,8 +16,8 @@
 
 DECLARE_WXCOCOA_OBJC_CLASS(wxMDIParentFrameObserver);
 
-class WXDLLEXPORT wxMDIChildFrame;
+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
-class WXDLLEXPORT wxMDIClientWindow;
+class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
 
 WX_DECLARE_LIST(wxMDIChildFrame, wxCocoaMDIChildFrameList);
 
@@ -26,7 +26,7 @@ WX_DECLARE_LIST(wxMDIChildFrame, wxCocoaMDIChildFrameList);
 // ========================================================================
 class WXDLLEXPORT wxMDIParentFrame: public wxFrame
 {
-    friend class WXDLLEXPORT wxMDIChildFrame;
+    friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 // ------------------------------------------------------------------------
@@ -98,7 +98,7 @@ protected:
 // ========================================================================
 class WXDLLEXPORT wxMDIChildFrame: public wxFrame
 {
-    friend class WXDLLEXPORT wxMDIParentFrame;
+    friend class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame;
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 // ------------------------------------------------------------------------

include/wx/cocoa/pen.h

@@ -15,8 +15,8 @@
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
-class WXDLLEXPORT wxColour;
+class WXDLLIMPEXP_FWD_CORE wxColour;
-class WXDLLEXPORT wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
 // ========================================================================
 // wxPen

include/wx/cocoa/radiobut.h

@@ -14,7 +14,7 @@
 
 #include "wx/cocoa/NSButton.h"
 
-class WXDLLEXPORT wxRadioButton;
+class WXDLLIMPEXP_FWD_CORE wxRadioButton;
 
 WX_DECLARE_LIST(wxRadioButton, wxRadioButtonList);
 

include/wx/cocoa/taskbar.h

@@ -14,8 +14,8 @@
 
 #include "wx/icon.h"
 
-class WXDLLEXPORT wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLEXPORT wxMenu;
+class WXDLLIMPEXP_FWD_CORE wxMenu;
 
 class wxTaskBarIconCocoaImpl;
 

include/wx/cocoa/toplevel.h

@@ -15,7 +15,7 @@
 #include "wx/hashmap.h"
 #include "wx/cocoa/NSWindow.h"
 
-class WXDLLEXPORT wxMenuBar;
+class WXDLLIMPEXP_FWD_CORE wxMenuBar;
 
 // ========================================================================
 // wxTopLevelWindowCocoa

include/wx/colour.h

@@ -16,7 +16,7 @@
 #include "wx/gdiobj.h"
 
 
-class WXDLLEXPORT wxColour;
+class WXDLLIMPEXP_FWD_CORE wxColour;
 
 // the standard wxColour constructors;
 // this macro avoids to repeat these lines across all colour.h files, since

include/wx/combo.h

@@ -46,8 +46,8 @@
 #include "wx/renderer.h" // this is needed for wxCONTROL_XXX flags
 #include "wx/bitmap.h" // wxBitmap used by-value
 
-class WXDLLIMPEXP_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
-class WXDLLEXPORT wxComboPopup;
+class WXDLLIMPEXP_FWD_CORE wxComboPopup;
 
 //
 // New window styles for wxComboCtrlBase

include/wx/confbase.h

@@ -18,7 +18,7 @@
 #include "wx/string.h"
 #include "wx/object.h"
 
-class WXDLLIMPEXP_BASE wxArrayString;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 // ----------------------------------------------------------------------------
 // constants

include/wx/containr.h

@@ -15,8 +15,8 @@
 
 #include "wx/defs.h"
 
-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLEXPORT wxWindowBase;
+class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 
 /*
    Implementation note: wxControlContainer is not a real mix-in but rather
@@ -156,8 +156,8 @@ class WXDLLEXPORT wxControlContainer : public wxControlContainerBase
 
 #else // !wxHAS_NATIVE_TAB_TRAVERSAL
 
-class WXDLLEXPORT wxFocusEvent;
+class WXDLLIMPEXP_FWD_CORE wxFocusEvent;
-class WXDLLEXPORT wxNavigationKeyEvent;
+class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent;
 
 // ----------------------------------------------------------------------------
 // wxControlContainer for TAB navigation implemented in wx itself

include/wx/dataview.h

@@ -38,12 +38,12 @@
 // wxDataViewCtrl globals
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxDataViewItem;
+class WXDLLIMPEXP_FWD_ADV wxDataViewItem;
-class WXDLLIMPEXP_ADV wxDataViewModel;
+class WXDLLIMPEXP_FWD_ADV wxDataViewModel;
-class WXDLLIMPEXP_ADV wxDataViewCtrl;
+class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
-class WXDLLIMPEXP_ADV wxDataViewColumn;
+class WXDLLIMPEXP_FWD_ADV wxDataViewColumn;
-class WXDLLIMPEXP_ADV wxDataViewRenderer;
+class WXDLLIMPEXP_FWD_ADV wxDataViewRenderer;
-class WXDLLIMPEXP_ADV wxDataViewModelNotifier;
+class WXDLLIMPEXP_FWD_ADV wxDataViewModelNotifier;
 class                 wxDataViewEventModelNotifier;
 
 extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxDataViewCtrlNameStr[];

include/wx/datetime.h

@@ -27,9 +27,9 @@
 
 #include "wx/longlong.h"
 
-class WXDLLIMPEXP_BASE wxDateTime;
+class WXDLLIMPEXP_FWD_BASE wxDateTime;
-class WXDLLIMPEXP_BASE wxTimeSpan;
+class WXDLLIMPEXP_FWD_BASE wxTimeSpan;
-class WXDLLIMPEXP_BASE wxDateSpan;
+class WXDLLIMPEXP_FWD_BASE wxDateSpan;
 
 #include "wx/dynarray.h"
 
@@ -125,7 +125,7 @@ WXDLLIMPEXP_BASE struct tm *wxGmtime_r(const time_t*, struct tm*);
 // argument for arguments of type wxDateTime; it is also returned by all
 // functions returning wxDateTime on failure (this is why it is also called
 // wxInvalidDateTime)
-class WXDLLIMPEXP_BASE wxDateTime;
+class WXDLLIMPEXP_FWD_BASE wxDateTime;
 
 extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxDefaultDateTimeFormat;
 extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxDefaultTimeSpanFormat;
@@ -1487,7 +1487,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxDateTime, wxDateTimeArray, WXDLLIMPEXP_BASE)
 //     virtual methods to work with the holidays they correspond to.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxDateTimeHolidayAuthority;
+class WXDLLIMPEXP_FWD_BASE wxDateTimeHolidayAuthority;
 WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxDateTimeHolidayAuthority *,
                               wxHolidayAuthoritiesArray,
                               class WXDLLIMPEXP_BASE);

include/wx/dc.h

@@ -40,7 +40,7 @@
 // wxDCFactory
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxImplDC;
+class WXDLLIMPEXP_FWD_CORE wxImplDC;
 
 class WXDLLIMPEXP_CORE wxDCFactory
 {
@@ -977,8 +977,8 @@ private:
 #else  // wxUSE_NEW_DC
 
 
-class WXDLLEXPORT wxDC;
+class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLEXPORT wxDCBase;
+class WXDLLIMPEXP_FWD_CORE wxDCBase;
 
 class WXDLLEXPORT wxDrawObject
 {

include/wx/dcgraph.h

@@ -18,7 +18,7 @@
 #include "wx/dynarray.h"
 #include "wx/graphics.h"
 
-class WXDLLEXPORT wxWindowDC;
+class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 
 #ifdef __WXMAC__
 #define wxGCDC wxDC

include/wx/dde.h

@@ -14,9 +14,9 @@
 
 #include "wx/list.h"
 
-class WXDLLIMPEXP_BASE wxDDEClient;
+class WXDLLIMPEXP_FWD_BASE wxDDEClient;
-class WXDLLIMPEXP_BASE wxDDEServer;
+class WXDLLIMPEXP_FWD_BASE wxDDEServer;
-class WXDLLIMPEXP_BASE wxDDEConnection;
+class WXDLLIMPEXP_FWD_BASE wxDDEConnection;
 
 WX_DECLARE_USER_EXPORTED_LIST(wxDDEClient, wxDDEClientList, WXDLLIMPEXP_BASE);
 WX_DECLARE_USER_EXPORTED_LIST(wxDDEServer, wxDDEServerList, WXDLLIMPEXP_BASE);

include/wx/debug.h

@@ -131,8 +131,8 @@
                                           const wxChar *szMsg);
 #endif /* wxUSE_UNICODE */
 
-  class WXDLLIMPEXP_BASE wxString;
+  class WXDLLIMPEXP_FWD_BASE wxString;
-  class WXDLLIMPEXP_BASE wxCStrData;
+  class WXDLLIMPEXP_FWD_BASE wxCStrData;
 
   /* these two work when szMsg passed to debug macro is a string,
      we also have to provide wxCStrData overload to resolve ambiguity

include/wx/debugrpt.h

@@ -18,7 +18,7 @@
 #include "wx/string.h"
 #include "wx/arrstr.h"
 
-class WXDLLIMPEXP_XML wxXmlNode;
+class WXDLLIMPEXP_FWD_XML wxXmlNode;
 
 // ----------------------------------------------------------------------------
 // wxDebugReport: generate a debug report, processing is done in derived class

include/wx/dfb/brush.h

@@ -21,8 +21,8 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
 
 //-----------------------------------------------------------------------------
 // wxBrush

include/wx/dfb/cursor.h

@@ -14,7 +14,7 @@
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 
-class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
 //-----------------------------------------------------------------------------
 // wxCursor

include/wx/dfb/dc.h

@@ -156,7 +156,7 @@ protected:
 
     double            m_mm_to_pix_x, m_mm_to_pix_y;
 
-    friend class WXDLLIMPEXP_CORE wxOverlayImpl; // for Init
+    friend class WXDLLIMPEXP_FWD_CORE wxOverlayImpl; // for Init
 
     DECLARE_DYNAMIC_CLASS(wxDC)
 };

include/wx/dfb/dcclient.h

@@ -13,7 +13,7 @@
 
 #include "wx/dc.h"
 
-class WXDLLIMPEXP_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 //-----------------------------------------------------------------------------
 // wxWindowDC

include/wx/dfb/pen.h

@@ -21,8 +21,8 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxPen;
+class WXDLLIMPEXP_FWD_CORE wxPen;
 
 //-----------------------------------------------------------------------------
 // wxPen

include/wx/dfb/private/overlay.h

@@ -16,8 +16,8 @@
 
 wxDFB_DECLARE_INTERFACE(IDirectFBSurface);
 
-class WXDLLIMPEXP_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_CORE wxwindowDC;
+class WXDLLIMPEXP_FWD_CORE wxwindowDC;
 
 class wxOverlayImpl
 {

include/wx/dfb/region.h

@@ -58,7 +58,7 @@ protected:
     virtual bool DoXor(const wxRegion& region);
 
 
-    friend class WXDLLIMPEXP_CORE wxRegionIterator;
+    friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
 
     DECLARE_DYNAMIC_CLASS(wxRegion);
 };

include/wx/dfb/window.h

@@ -20,8 +20,8 @@
 wxDFB_DECLARE_INTERFACE(IDirectFBSurface);
 struct wxDFBWindowEvent;
 
-class WXDLLIMPEXP_CORE wxFont;
+class WXDLLIMPEXP_FWD_CORE wxFont;
-class WXDLLIMPEXP_CORE wxNonOwnedWindow;
+class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
 
 class wxOverlayImpl;
 class wxDfbOverlaysList;

include/wx/dialog.h

@@ -15,8 +15,8 @@
 #include "wx/defs.h"
 #include "wx/toplevel.h"
 
-class WXDLLEXPORT wxSizer;
+class WXDLLIMPEXP_FWD_CORE wxSizer;
-class WXDLLEXPORT wxStdDialogButtonSizer;
+class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer;
 
 #define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 

include/wx/dialup.h

@@ -20,7 +20,7 @@
 // misc
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxArrayString;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 #define WXDIALUP_MANAGER_DEFAULT_BEACONHOST  wxT("www.yahoo.com")
 

include/wx/dir.h

@@ -15,7 +15,7 @@
 #include "wx/longlong.h"
 #include "wx/string.h"
 
-class WXDLLIMPEXP_BASE wxArrayString;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -78,7 +78,7 @@ public:
 // wxDir: portable equivalent of {open/read/close}dir functions
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxDirData;
+class WXDLLIMPEXP_FWD_BASE wxDirData;
 
 class WXDLLIMPEXP_BASE wxDir
 {

include/wx/display.h

@@ -25,13 +25,13 @@
     extern WXDLLEXPORT_DATA(const wxVideoMode) wxDefaultVideoMode;
 #endif // wxUSE_DISPLAY
 
-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLEXPORT wxPoint;
+class WXDLLIMPEXP_FWD_CORE wxPoint;
-class WXDLLEXPORT wxRect;
+class WXDLLIMPEXP_FWD_CORE wxRect;
-class WXDLLIMPEXP_BASE wxString;
+class WXDLLIMPEXP_FWD_BASE wxString;
 
-class WXDLLEXPORT wxDisplayFactory;
+class WXDLLIMPEXP_FWD_CORE wxDisplayFactory;
-class WXDLLEXPORT wxDisplayImpl;
+class WXDLLIMPEXP_FWD_CORE wxDisplayImpl;
 
 // ----------------------------------------------------------------------------
 // wxDisplay: represents a display/monitor attached to the system

include/wx/dlimpexp.h

@@ -238,6 +238,24 @@
     #define WXDLLIMPEXP_STC
 #endif
 
+/* GCC warns about using __attribute__ on forward declarations, so we need
+   another set of macros for them: */
+#define WXDLLIMPEXP_FWD_BASE      WXDLLIMPEXP_BASE
+#define WXDLLIMPEXP_FWD_NET       WXDLLIMPEXP_NET
+#define WXDLLIMPEXP_FWD_CORE      WXDLLIMPEXP_CORE
+#define WXDLLIMPEXP_FWD_ADV       WXDLLIMPEXP_ADV
+#define WXDLLIMPEXP_FWD_QA        WXDLLIMPEXP_QA
+#define WXDLLIMPEXP_FWD_ODBC      WXDLLIMPEXP_ODBC
+#define WXDLLIMPEXP_FWD_DBGRID    WXDLLIMPEXP_DBGRID
+#define WXDLLIMPEXP_FWD_HTML      WXDLLIMPEXP_HTML
+#define WXDLLIMPEXP_FWD_GL        WXDLLIMPEXP_GL
+#define WXDLLIMPEXP_FWD_XML       WXDLLIMPEXP_XML
+#define WXDLLIMPEXP_FWD_XRC       WXDLLIMPEXP_XRC
+#define WXDLLIMPEXP_FWD_AUI       WXDLLIMPEXP_AUI
+#define WXDLLIMPEXP_FWD_RICHTEXT  WXDLLIMPEXP_RICHTEXT
+#define WXDLLIMPEXP_FWD_MEDIA     WXDLLIMPEXP_MEDIA
+#define WXDLLIMPEXP_FWD_STC       WXDLLIMPEXP_STC
+
 /* for backwards compatibility, define suffix-less versions too */
 #define WXDLLEXPORT WXDLLIMPEXP_CORE
 #define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE

include/wx/docview.h

@@ -24,15 +24,15 @@
     #include "wx/print.h"
 #endif
 
-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLEXPORT wxDocument;
+class WXDLLIMPEXP_FWD_CORE wxDocument;
-class WXDLLEXPORT wxView;
+class WXDLLIMPEXP_FWD_CORE wxView;
-class WXDLLEXPORT wxDocTemplate;
+class WXDLLIMPEXP_FWD_CORE wxDocTemplate;
-class WXDLLEXPORT wxDocManager;
+class WXDLLIMPEXP_FWD_CORE wxDocManager;
-class WXDLLEXPORT wxPrintInfo;
+class WXDLLIMPEXP_FWD_CORE wxPrintInfo;
-class WXDLLEXPORT wxCommandProcessor;
+class WXDLLIMPEXP_FWD_CORE wxCommandProcessor;
-class WXDLLEXPORT wxFileHistory;
+class WXDLLIMPEXP_FWD_CORE wxFileHistory;
-class WXDLLEXPORT wxConfigBase;
+class WXDLLIMPEXP_FWD_CORE wxConfigBase;
 
 #if wxUSE_STD_IOSTREAM
   #include "wx/iosfwrap.h"
@@ -244,7 +244,7 @@ private:
 class WXDLLEXPORT wxDocTemplate: public wxObject
 {
 
-friend class WXDLLEXPORT wxDocManager;
+friend class WXDLLIMPEXP_FWD_CORE wxDocManager;
 
 public:
     // Associate document and view types. They're for identifying what view is

include/wx/dragimag.h

@@ -14,9 +14,9 @@
 
 #if wxUSE_DRAGIMAGE
 
-class WXDLLEXPORT wxRect;
+class WXDLLIMPEXP_FWD_CORE wxRect;
-class WXDLLEXPORT wxMemoryDC;
+class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
-class WXDLLEXPORT wxDC;
+class WXDLLIMPEXP_FWD_CORE wxDC;
 
 #if defined(__WXMSW__)
 #   if defined(__WXUNIVERSAL__)

include/wx/dynlib.h

@@ -32,7 +32,7 @@
     #define wxHAVE_DYNLIB_ERROR
 #endif
 
-class WXDLLIMPEXP_BASE wxDynamicLibraryDetailsCreator;
+class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator;
 
 // ----------------------------------------------------------------------------
 // conditional compilation

include/wx/dynload.h

@@ -25,7 +25,7 @@
 #include "wx/hashmap.h"
 #include "wx/module.h"
 
-class WXDLLIMPEXP_BASE wxPluginLibrary;
+class WXDLLIMPEXP_FWD_BASE wxPluginLibrary;
 
 
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxPluginLibrary *, wxDLManifest,

include/wx/editlbox.h

@@ -17,9 +17,9 @@
 
 #include "wx/panel.h"
 
-class WXDLLEXPORT wxBitmapButton;
+class WXDLLIMPEXP_FWD_CORE wxBitmapButton;
-class WXDLLEXPORT wxListCtrl;
+class WXDLLIMPEXP_FWD_CORE wxListCtrl;
-class WXDLLEXPORT wxListEvent;
+class WXDLLIMPEXP_FWD_CORE wxListEvent;
 
 #define wxEL_ALLOW_NEW          0x0100
 #define wxEL_ALLOW_EDIT         0x0200

include/wx/event.h

@@ -30,16 +30,16 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxList;
+class WXDLLIMPEXP_FWD_BASE wxList;
 
 #if wxUSE_GUI
-    class WXDLLIMPEXP_CORE wxDC;
+    class WXDLLIMPEXP_FWD_CORE wxDC;
-    class WXDLLIMPEXP_CORE wxMenu;
+    class WXDLLIMPEXP_FWD_CORE wxMenu;
-    class WXDLLIMPEXP_CORE wxWindow;
+    class WXDLLIMPEXP_FWD_CORE wxWindow;
-    class WXDLLIMPEXP_CORE wxWindowBase;
+    class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 #endif // wxUSE_GUI
 
-class WXDLLIMPEXP_BASE wxEvtHandler;
+class WXDLLIMPEXP_FWD_BASE wxEvtHandler;
 
 // ----------------------------------------------------------------------------
 // Event types
@@ -411,7 +411,7 @@ protected:
 
 private:
     // it needs to access our m_propagationLevel
-    friend class WXDLLIMPEXP_BASE wxPropagateOnce;
+    friend class WXDLLIMPEXP_FWD_BASE wxPropagateOnce;
 
     DECLARE_ABSTRACT_CLASS(wxEvent)
 };

include/wx/evtloop.h

@@ -121,7 +121,7 @@ protected:
     #include "wx/dfb/evtloop.h"
 #else // other platform
 
-class WXDLLEXPORT wxEventLoopImpl;
+class WXDLLIMPEXP_FWD_CORE wxEventLoopImpl;
 
 class WXDLLEXPORT wxGUIEventLoop : public wxEventLoopBase
 {

include/wx/fdrepdlg.h

@@ -18,10 +18,10 @@
 
 #include "wx/dialog.h"
 
-class WXDLLEXPORT wxFindDialogEvent;
+class WXDLLIMPEXP_FWD_CORE wxFindDialogEvent;
-class WXDLLEXPORT wxFindReplaceDialog;
+class WXDLLIMPEXP_FWD_CORE wxFindReplaceDialog;
-class WXDLLEXPORT wxFindReplaceData;
+class WXDLLIMPEXP_FWD_CORE wxFindReplaceData;
-class WXDLLEXPORT wxFindReplaceDialogImpl;
+class WXDLLIMPEXP_FWD_CORE wxFindReplaceDialogImpl;
 
 // ----------------------------------------------------------------------------
 // Flags for wxFindReplaceData.Flags

include/wx/fileconf.h

@@ -90,13 +90,13 @@
   (it's on by default, the current status can be retrieved with
    IsExpandingEnvVars function).
 */
-class WXDLLIMPEXP_BASE wxFileConfigGroup;
+class WXDLLIMPEXP_FWD_BASE wxFileConfigGroup;
-class WXDLLIMPEXP_BASE wxFileConfigEntry;
+class WXDLLIMPEXP_FWD_BASE wxFileConfigEntry;
-class WXDLLIMPEXP_BASE wxFileConfigLineList;
+class WXDLLIMPEXP_FWD_BASE wxFileConfigLineList;
 
 #if wxUSE_STREAMS
-class WXDLLIMPEXP_BASE wxInputStream;
+class WXDLLIMPEXP_FWD_BASE wxInputStream;
-class WXDLLIMPEXP_BASE wxOutputStream;
+class WXDLLIMPEXP_FWD_BASE wxOutputStream;
 #endif // wxUSE_STREAMS
 
 class WXDLLIMPEXP_BASE wxFileConfig : public wxConfigBase

include/wx/filename.h

@@ -29,11 +29,11 @@
 #include "wx/intl.h"
 
 #if wxUSE_FILE
-class WXDLLIMPEXP_BASE wxFile;
+class WXDLLIMPEXP_FWD_BASE wxFile;
 #endif
 
 #if wxUSE_FFILE
-class WXDLLIMPEXP_BASE wxFFile;
+class WXDLLIMPEXP_FWD_BASE wxFFile;
 #endif
 
 // ----------------------------------------------------------------------------

include/wx/filepicker.h

@@ -19,8 +19,8 @@
 #include "wx/pickerbase.h"
 #include "wx/filename.h"
 
-class WXDLLIMPEXP_CORE wxDialog;
+class WXDLLIMPEXP_FWD_CORE wxDialog;
-class WXDLLIMPEXP_CORE wxFileDirPickerEvent;
+class WXDLLIMPEXP_FWD_CORE wxFileDirPickerEvent;
 
 extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetLabel[];
 extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetNameStr[];

include/wx/filesys.h

@@ -27,9 +27,9 @@
 #include "wx/filename.h"
 #include "wx/hashmap.h"
 
-class WXDLLIMPEXP_BASE wxFSFile;
+class WXDLLIMPEXP_FWD_BASE wxFSFile;
-class WXDLLIMPEXP_BASE wxFileSystemHandler;
+class WXDLLIMPEXP_FWD_BASE wxFileSystemHandler;
-class WXDLLIMPEXP_BASE wxFileSystem;
+class WXDLLIMPEXP_FWD_BASE wxFileSystem;
 
 //--------------------------------------------------------------------------------
 // wxFSFile

include/wx/font.h

@@ -24,10 +24,10 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFontData;
+class WXDLLIMPEXP_FWD_CORE wxFontData;
-class WXDLLEXPORT wxFontBase;
+class WXDLLIMPEXP_FWD_CORE wxFontBase;
-class WXDLLEXPORT wxFont;
+class WXDLLIMPEXP_FWD_CORE wxFont;
-class WXDLLEXPORT wxSize;
+class WXDLLIMPEXP_FWD_CORE wxSize;
 
 // ----------------------------------------------------------------------------
 // font constants
@@ -105,7 +105,7 @@ enum
 // wxFontBase represents a font object
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxNativeFontInfo;
+class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo;
 
 class WXDLLEXPORT wxFontBase : public wxGDIObject
 {

include/wx/fontmap.h

@@ -25,13 +25,13 @@
 #endif // wxUSE_GUI
 
 #if wxUSE_CONFIG && wxUSE_FILECONFIG
-    class WXDLLIMPEXP_BASE wxConfigBase;
+    class WXDLLIMPEXP_FWD_BASE wxConfigBase;
 #endif // wxUSE_CONFIG
 
-class WXDLLIMPEXP_CORE wxFontMapper;
+class WXDLLIMPEXP_FWD_CORE wxFontMapper;
 
 #if wxUSE_GUI
-    class WXDLLIMPEXP_CORE wxWindow;
+    class WXDLLIMPEXP_FWD_CORE wxWindow;
 #endif // wxUSE_GUI
 
 // ============================================================================

include/wx/fontpicker.h

@@ -20,7 +20,7 @@
 #include "wx/pickerbase.h"
 
 
-class WXDLLIMPEXP_CORE wxFontPickerEvent;
+class WXDLLIMPEXP_FWD_CORE wxFontPickerEvent;
 
 extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerWidgetNameStr[];
 extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerCtrlNameStr[];

include/wx/fontutil.h

@@ -26,8 +26,8 @@
     #include "wx/msw/wrapwin.h"
 #endif
 
-class WXDLLIMPEXP_BASE wxArrayString;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
-struct WXDLLEXPORT wxNativeEncodingInfo;
+struct WXDLLIMPEXP_FWD_CORE wxNativeEncodingInfo;
 
 #if defined(_WX_X_FONTLIKE)
 

include/wx/frame.h

@@ -22,10 +22,10 @@
 extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
 extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
 
-class WXDLLEXPORT wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
-class WXDLLEXPORT wxMenuBar;
+class WXDLLIMPEXP_FWD_CORE wxMenuBar;
-class WXDLLEXPORT wxStatusBar;
+class WXDLLIMPEXP_FWD_CORE wxStatusBar;
-class WXDLLEXPORT wxToolBar;
+class WXDLLIMPEXP_FWD_CORE wxToolBar;
 
 // ----------------------------------------------------------------------------
 // constants

include/wx/fs_mem.h

@@ -16,8 +16,8 @@
 #include "wx/filesys.h"
 
 #if wxUSE_GUI
-    class WXDLLIMPEXP_CORE wxBitmap;
+    class WXDLLIMPEXP_FWD_CORE wxBitmap;
-    class WXDLLIMPEXP_CORE wxImage;
+    class WXDLLIMPEXP_FWD_CORE wxImage;
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------

include/wx/gbsizer.h

@@ -79,7 +79,7 @@ extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan;
 // wxGBSizerItem
 //---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGridBagSizer;
+class WXDLLIMPEXP_FWD_CORE wxGridBagSizer;
 
 
 class WXDLLEXPORT wxGBSizerItem : public wxSizerItem

include/wx/gdicmn.h

@@ -27,18 +27,18 @@
 // forward declarations
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
-class WXDLLIMPEXP_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxColour;
-class WXDLLIMPEXP_CORE wxCursor;
+class WXDLLIMPEXP_FWD_CORE wxCursor;
-class WXDLLIMPEXP_CORE wxFont;
+class WXDLLIMPEXP_FWD_CORE wxFont;
-class WXDLLIMPEXP_CORE wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLIMPEXP_CORE wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;
-class WXDLLIMPEXP_CORE wxPen;
+class WXDLLIMPEXP_FWD_CORE wxPen;
-class WXDLLIMPEXP_CORE wxRegion;
+class WXDLLIMPEXP_FWD_CORE wxRegion;
-class WXDLLIMPEXP_BASE wxString;
+class WXDLLIMPEXP_FWD_BASE wxString;
-class WXDLLIMPEXP_CORE wxIconBundle;
+class WXDLLIMPEXP_FWD_CORE wxIconBundle;
-class WXDLLIMPEXP_CORE wxPoint;
+class WXDLLIMPEXP_FWD_CORE wxPoint;
 
 // ---------------------------------------------------------------------------
 // constants

include/wx/gdiobj.h

@@ -20,7 +20,7 @@
 // the same native GDI object
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGDIRefData: public wxObjectRefData { };
+class WXDLLIMPEXP_FWD_CORE wxGDIRefData: public wxObjectRefData { };
 
 // ----------------------------------------------------------------------------
 // wxGDIObject

include/wx/generic/aboutdlgg.h

@@ -17,9 +17,9 @@
 
 #include "wx/dialog.h"
 
-class WXDLLIMPEXP_ADV  wxAboutDialogInfo;
+class WXDLLIMPEXP_FWD_ADV wxAboutDialogInfo;
-class WXDLLIMPEXP_CORE wxSizer;
+class WXDLLIMPEXP_FWD_CORE wxSizer;
-class WXDLLIMPEXP_CORE wxSizerFlags;
+class WXDLLIMPEXP_FWD_CORE wxSizerFlags;
 
 // ----------------------------------------------------------------------------
 // wxGenericAboutDialog: generic "About" dialog implementation

include/wx/generic/accel.h

@@ -10,7 +10,7 @@
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 
-class WXDLLEXPORT wxKeyEvent;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
 
 // ----------------------------------------------------------------------------
 // wxAcceleratorTable

include/wx/generic/busyinfo.h

@@ -14,7 +14,7 @@
 
 #if wxUSE_BUSYINFO
 
-class WXDLLIMPEXP_CORE wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
 
 //--------------------------------------------------------------------------------
 // wxBusyInfo

include/wx/generic/buttonbar.h

@@ -16,7 +16,7 @@
 #include "wx/bmpbuttn.h"
 #include "wx/toolbar.h"
 
-class WXDLLEXPORT wxButtonToolBarTool;
+class WXDLLIMPEXP_FWD_CORE wxButtonToolBarTool;
 
 // ----------------------------------------------------------------------------
 // wxButtonToolBar

include/wx/generic/calctrl.h

@@ -15,9 +15,9 @@
 #include "wx/control.h"         // the base class
 #include "wx/dcclient.h"        // for wxPaintDC
 
-class WXDLLEXPORT wxComboBox;
+class WXDLLIMPEXP_FWD_CORE wxComboBox;
-class WXDLLEXPORT wxStaticText;
+class WXDLLIMPEXP_FWD_CORE wxStaticText;
-class WXDLLEXPORT wxSpinCtrl;
+class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
 
 #define wxCalendarNameStr _T("CalendarCtrl")
 

include/wx/generic/caret.h

@@ -20,7 +20,7 @@
     #define wxHAS_CARET_USING_OVERLAYS
 #endif
 
-class WXDLLIMPEXP_CORE wxCaret;
+class WXDLLIMPEXP_FWD_CORE wxCaret;
 
 class WXDLLEXPORT wxCaretTimer : public wxTimer
 {

include/wx/generic/choicdgg.h

@@ -15,7 +15,7 @@
 #include "wx/dynarray.h"
 #include "wx/dialog.h"
 
-class WXDLLEXPORT wxListBoxBase;
+class WXDLLIMPEXP_FWD_CORE wxListBoxBase;
 
 // ----------------------------------------------------------------------------
 // some (ugly...) constants

include/wx/generic/collpaneg.h

@@ -13,8 +13,8 @@
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_
 
 // forward declared
-class WXDLLEXPORT wxButton;
+class WXDLLIMPEXP_FWD_CORE wxButton;
-class WXDLLEXPORT wxStaticLine;
+class WXDLLIMPEXP_FWD_CORE wxStaticLine;
 
 // class name
 extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];

include/wx/generic/colrdlgg.h

@@ -25,7 +25,7 @@
     #define wxID_GREEN_SLIDER   3002
     #define wxID_BLUE_SLIDER    3003
 
-    class WXDLLEXPORT wxSlider;
+    class WXDLLIMPEXP_FWD_CORE wxSlider;
 
 #endif // wxUSE_SLIDER
 

include/wx/generic/dataview.h

@@ -21,9 +21,9 @@
 // classes
 // ---------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxDataViewCtrl;
+class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
-class WXDLLIMPEXP_ADV wxDataViewMainWindow;
+class WXDLLIMPEXP_FWD_ADV wxDataViewMainWindow;
-class WXDLLIMPEXP_ADV wxDataViewHeaderWindow;
+class WXDLLIMPEXP_FWD_ADV wxDataViewHeaderWindow;
 
 // ---------------------------------------------------------
 // wxDataViewRenderer

include/wx/generic/datectrl.h

@@ -12,11 +12,11 @@
 #ifndef _WX_GENERIC_DATECTRL_H_
 #define _WX_GENERIC_DATECTRL_H_
 
-class WXDLLIMPEXP_ADV wxCalendarDateAttr;
+class WXDLLIMPEXP_FWD_ADV wxCalendarDateAttr;
-class WXDLLIMPEXP_ADV wxCalendarCtrl;
+class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
-class WXDLLIMPEXP_ADV wxCalendarEvent;
+class WXDLLIMPEXP_FWD_ADV wxCalendarEvent;
-class WXDLLIMPEXP_ADV wxComboCtrl;
+class WXDLLIMPEXP_FWD_ADV wxComboCtrl;
-class WXDLLIMPEXP_ADV wxCalendarComboPopup;
+class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
 {

include/wx/generic/dirctrlg.h

@@ -30,9 +30,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
-class WXDLLIMPEXP_CORE wxImageList;
+class WXDLLIMPEXP_FWD_CORE wxImageList;
-class WXDLLIMPEXP_BASE wxHashTable;
+class WXDLLIMPEXP_FWD_BASE wxHashTable;
 
 //-----------------------------------------------------------------------------
 // Extra styles for wxGenericDirCtrl
@@ -78,7 +78,7 @@ public:
 // wxDirCtrl
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDirFilterListCtrl;
+class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl;
 
 class WXDLLEXPORT wxGenericDirCtrl: public wxControl
 {

include/wx/generic/dirdlgg.h

@@ -15,9 +15,9 @@
 #ifndef _WX_DIRDLGG_H_
 #define _WX_DIRDLGG_H_
 
-class WXDLLEXPORT wxGenericDirCtrl;
+class WXDLLIMPEXP_FWD_CORE wxGenericDirCtrl;
-class WXDLLEXPORT wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
-class WXDLLEXPORT wxTreeEvent;
+class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
 
 // we may be included directly as well as from wx/dirdlg.h (FIXME)
 extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];

include/wx/generic/fdrepdlg.h

@@ -12,9 +12,9 @@
 #ifndef _WX_GENERIC_FDREPDLG_H_
 #define _WX_GENERIC_FDREPDLG_H_
 
-class WXDLLEXPORT wxCheckBox;
+class WXDLLIMPEXP_FWD_CORE wxCheckBox;
-class WXDLLEXPORT wxRadioBox;
+class WXDLLIMPEXP_FWD_CORE wxRadioBox;
-class WXDLLEXPORT wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
 // ----------------------------------------------------------------------------
 // wxGenericFindReplaceDialog: dialog for searching / replacing text

include/wx/generic/filedlgg.h

@@ -21,16 +21,16 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmapButton;
+class WXDLLIMPEXP_FWD_CORE wxBitmapButton;
-class WXDLLEXPORT wxCheckBox;
+class WXDLLIMPEXP_FWD_CORE wxCheckBox;
-class WXDLLEXPORT wxChoice;
+class WXDLLIMPEXP_FWD_CORE wxChoice;
-class WXDLLEXPORT wxFileData;
+class WXDLLIMPEXP_FWD_CORE wxFileData;
-class WXDLLEXPORT wxFileCtrl;
+class WXDLLIMPEXP_FWD_CORE wxFileCtrl;
-class WXDLLEXPORT wxGenericFileDialog;
+class WXDLLIMPEXP_FWD_CORE wxGenericFileDialog;
-class WXDLLEXPORT wxListEvent;
+class WXDLLIMPEXP_FWD_CORE wxListEvent;
-class WXDLLEXPORT wxListItem;
+class WXDLLIMPEXP_FWD_CORE wxListItem;
-class WXDLLEXPORT wxStaticText;
+class WXDLLIMPEXP_FWD_CORE wxStaticText;
-class WXDLLEXPORT wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
 //-------------------------------------------------------------------------
 // wxGenericFileDialog

include/wx/generic/fontdlgg.h

@@ -20,7 +20,7 @@
 
 #ifdef __WXWINCE__
 #define USE_SPINCTRL_FOR_POINT_SIZE 1
-class WXDLLEXPORT wxSpinEvent;
+class WXDLLIMPEXP_FWD_CORE wxSpinEvent;
 #else
 #define USE_SPINCTRL_FOR_POINT_SIZE 0
 #endif
@@ -29,10 +29,10 @@ class WXDLLEXPORT wxSpinEvent;
  * FONT DIALOG
  */
 
-class WXDLLEXPORT wxChoice;
+class WXDLLIMPEXP_FWD_CORE wxChoice;
-class WXDLLEXPORT wxText;
+class WXDLLIMPEXP_FWD_CORE wxText;
-class WXDLLEXPORT wxCheckBox;
+class WXDLLIMPEXP_FWD_CORE wxCheckBox;
-class WXDLLEXPORT wxFontPreviewer;
+class WXDLLIMPEXP_FWD_CORE wxFontPreviewer;
 
 enum
 {

include/wx/generic/grid.h

@@ -67,21 +67,21 @@ enum wxGridDirection
 // forward declarations
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxGrid;
+class WXDLLIMPEXP_FWD_ADV wxGrid;
-class WXDLLIMPEXP_ADV wxGridCellAttr;
+class WXDLLIMPEXP_FWD_ADV wxGridCellAttr;
-class WXDLLIMPEXP_ADV wxGridCellAttrProviderData;
+class WXDLLIMPEXP_FWD_ADV wxGridCellAttrProviderData;
-class WXDLLIMPEXP_ADV wxGridColLabelWindow;
+class WXDLLIMPEXP_FWD_ADV wxGridColLabelWindow;
-class WXDLLIMPEXP_ADV wxGridCornerLabelWindow;
+class WXDLLIMPEXP_FWD_ADV wxGridCornerLabelWindow;
-class WXDLLIMPEXP_ADV wxGridRowLabelWindow;
+class WXDLLIMPEXP_FWD_ADV wxGridRowLabelWindow;
-class WXDLLIMPEXP_ADV wxGridWindow;
+class WXDLLIMPEXP_FWD_ADV wxGridWindow;
-class WXDLLIMPEXP_ADV wxGridTypeRegistry;
+class WXDLLIMPEXP_FWD_ADV wxGridTypeRegistry;
-class WXDLLIMPEXP_ADV wxGridSelection;
+class WXDLLIMPEXP_FWD_ADV wxGridSelection;
 
-class WXDLLEXPORT wxCheckBox;
+class WXDLLIMPEXP_FWD_CORE wxCheckBox;
-class WXDLLEXPORT wxComboBox;
+class WXDLLIMPEXP_FWD_CORE wxComboBox;
-class WXDLLEXPORT wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 #if wxUSE_SPINCTRL
-class WXDLLEXPORT wxSpinCtrl;
+class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
 #endif
 
 // ----------------------------------------------------------------------------
@@ -2020,7 +2020,7 @@ protected:
     bool GetModelValues();
     bool SetModelValues();
 
-    friend class WXDLLIMPEXP_ADV wxGridSelection;
+    friend class WXDLLIMPEXP_FWD_ADV wxGridSelection;
 
     DECLARE_DYNAMIC_CLASS( wxGrid )
     DECLARE_EVENT_TABLE()

include/wx/generic/gridsel.h

@@ -79,7 +79,7 @@ private:
     wxGrid                              *m_grid;
     wxGrid::wxGridSelectionModes        m_selectionMode;
 
-    friend class WXDLLIMPEXP_ADV wxGrid;
+    friend class WXDLLIMPEXP_FWD_ADV wxGrid;
 
     DECLARE_NO_COPY_CLASS(wxGridSelection)
 };

include/wx/generic/imaglist.h

@@ -15,9 +15,9 @@
 #include "wx/list.h"
 #include "wx/icon.h"
 
-class WXDLLEXPORT wxDC;
+class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLEXPORT wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLEXPORT wxColour;
+class WXDLLIMPEXP_FWD_CORE wxColour;
 
 
 class WXDLLEXPORT wxGenericImageList: public wxObject