substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE

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

include/wx/accel.h

@@ -44,7 +44,7 @@ enum wxAcceleratorEntryFlags
 // an entry in wxAcceleratorTable corresponds to one accelerator
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxAcceleratorEntry
+class WXDLLIMPEXP_CORE wxAcceleratorEntry
 {
 public:
     wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0,
@@ -164,7 +164,7 @@ private:
     #include "wx/os2/accel.h"
 #endif
 
-extern WXDLLEXPORT_DATA(wxAcceleratorTable) wxNullAcceleratorTable;
+extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable;
 
 #endif // wxUSE_ACCEL
 

include/wx/access.h

@@ -228,7 +228,7 @@ class WXDLLIMPEXP_FWD_CORE wxAccessible;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxPoint;
 class WXDLLIMPEXP_FWD_CORE wxRect;
-class WXDLLEXPORT wxAccessibleBase : public wxObject
+class WXDLLIMPEXP_CORE wxAccessibleBase : public wxObject
 {
     DECLARE_NO_COPY_CLASS(wxAccessibleBase)
 

include/wx/anidecod.h

@@ -20,7 +20,7 @@
 #include "wx/dynarray.h"
 
 
-class /*WXDLLEXPORT*/ wxANIFrameInfo;
+class /*WXDLLIMPEXP_CORE*/ wxANIFrameInfo;      // private implementation detail
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxANIFrameInfo, wxANIFrameInfoArray);
 WX_DECLARE_EXPORTED_OBJARRAY(wxImage, wxImageArray);
@@ -29,7 +29,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxImage, wxImageArray);
 // wxANIDecoder class
 // --------------------------------------------------------------------------
 
-class WXDLLEXPORT wxANIDecoder : public wxAnimationDecoder
+class WXDLLIMPEXP_CORE wxANIDecoder : public wxAnimationDecoder
 {
 public:
     // constructor, destructor, etc.

include/wx/apptrait.h

@@ -246,7 +246,7 @@ public:
 
 #if wxUSE_GUI
 
-class WXDLLEXPORT wxGUIAppTraitsBase : public wxAppTraits
+class WXDLLIMPEXP_CORE wxGUIAppTraitsBase : public wxAppTraits
 {
 public:
 #if wxUSE_LOG

include/wx/artprov.h

@@ -111,7 +111,7 @@ typedef wxString wxArtID;
 // wxArtProvider class
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxArtProvider : public wxObject
+class WXDLLIMPEXP_CORE wxArtProvider : public wxObject
 {
 public:
     // Dtor removes the provider from providers stack if it's still on it

include/wx/bitmap.h

@@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxPalette;
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"
-DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLIMPEXP_CORE)
 #endif
 
 // ----------------------------------------------------------------------------
@@ -42,7 +42,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT)
 
 // TODO: all implementation of wxMask, except the generic one,
 //       do not derive from wxMaskBase,,, they should
-class WXDLLEXPORT wxMaskBase : public wxObject
+class WXDLLIMPEXP_CORE wxMaskBase : public wxObject
 {
 public:
     // create the mask from bitmap pixels of the given colour
@@ -94,7 +94,7 @@ protected:
 // different formats
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmapHandler : public wxObject
+class WXDLLIMPEXP_CORE wxBitmapHandler : public wxObject
 {
 public:
     wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; }
@@ -138,7 +138,7 @@ private:
 // wxBitmap: class which represents platform-dependent bitmap (unlike wxImage)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmapBase : public wxGDIObject
+class WXDLLIMPEXP_CORE wxBitmapBase : public wxGDIObject
 {
 public:
     /*

include/wx/bmpbuttn.h

@@ -19,14 +19,14 @@
 #include "wx/bitmap.h"
 #include "wx/button.h"
 
-extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton: a button which shows bitmaps instead of the usual string.
 // It has different bitmaps for different states (focused/disabled/pressed)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmapButtonBase : public wxButton
+class WXDLLIMPEXP_CORE wxBitmapButtonBase : public wxButton
 {
 public:
     wxBitmapButtonBase()

include/wx/bookctrl.h

@@ -54,7 +54,7 @@ enum
 // wxBookCtrlBase
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBookCtrlBase : public wxControl
+class WXDLLIMPEXP_CORE wxBookCtrlBase : public wxControl
 {
 public:
     // construction
@@ -344,7 +344,7 @@ private:
 // wxBookCtrlBaseEvent: page changing events generated by derived classes
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBookCtrlBaseEvent : public wxNotifyEvent
+class WXDLLIMPEXP_CORE wxBookCtrlBaseEvent : public wxNotifyEvent
 {
 public:
     wxBookCtrlBaseEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,

include/wx/brush.h

@@ -39,7 +39,7 @@ enum wxBrushStyle
 
 
 // wxBrushBase
-class WXDLLEXPORT wxBrushBase: public wxGDIObject
+class WXDLLIMPEXP_CORE wxBrushBase: public wxGDIObject
 {
 public:
     virtual ~wxBrushBase() { }
@@ -94,7 +94,7 @@ public:
 #endif
 };
 
-extern WXDLLEXPORT_DATA(wxBrushList*)   wxTheBrushList;
+extern WXDLLIMPEXP_DATA_CORE(wxBrushList*)   wxTheBrushList;
 
 // provide comparison operators to allow code such as
 //

include/wx/button.h

@@ -47,13 +47,13 @@
 
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
-extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxButton: a push button
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxButtonBase : public wxControl
+class WXDLLIMPEXP_CORE wxButtonBase : public wxControl
 {
 public:
     wxButtonBase() { }

include/wx/caret.h

@@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 // appear. It can be either a solid block or a custom bitmap (TODO)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCaretBase
+class WXDLLIMPEXP_CORE wxCaretBase
 {
 public:
     // ctors
@@ -208,7 +208,7 @@ private:
 #ifdef wxHAS_CARET_USING_OVERLAYS
 
 // we don't need to hide the caret if it's rendered using overlays
-class WXDLLEXPORT wxCaretSuspend
+class WXDLLIMPEXP_CORE wxCaretSuspend
 {
 public:
     wxCaretSuspend(wxWindow *WXUNUSED(win)) {}
@@ -218,7 +218,7 @@ public:
 
 #else // !wxHAS_CARET_USING_OVERLAYS
 
-class WXDLLEXPORT wxCaretSuspend
+class WXDLLIMPEXP_CORE wxCaretSuspend
 {
 public:
     wxCaretSuspend(wxWindow *win)

include/wx/checkbox.h

@@ -49,13 +49,13 @@ enum wxCheckBoxState
 };
 
 
-extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxCheckBox: a control which shows a label and a box which may be checked
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCheckBoxBase : public wxControl
+class WXDLLIMPEXP_CORE wxCheckBoxBase : public wxControl
 {
 public:
     wxCheckBoxBase() { }

include/wx/checklst.h

@@ -20,7 +20,7 @@
 // wxCheckListBox: a listbox whose items may be checked
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCheckListBoxBase : public
+class WXDLLIMPEXP_CORE wxCheckListBoxBase : public
                                               #ifdef __WXWINCE__
                                                   // keep virtuals synchronised
                                                   wxListBoxBase

include/wx/choice.h

@@ -26,13 +26,13 @@
 // global data
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const char) wxChoiceNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxChoiceNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxChoice allows to select one of a non-modifiable list of strings
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
+class WXDLLIMPEXP_CORE wxChoiceBase : public wxControlWithItems
 {
 public:
     wxChoiceBase() { }

include/wx/choicebk.h

@@ -36,7 +36,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING
 // wxChoicebook
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxChoicebook : public wxBookCtrlBase
+class WXDLLIMPEXP_CORE wxChoicebook : public wxBookCtrlBase
 {
 public:
     wxChoicebook()
@@ -118,7 +118,7 @@ private:
 // choicebook event class and related stuff
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxChoicebookEvent : public wxBookCtrlBaseEvent
+class WXDLLIMPEXP_CORE wxChoicebookEvent : public wxBookCtrlBaseEvent
 {
 public:
     wxChoicebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,

include/wx/clipbrd.h

@@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxClipboard;
 // with wxDataObject.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxClipboardBase : public wxObject
+class WXDLLIMPEXP_CORE wxClipboardBase : public wxObject
 {
 public:
     wxClipboardBase() { m_usePrimary = false; }
@@ -129,7 +129,7 @@ public:
 // helpful class for opening the clipboard and automatically closing it
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxClipboardLocker
+class WXDLLIMPEXP_CORE wxClipboardLocker
 {
 public:
     wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL)

include/wx/clrpicker.h

@@ -22,8 +22,8 @@
 
 class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent;
 
-extern WXDLLEXPORT_DATA(const char) wxColourPickerWidgetNameStr[];
-extern WXDLLEXPORT_DATA(const char) wxColourPickerCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxColourPickerWidgetNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxColourPickerCtrlNameStr[];
 
 // show the colour in HTML form (#AABBCC) as colour button label
 #define wxCLRBTN_SHOW_LABEL     100

include/wx/cmdproc.h

@@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenu;
 // wxCommand: a single command capable of performing itself
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCommand : public wxObject
+class WXDLLIMPEXP_CORE wxCommand : public wxObject
 {
 public:
     wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString);
@@ -49,7 +49,7 @@ private:
 // wxCommandProcessor: wxCommand manager
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCommandProcessor : public wxObject
+class WXDLLIMPEXP_CORE wxCommandProcessor : public wxObject
 {
 public:
     // if max number of commands is -1, it is unlimited

include/wx/cmndata.h

@@ -26,7 +26,7 @@
 class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
 
 
-class WXDLLEXPORT wxColourData : public wxObject
+class WXDLLIMPEXP_CORE wxColourData : public wxObject
 {
 public:
     // number of custom colours we store
@@ -64,7 +64,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxColourData)
 };
 
-class WXDLLEXPORT wxFontData : public wxObject
+class WXDLLIMPEXP_CORE wxFontData : public wxObject
 {
 public:
     wxFontData();
@@ -181,7 +181,7 @@ enum wxPrintBin
 
 const int wxPRINTMEDIA_DEFAULT = 0;
 
-class WXDLLEXPORT wxPrintData: public wxObject
+class WXDLLIMPEXP_CORE wxPrintData: public wxObject
 {
 public:
     wxPrintData();
@@ -274,7 +274,7 @@ private:
  * from the dialog.
  */
 
-class WXDLLEXPORT wxPrintDialogData: public wxObject
+class WXDLLIMPEXP_CORE wxPrintDialogData: public wxObject
 {
 public:
     wxPrintDialogData();
@@ -349,7 +349,7 @@ private:
 // Compatibility with old name
 #define wxPageSetupData wxPageSetupDialogData
 
-class WXDLLEXPORT wxPageSetupDialogData: public wxObject
+class WXDLLIMPEXP_CORE wxPageSetupDialogData: public wxObject
 {
 public:
     wxPageSetupDialogData();

include/wx/cocoa/app.h

@@ -22,7 +22,7 @@ typedef const struct __CFString * CFStringRef;
 // ========================================================================
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
-class WXDLLEXPORT wxApp: public wxAppBase
+class WXDLLIMPEXP_CORE wxApp: public wxAppBase
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 // ------------------------------------------------------------------------

include/wx/cocoa/bitmap.h

@@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 // ========================================================================
 
 // A mask is a 1-bit alpha bitmap used for drawing bitmaps transparently.
-class WXDLLEXPORT wxMask: public wxObject
+class WXDLLIMPEXP_CORE wxMask: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxMask)
 public:
@@ -62,7 +62,7 @@ protected:
 // ========================================================================
 // wxBitmap
 // ========================================================================
-class WXDLLEXPORT wxBitmap: public wxGDIObject
+class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject
 {
 // ------------------------------------------------------------------------
 // initialization

include/wx/cocoa/bmpbuttn.h

@@ -17,7 +17,7 @@
 // ========================================================================
 // wxBitmapButton
 // ========================================================================
-class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/brush.h

@@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_CORE wxBrush;
 // ========================================================================
 // wxBrush
 // ========================================================================
-class WXDLLEXPORT wxBrush: public wxBrushBase
+class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
 {
     DECLARE_DYNAMIC_CLASS(wxBrush)
 // ------------------------------------------------------------------------

include/wx/cocoa/button.h

@@ -17,7 +17,7 @@
 // ========================================================================
 // wxButton
 // ========================================================================
-class WXDLLEXPORT wxButton : public wxButtonBase, protected wxCocoaNSButton
+class WXDLLIMPEXP_CORE wxButton : public wxButtonBase, protected wxCocoaNSButton
 {
     DECLARE_DYNAMIC_CLASS(wxButton)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/checkbox.h

@@ -17,7 +17,7 @@
 // ========================================================================
 // wxCheckBox
 // ========================================================================
-class WXDLLEXPORT wxCheckBox: public wxCheckBoxBase , protected wxCocoaNSButton
+class WXDLLIMPEXP_CORE wxCheckBox: public wxCheckBoxBase , protected wxCocoaNSButton
 {
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/checklst.h

@@ -17,7 +17,7 @@
 // ========================================================================
 // wxCheckListBox
 // ========================================================================
-class WXDLLEXPORT wxCheckListBox: public wxCheckListBoxBase //, protected wxCocoaNSTableView
+class WXDLLIMPEXP_CORE wxCheckListBox: public wxCheckListBoxBase //, protected wxCocoaNSTableView
 {
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/choice.h

@@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_BASE wxSortedArrayString;
 // ========================================================================
 // wxChoice
 // ========================================================================
-class WXDLLEXPORT wxChoice: public wxChoiceBase /*, protected wxCocoaNSPopUpButton */, protected wxCocoaNSMenu
+class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase /*, protected wxCocoaNSPopUpButton */, protected wxCocoaNSMenu
 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/colour.h

@@ -19,7 +19,7 @@
 // wxColour
 // ========================================================================
 
-class WXDLLEXPORT wxColour : public wxColourBase
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase
 {
 public:
     // constructors

include/wx/cocoa/combobox.h

@@ -40,7 +40,7 @@ public:
 // ========================================================================
 // wxComboBox
 // ========================================================================
-class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase, protected wxCocoaNSComboBox, protected wxCocoaNSTextField
+class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase, protected wxCocoaNSComboBox, protected wxCocoaNSTextField
 {
     DECLARE_DYNAMIC_CLASS(wxComboBox)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/control.h

@@ -18,7 +18,7 @@
 // wxControl
 // ========================================================================
 
-class WXDLLEXPORT wxControl : public wxControlBase, public wxCocoaNSControl
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase, public wxCocoaNSControl
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
     WX_DECLARE_COCOA_OWNER(NSControl,NSView,NSView)

include/wx/cocoa/cursor.h

@@ -14,7 +14,7 @@
 
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxCursorRefData : public wxGDIRefData
+class WXDLLIMPEXP_CORE wxCursorRefData : public wxGDIRefData
 {
 public:
     wxCursorRefData();
@@ -34,7 +34,7 @@ protected:
 #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
 
 // Cursor
-class WXDLLEXPORT wxCursor: public wxBitmap
+class WXDLLIMPEXP_CORE wxCursor: public wxBitmap
 {
 public:
     wxCursor();
@@ -58,7 +58,7 @@ public:
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
-extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
+extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);
 
 #endif
     // _WX_COCOA_CURSOR_H_

include/wx/cocoa/dcmemory.h

@@ -16,7 +16,7 @@
 
 #include "wx/dcmemory.h"
 
-class WXDLLEXPORT wxMemoryDCImpl: public wxCocoaDCImpl
+class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxCocoaDCImpl
 {
     DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)
 

include/wx/cocoa/dcscreen.h

@@ -15,7 +15,7 @@
 #include "wx/dcscreen.h"
 #include "wx/cocoa/dc.h"
 
-class WXDLLEXPORT wxScreenDCImpl: public wxCocoaDCImpl
+class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxCocoaDCImpl
 {
     DECLARE_DYNAMIC_CLASS(wxScreenDCImpl)
 public:

include/wx/cocoa/dialog.h

@@ -20,7 +20,7 @@
 // ========================================================================
 // wxDialog
 // ========================================================================
-class WXDLLEXPORT wxDialog : public wxDialogBase, protected wxCocoaNSPanel
+class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase, protected wxCocoaNSPanel
 {
     DECLARE_DYNAMIC_CLASS(wxDialog)
     WX_DECLARE_COCOA_OWNER(NSPanel,NSWindow,NSWindow)

include/wx/cocoa/dirdlg.h

@@ -19,7 +19,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSSavePanel);
 // wxDirDialog
 //-------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDirDialog: public wxDirDialogBase
+class WXDLLIMPEXP_CORE wxDirDialog: public wxDirDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxDirDialog)
     DECLARE_NO_COPY_CLASS(wxDirDialog)

include/wx/cocoa/filedlg.h

@@ -19,7 +19,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSSavePanel);
 // wxFileDialog
 //-------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFileDialog: public wxFileDialogBase
+class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_NO_COPY_CLASS(wxFileDialog)

include/wx/cocoa/font.h

@@ -30,7 +30,7 @@ class wxFontRefData;
 
     See the documentation in src/cocoa/font.mm for more implementatoin details.
  */
-class WXDLLEXPORT wxFont : public wxFontBase
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase
 {
     friend class wxCocoaFontFactory;
 public:

include/wx/cocoa/frame.h

@@ -15,7 +15,7 @@
 class WXDLLIMPEXP_FWD_CORE wxMenuBar;
 class WXDLLIMPEXP_FWD_CORE wxStatusBar;
 
-class WXDLLEXPORT wxFrame: public wxFrameBase
+class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase
 {
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)

include/wx/cocoa/gauge.h

@@ -19,7 +19,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSProgressIndicator);
 // ========================================================================
 // wxGauge
 // ========================================================================
-class WXDLLEXPORT wxGauge: public wxGaugeBase// , protected wxCocoaNSProgressIndicator
+class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase// , protected wxCocoaNSProgressIndicator
 {
     DECLARE_DYNAMIC_CLASS(wxGauge)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/icon.h

@@ -18,7 +18,7 @@
 // ========================================================================
 // wxIcon
 // ========================================================================
-class WXDLLEXPORT wxIcon : public wxGDIObject
+class WXDLLIMPEXP_CORE wxIcon : public wxGDIObject
 {
 public:
     wxIcon();

include/wx/cocoa/listbox.h

@@ -19,7 +19,7 @@
 // ========================================================================
 // wxListBox
 // ========================================================================
-class WXDLLEXPORT wxListBox: public wxListBoxBase, protected wxCocoaNSTableView
+class WXDLLIMPEXP_CORE wxListBox: public wxListBoxBase, protected wxCocoaNSTableView
 {
     DECLARE_DYNAMIC_CLASS(wxListBox)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/mbarman.h

@@ -21,7 +21,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(wxMenuBarManagerObserver);
 // ========================================================================
 // wxMenuBarManager
 // ========================================================================
-class WXDLLEXPORT wxMenuBarManager : public wxObject
+class WXDLLIMPEXP_CORE wxMenuBarManager : public wxObject
 {
 // ------------------------------------------------------------------------
 // initialization/destruction

include/wx/cocoa/mdi.h

@@ -24,7 +24,7 @@ WX_DECLARE_EXPORTED_LIST(wxMDIChildFrame, wxCocoaMDIChildFrameList);
 // ========================================================================
 // wxMDIParentFrame
 // ========================================================================
-class WXDLLEXPORT wxMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame
 {
     friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
     DECLARE_EVENT_TABLE()
@@ -96,7 +96,7 @@ protected:
 // ========================================================================
 // wxMDIChildFrame
 // ========================================================================
-class WXDLLEXPORT wxMDIChildFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame
 {
     friend class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame;
     DECLARE_EVENT_TABLE()

include/wx/cocoa/menu.h

@@ -22,7 +22,7 @@
 // wxMenu
 // ========================================================================
 
-class WXDLLEXPORT wxMenu : public wxMenuBase, public wxCocoaNSMenu
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase, public wxCocoaNSMenu
 {
 public:
     // ctors and dtor
@@ -73,7 +73,7 @@ private:
 // ========================================================================
 // wxMenuBar
 // ========================================================================
-class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
+class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
 {
 public:
     // ctors and dtor

include/wx/cocoa/menuitem.h

@@ -25,7 +25,7 @@
 class wxMenuItemCocoa;
 WX_DECLARE_HASH_MAP(WX_NSMenuItem,wxMenuItem*,wxPointerHash,wxPointerEqual,wxMenuItemCocoaHash);
 
-class WXDLLEXPORT wxMenuItemCocoa : public wxMenuItemBase
+class WXDLLIMPEXP_CORE wxMenuItemCocoa : public wxMenuItemBase
 {
 public:
 // ------------------------------------------------------------------------

include/wx/cocoa/msgdlg.h

@@ -39,7 +39,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSAlert);
 
 
 
-class WXDLLEXPORT wxCocoaMessageDialog: public wxMessageDialogBase
+class WXDLLIMPEXP_CORE wxCocoaMessageDialog: public wxMessageDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxCocoaMessageDialog)
     DECLARE_NO_COPY_CLASS(wxCocoaMessageDialog)

include/wx/cocoa/notebook.h

@@ -17,7 +17,7 @@
 // ========================================================================
 // wxNotebook
 // ========================================================================
-class WXDLLEXPORT wxNotebook: public wxNotebookBase, protected wxCocoaNSTabView
+class WXDLLIMPEXP_CORE wxNotebook: public wxNotebookBase, protected wxCocoaNSTabView
 {
     DECLARE_DYNAMIC_CLASS(wxNotebook)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/pen.h

@@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap;
 // ========================================================================
 // wxPen
 // ========================================================================
-class WXDLLEXPORT wxPen: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPen: public wxGDIObject
 {
 public:
     wxPen();

include/wx/cocoa/private/timer.h

@@ -20,7 +20,7 @@
 
 DECLARE_WXCOCOA_OBJC_CLASS(NSTimer);
 
-class WXDLLEXPORT wxCocoaTimerImpl : public wxTimerImpl
+class WXDLLIMPEXP_CORE wxCocoaTimerImpl : public wxTimerImpl
 {
 public:
     wxCocoaTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { Init(); }

include/wx/cocoa/radiobox.h

@@ -18,7 +18,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSMatrix);
 // ========================================================================
 // wxRadioBox
 // ========================================================================
-class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase// , protected wxCocoaNSButton
+class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase// , protected wxCocoaNSButton
 {
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/radiobut.h

@@ -21,7 +21,7 @@ WX_DECLARE_EXPORTED_LIST(wxRadioButton, wxRadioButtonList);
 // ========================================================================
 // wxRadioButton
 // ========================================================================
-class WXDLLEXPORT wxRadioButton: public wxControl, protected wxCocoaNSButton
+class WXDLLIMPEXP_CORE wxRadioButton: public wxControl, protected wxCocoaNSButton
 {
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/region.h

@@ -20,7 +20,7 @@ typedef struct CGRect NSRect;
 typedef struct _NSRect NSRect;
 #endif
 
-class WXDLLEXPORT wxRegion : public wxRegionGeneric
+class WXDLLIMPEXP_CORE wxRegion : public wxRegionGeneric
 {
 public:
     wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
@@ -55,7 +55,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxRegion);
 };
 
-class WXDLLEXPORT wxRegionIterator : public wxRegionIteratorGeneric
+class WXDLLIMPEXP_CORE wxRegionIterator : public wxRegionIteratorGeneric
 {
 //    DECLARE_DYNAMIC_CLASS(wxRegionIteratorGeneric);
 public:

include/wx/cocoa/scrolbar.h

@@ -17,7 +17,7 @@
 // ========================================================================
 // wxScrollBar
 // ========================================================================
-class WXDLLEXPORT wxScrollBar: public wxScrollBarBase, protected wxCocoaNSScroller
+class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase, protected wxCocoaNSScroller
 {
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/slider.h

@@ -19,7 +19,7 @@
 // ========================================================================
 // wxSlider
 // ========================================================================
-class WXDLLEXPORT wxSlider: public wxSliderBase, protected wxCocoaNSSlider
+class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase, protected wxCocoaNSSlider
 {
     DECLARE_DYNAMIC_CLASS(wxSlider)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/spinbutt.h

@@ -17,7 +17,7 @@
 // ========================================================================
 // wxSpinButton
 // ========================================================================
-class WXDLLEXPORT wxSpinButton: public wxSpinButtonBase// , protected wxCocoaNSStepper
+class WXDLLIMPEXP_CORE wxSpinButton: public wxSpinButtonBase// , protected wxCocoaNSStepper
 {
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/statbmp.h

@@ -17,7 +17,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSImageView);
 // ========================================================================
 // wxStaticBitmap
 // ========================================================================
-class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase //, protected wxCocoaNSxxx
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase //, protected wxCocoaNSxxx
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/statbox.h

@@ -17,7 +17,7 @@
 // ========================================================================
 // wxStaticBox
 // ========================================================================
-class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase, protected wxCocoaNSBox
+class WXDLLIMPEXP_CORE wxStaticBox: public wxStaticBoxBase, protected wxCocoaNSBox
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/statline.h

@@ -17,7 +17,7 @@
 // ========================================================================
 // wxStaticLine
 // ========================================================================
-class WXDLLEXPORT wxStaticLine: public wxStaticLineBase// , protected wxCocoaNSButton
+class WXDLLIMPEXP_CORE wxStaticLine: public wxStaticLineBase// , protected wxCocoaNSButton
 {
     DECLARE_DYNAMIC_CLASS(wxStaticLine)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/stattext.h

@@ -17,7 +17,7 @@
 // ========================================================================
 // wxStaticText
 // ========================================================================
-class WXDLLEXPORT wxStaticText : public wxStaticTextBase, protected wxCocoaNSTextField
+class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase, protected wxCocoaNSTextField
 {
     DECLARE_DYNAMIC_CLASS(wxStaticText)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/textctrl.h

@@ -17,7 +17,7 @@
 // ========================================================================
 // wxTextCtrl
 // ========================================================================
-class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase, protected wxCocoaNSTextField
+class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase, protected wxCocoaNSTextField
 {
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
     DECLARE_EVENT_TABLE()

include/wx/cocoa/toplevel.h

@@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenuBar;
 // ========================================================================
 // wxTopLevelWindowCocoa
 // ========================================================================
-class WXDLLEXPORT wxTopLevelWindowCocoa : public wxTopLevelWindowBase, protected wxCocoaNSWindow
+class WXDLLIMPEXP_CORE wxTopLevelWindowCocoa : public wxTopLevelWindowBase, protected wxCocoaNSWindow
 {
     DECLARE_EVENT_TABLE();
     DECLARE_NO_COPY_CLASS(wxTopLevelWindowCocoa);
@@ -126,6 +126,6 @@ protected:
 };
 
 // list of all frames and modeless dialogs
-extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
+extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows;
 
 #endif // __WX_COCOA_TOPLEVEL_H__

include/wx/cocoa/window.h

@@ -43,7 +43,7 @@ class wxCocoaTrackingRectManager;
 // ========================================================================
 // wxWindowCocoa
 // ========================================================================
-class WXDLLEXPORT wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView
+class WXDLLIMPEXP_CORE wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView
 {
     DECLARE_DYNAMIC_CLASS(wxWindowCocoa)
     DECLARE_NO_COPY_CLASS(wxWindowCocoa)

include/wx/colordlg.h

@@ -33,11 +33,10 @@
 class WXDLLIMPEXP_FWD_CORE wxColourData;
 
 // get the colour from user and return it
-wxColour WXDLLEXPORT
-wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
-                    const wxColour& colInit = wxNullColour,
-                    const wxString& caption = wxEmptyString,
-                    wxColourData *data = NULL);
+WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
+                                              const wxColour& colInit = wxNullColour,
+                                              const wxString& caption = wxEmptyString,
+                                              wxColourData *data = NULL);
 
 #endif // wxUSE_COLOURDLG
 

include/wx/colour.h

@@ -50,7 +50,7 @@ const unsigned char wxALPHA_OPAQUE = 0xff;
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"
-DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLIMPEXP_CORE)
 #endif
 
 //-----------------------------------------------------------------------------
@@ -68,7 +68,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT)
 #define wxCOLOUR_IS_GDIOBJECT 1
 #endif
 
-class WXDLLEXPORT wxColourBase : public 
+class WXDLLIMPEXP_CORE wxColourBase : public
 #if wxCOLOUR_IS_GDIOBJECT
     wxGDIObject
 #else
@@ -121,7 +121,7 @@ public:
 
 #if !wxCOLOUR_IS_GDIOBJECT
     virtual bool IsOk() const= 0;
-    
+
     // older version, for backwards compatibility only (but not deprecated
     // because it's still widely used)
     bool Ok() const { return IsOk(); }

include/wx/combo.h

@@ -137,7 +137,7 @@ struct wxComboCtrlFeatures
 };
 
 
-class WXDLLEXPORT wxComboCtrlBase : public wxControl
+class WXDLLIMPEXP_CORE wxComboCtrlBase : public wxControl
 {
     friend class wxComboPopup;
 public:
@@ -645,7 +645,7 @@ enum
 };
 
 
-class WXDLLEXPORT wxComboPopup
+class WXDLLIMPEXP_CORE wxComboPopup
 {
     friend class wxComboCtrlBase;
 public:

include/wx/combobox.h

@@ -16,7 +16,7 @@
 
 #if wxUSE_COMBOBOX
 
-extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement
@@ -25,7 +25,7 @@ extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[];
 #include "wx/ctrlsub.h"
 #include "wx/textentry.h"
 
-class WXDLLEXPORT wxComboBoxBase : public wxItemContainer,
+class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer,
                                    public wxTextEntry
 {
 public:

include/wx/containr.h

@@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 // wxControlContainerBase: common part used in both native and generic cases
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxControlContainerBase
+class WXDLLIMPEXP_CORE wxControlContainerBase
 {
 public:
     // default ctor, SetContainerWindow() must be called later
@@ -163,7 +163,7 @@ protected:                                                                    \
 // ----------------------------------------------------------------------------
 
 // this must be a real class as we forward-declare it elsewhere
-class WXDLLEXPORT wxControlContainer : public wxControlContainerBase
+class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase
 {
 protected:
     // set the focus to the child which had it the last time
@@ -198,7 +198,7 @@ class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent;
 // wxControlContainer for TAB navigation implemented in wx itself
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxControlContainer : public wxControlContainerBase
+class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase
 {
 public:
     // default ctor, SetContainerWindow() must be called later

include/wx/control.h

@@ -22,13 +22,13 @@
 
 #include "wx/window.h"      // base class
 
-extern WXDLLEXPORT_DATA(const char) wxControlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxControlNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxControlBase : public wxWindow
+class WXDLLIMPEXP_CORE wxControlBase : public wxWindow
 {
 public:
     wxControlBase() { }

include/wx/cshelp.h

@@ -36,7 +36,7 @@
  * window for the application to display help for.
  */
 
-class WXDLLEXPORT wxContextHelp : public wxObject
+class WXDLLIMPEXP_CORE wxContextHelp : public wxObject
 {
 public:
     wxContextHelp(wxWindow* win = NULL, bool beginHelp = true);
@@ -65,7 +65,7 @@ private:
  * to put the application into context help mode.
  */
 
-class WXDLLEXPORT wxContextHelpButton : public wxBitmapButton
+class WXDLLIMPEXP_CORE wxContextHelpButton : public wxBitmapButton
 {
 public:
     wxContextHelpButton(wxWindow* parent,
@@ -106,7 +106,7 @@ private:
 // and overriding ShowHelp() but calling the base class version wouldn't work
 // any more, which forces us to use a rather ugly hack and pass the extra
 // parameters of ShowHelpAtPoint() to ShowHelp() via member variables.
-class WXDLLEXPORT wxHelpProvider
+class WXDLLIMPEXP_CORE wxHelpProvider
 {
 public:
     // get/set the current (application-global) help provider (Set() returns
@@ -188,7 +188,7 @@ WX_DECLARE_EXPORTED_HASH_MAP( wxUIntPtr, wxString, wxIntegerHash,
 // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
 // only plain text help strings and shows the string associated with the
 // control (if any) in a tooltip
-class WXDLLEXPORT wxSimpleHelpProvider : public wxHelpProvider
+class WXDLLIMPEXP_CORE wxSimpleHelpProvider : public wxHelpProvider
 {
 public:
     // implement wxHelpProvider methods
@@ -212,7 +212,7 @@ protected:
 // both context identifiers and plain text help strings. If the help text is an integer,
 // it is passed to wxHelpController::DisplayContextPopup. Otherwise, it shows the string
 // in a tooltip as per wxSimpleHelpProvider.
-class WXDLLEXPORT wxHelpControllerHelpProvider : public wxSimpleHelpProvider
+class WXDLLIMPEXP_CORE wxHelpControllerHelpProvider : public wxSimpleHelpProvider
 {
 public:
     // Note that it doesn't own the help controller. The help controller
@@ -236,7 +236,7 @@ protected:
 };
 
 // Convenience function for turning context id into wxString
-WXDLLEXPORT wxString wxContextId(int id);
+WXDLLIMPEXP_CORE wxString wxContextId(int id);
 
 #endif // wxUSE_HELP
 

include/wx/ctrlsub.h

@@ -30,7 +30,7 @@
 // implements an extended interface deriving from this one)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxItemContainerImmutable
+class WXDLLIMPEXP_CORE wxItemContainerImmutable
 {
 public:
     wxItemContainerImmutable() { }
@@ -97,7 +97,7 @@ protected:
 // in this case DoInsertItem() needs to be overridden.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxItemContainer : public wxItemContainerImmutable
+class WXDLLIMPEXP_CORE wxItemContainer : public wxItemContainerImmutable
 {
 private:
     // AppendItems() and InsertItems() helpers just call DoAppend/InsertItems()
@@ -412,7 +412,7 @@ private:
     wxClientData* GetClientObject(unsigned int n) const                    \
         { return wxItemContainer::GetClientObject(n); }
 
-class WXDLLEXPORT wxControlWithItemsBase : public wxControl,
+class WXDLLIMPEXP_CORE wxControlWithItemsBase : public wxControl,
                                            public wxItemContainer
 {
 public:
@@ -446,7 +446,7 @@ private:
 #elif defined(__WXMOTIF__)
     #include "wx/motif/ctrlsub.h"
 #else
-    class WXDLLEXPORT wxControlWithItems : public wxControlWithItemsBase
+    class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsBase
     {
     public:
         wxControlWithItems() { }

include/wx/dataobj.h

@@ -92,7 +92,7 @@ public:
 
 // the value for default argument to some functions (corresponds to
 // wxDF_INVALID)
-extern WXDLLEXPORT const wxDataFormat& wxFormatInvalid;
+extern WXDLLIMPEXP_CORE const wxDataFormat& wxFormatInvalid;
 
 // ----------------------------------------------------------------------------
 // wxDataObject represents a piece of data which knows which formats it
@@ -114,7 +114,7 @@ extern WXDLLEXPORT const wxDataFormat& wxFormatInvalid;
 // to be supported by SetData() or GetDataHere().
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDataObjectBase
+class WXDLLIMPEXP_CORE wxDataObjectBase
 {
 public:
     enum Direction
@@ -194,7 +194,7 @@ public:
 // Otherwise, you should use wxDataObjectComposite or wxDataObject directly.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDataObjectSimple : public wxDataObject
+class WXDLLIMPEXP_CORE wxDataObjectSimple : public wxDataObject
 {
 public:
     // ctor takes the format we support, but it can also be set later with
@@ -261,7 +261,7 @@ private:
 
 WX_DECLARE_EXPORTED_LIST(wxDataObjectSimple, wxSimpleDataObjectList);
 
-class WXDLLEXPORT wxDataObjectComposite : public wxDataObject
+class WXDLLIMPEXP_CORE wxDataObjectComposite : public wxDataObject
 {
 public:
     // ctor
@@ -324,7 +324,7 @@ private:
 // wxTextDataObject contains text data
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTextDataObject : public wxDataObjectSimple
+class WXDLLIMPEXP_CORE wxTextDataObject : public wxDataObjectSimple
 {
 public:
     // ctor: you can specify the text here or in SetText(), or override
@@ -392,7 +392,7 @@ private:
 // wxBitmapDataObject contains a bitmap
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmapDataObjectBase : public wxDataObjectSimple
+class WXDLLIMPEXP_CORE wxBitmapDataObjectBase : public wxDataObjectSimple
 {
 public:
     // ctor: you can specify the bitmap here or in SetBitmap(), or override
@@ -420,7 +420,7 @@ protected:
 //     data from drag and drop operation.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFileDataObjectBase : public wxDataObjectSimple
+class WXDLLIMPEXP_CORE wxFileDataObjectBase : public wxDataObjectSimple
 {
 public:
     // ctor: use AddFile() later to fill the array
@@ -441,7 +441,7 @@ protected:
 // It is understood that this data can be copied bitwise.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCustomDataObject : public wxDataObjectSimple
+class WXDLLIMPEXP_CORE wxCustomDataObject : public wxDataObjectSimple
 {
 public:
     // if you don't specify the format in the ctor, you can still use
@@ -523,7 +523,7 @@ private:
     #endif
 
     // wxURLDataObject is simply wxTextDataObject with a different name
-    class WXDLLEXPORT wxURLDataObject : public wxTextDataObject
+    class WXDLLIMPEXP_CORE wxURLDataObject : public wxTextDataObject
     {
     public:
         wxURLDataObject(const wxString& url = wxEmptyString)

include/wx/dc.h

@@ -46,7 +46,7 @@ class WXDLLIMPEXP_FWD_CORE wxPrintData;
 // wxDrawObject helper class
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDrawObject
+class WXDLLIMPEXP_CORE wxDrawObject
 {
 public:
 
@@ -1108,7 +1108,7 @@ private:
 // restore it automatically when the object goes out of scope
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDCTextColourChanger
+class WXDLLIMPEXP_CORE wxDCTextColourChanger
 {
 public:
     wxDCTextColourChanger(wxDC& dc) : m_dc(dc), m_colFgOld() { }
@@ -1144,7 +1144,7 @@ private:
 // restore it automatically when the object goes out of scope
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDCPenChanger
+class WXDLLIMPEXP_CORE wxDCPenChanger
 {
 public:
     wxDCPenChanger(wxDC& dc, const wxPen& pen) : m_dc(dc), m_penOld(dc.GetPen())
@@ -1171,7 +1171,7 @@ private:
 // restore it automatically when the object goes out of scope
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDCBrushChanger
+class WXDLLIMPEXP_CORE wxDCBrushChanger
 {
 public:
     wxDCBrushChanger(wxDC& dc, const wxBrush& brush) : m_dc(dc), m_brushOld(dc.GetBrush())
@@ -1198,7 +1198,7 @@ private:
 // destroys it in the dtor
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDCClipper
+class WXDLLIMPEXP_CORE wxDCClipper
 {
 public:
     wxDCClipper(wxDC& dc, const wxRegion& r) : m_dc(dc)

include/wx/dcgraph.h

@@ -21,7 +21,7 @@
 class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 
 
-class WXDLLEXPORT wxGCDC: public wxDC
+class WXDLLIMPEXP_CORE wxGCDC: public wxDC
 {
 public:
     wxGCDC( const wxWindowDC& dc );
@@ -37,7 +37,7 @@ public:
 };
 
 
-class WXDLLEXPORT wxGCDCImpl: public wxDCImpl
+class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl
 {
 public:
     wxGCDCImpl( wxDC *owner, const wxWindowDC& dc );

include/wx/dcmirror.h

@@ -18,7 +18,7 @@
 // wxMirrorDC allows to write the same code for horz/vertical layout
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMirrorDCImpl : public wxDCImpl
+class WXDLLIMPEXP_CORE wxMirrorDCImpl : public wxDCImpl
 {
 public:
     // constructs a mirror DC associated with the given real DC
@@ -275,7 +275,7 @@ private:
     DECLARE_NO_COPY_CLASS(wxMirrorDCImpl)
 };
 
-class WXDLLEXPORT wxMirrorDC : public wxDC
+class WXDLLIMPEXP_CORE wxMirrorDC : public wxDC
 {
 public:
     wxMirrorDC(wxDC& dc, bool mirror)

include/wx/dialog.h

@@ -53,9 +53,9 @@ enum wxDialogLayoutAdaptationMode
     wxDIALOG_ADAPTATION_MODE_DISABLED = 2   // disable this dialog overriding global status
 };
 
-extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
 
-class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
+class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow
 {
 public:
     enum
@@ -235,7 +235,7 @@ private:
  * a help mechanism.
  */
 
-class WXDLLEXPORT wxDialogLayoutAdapter: public wxObject
+class WXDLLIMPEXP_CORE wxDialogLayoutAdapter: public wxObject
 {
     DECLARE_CLASS(wxDialogLayoutAdapter)
 public:
@@ -253,7 +253,7 @@ public:
  *
  */
 
-class WXDLLEXPORT wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter
+class WXDLLIMPEXP_CORE wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter
 {
     DECLARE_CLASS(wxStandardDialogLayoutAdapter)
 public:

include/wx/dialup.h

@@ -43,7 +43,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
  *    main thread?
  */
 
-class WXDLLEXPORT wxDialUpManager
+class WXDLLIMPEXP_CORE wxDialUpManager
 {
 public:
     // this function should create and return the object of the
@@ -156,7 +156,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DIALUP_CONNECTED;
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DIALUP_DISCONNECTED;
 
 // the event class for the dialup events
-class WXDLLEXPORT wxDialUpEvent : public wxEvent
+class WXDLLIMPEXP_CORE wxDialUpEvent : public wxEvent
 {
 public:
     wxDialUpEvent(bool isConnected, bool isOwnEvent) : wxEvent(isOwnEvent)

include/wx/dirdlg.h

@@ -20,9 +20,9 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[];
-extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[];
-extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogDefaultFolderStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[];
 
 #define wxDD_CHANGE_DIR         0x0100
 #define wxDD_DIR_MUST_EXIST     0x0200
@@ -40,7 +40,7 @@ extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[];
 // wxDirDialogBase
 //-------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDirDialogBase : public wxDialog
+class WXDLLIMPEXP_CORE wxDirDialogBase : public wxDialog
 {
 public:
     wxDirDialogBase() {}
@@ -128,7 +128,7 @@ protected:
 // common ::wxDirSelector() function
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,
               long style = wxDD_DEFAULT_STYLE,

include/wx/display.h

@@ -22,7 +22,7 @@
     WX_DECLARE_EXPORTED_OBJARRAY(wxVideoMode, wxArrayVideoModes);
 
     // default, uninitialized, video mode object
-    extern WXDLLEXPORT_DATA(const wxVideoMode) wxDefaultVideoMode;
+    extern WXDLLIMPEXP_DATA_CORE(const wxVideoMode) wxDefaultVideoMode;
 #endif // wxUSE_DISPLAY
 
 class WXDLLIMPEXP_FWD_CORE wxWindow;
@@ -37,7 +37,7 @@ class WXDLLIMPEXP_FWD_CORE wxDisplayImpl;
 // wxDisplay: represents a display/monitor attached to the system
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDisplay
+class WXDLLIMPEXP_CORE wxDisplay
 {
 public:
     // initialize the object containing all information about the given

include/wx/display_impl.h

@@ -17,7 +17,7 @@
 // wxDisplayFactory: allows to create wxDisplay objects
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDisplayFactory
+class WXDLLIMPEXP_CORE wxDisplayFactory
 {
 public:
     wxDisplayFactory() { }
@@ -44,7 +44,7 @@ public:
 // wxDisplayImpl: base class for all wxDisplay implementations
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDisplayImpl
+class WXDLLIMPEXP_CORE wxDisplayImpl
 {
 public:
     // virtual dtor for this base class
@@ -98,7 +98,7 @@ protected:
 
 // this is a stub implementation using single/main display only, it is
 // available even if wxUSE_DISPLAY == 0
-class WXDLLEXPORT wxDisplayFactorySingle : public wxDisplayFactory
+class WXDLLIMPEXP_CORE wxDisplayFactorySingle : public wxDisplayFactory
 {
 public:
     virtual wxDisplayImpl *CreateDisplay(unsigned n);

include/wx/dlimpexp.h

@@ -67,7 +67,7 @@
    support arbitrary combinations of libs/DLLs: either we build all of them as
    DLLs (in which case WXMAKINGDLL is defined) or none (it isn't).
 
-   However we have a problem because we need separate WXDLLEXPORT versions for
+   However we have a problem because we need separate WXDLLIMPEXP versions for
    different libraries as, for example, wxString class should be dllexported
    when compiled in wxBase and dllimported otherwise, so we do define separate
    WXMAKING/USINGDLL_XYZ constants for each component XYZ.
@@ -92,7 +92,7 @@
 #endif /* WXMAKINGDLL */
 
 /*
-   WXDLLEXPORT maps to export declaration when building the DLL, to import
+   WXDLLIMPEXP_CORE maps to export declaration when building the DLL, to import
    declaration if using it or to nothing at all if we don't use wxWin as DLL
  */
 #ifdef WXMAKINGDLL_BASE
@@ -273,7 +273,7 @@
     #else
         /*
            We need to disable this warning when using this macro, as
-           recommended by Microsoft itself: 
+           recommended by Microsoft itself:
 
            http://support.microsoft.com/default.aspx?scid=kb%3ben-us%3b168958
          */

include/wx/dnd.h

@@ -47,14 +47,14 @@ enum wxDragResult
 
 // return true if res indicates that something was done during a dnd operation,
 // i.e. is neither error nor none nor cancel
-WXDLLEXPORT bool wxIsDragResultOk(wxDragResult res);
+WXDLLIMPEXP_CORE bool wxIsDragResultOk(wxDragResult res);
 
 // ----------------------------------------------------------------------------
 // wxDropSource is the object you need to create (and call DoDragDrop on it)
 // to initiate a drag-and-drop operation
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDropSourceBase
+class WXDLLIMPEXP_CORE wxDropSourceBase
 {
 public:
     wxDropSourceBase(const wxCursor &cursorCopy = wxNullCursor,
@@ -129,7 +129,7 @@ protected:
 // OnData() is called)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDropTargetBase
+class WXDLLIMPEXP_CORE wxDropTargetBase
 {
 public:
     // ctor takes a pointer to heap-allocated wxDataObject which will be owned
@@ -233,7 +233,7 @@ protected:
 
 // A simple wxDropTarget derived class for text data: you only need to
 // override OnDropText() to get something working
-class WXDLLEXPORT wxTextDropTarget : public wxDropTarget
+class WXDLLIMPEXP_CORE wxTextDropTarget : public wxDropTarget
 {
 public:
     wxTextDropTarget();
@@ -247,7 +247,7 @@ private:
 };
 
 // A drop target which accepts files (dragged from File Manager or Explorer)
-class WXDLLEXPORT wxFileDropTarget : public wxDropTarget
+class WXDLLIMPEXP_CORE wxFileDropTarget : public wxDropTarget
 {
 public:
     wxFileDropTarget();

include/wx/docmdi.h

@@ -23,7 +23,7 @@
  * Use this instead of wxMDIParentFrame
  */
 
-class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame
+class WXDLLIMPEXP_CORE wxDocMDIParentFrame: public wxMDIParentFrame
 {
 public:
     wxDocMDIParentFrame();
@@ -58,7 +58,7 @@ private:
  * Use this instead of wxMDIChildFrame
  */
 
-class WXDLLEXPORT wxDocMDIChildFrame: public wxMDIChildFrame
+class WXDLLIMPEXP_CORE wxDocMDIChildFrame: public wxMDIChildFrame
 {
 public:
     wxDocMDIChildFrame();

include/wx/docview.h

@@ -60,7 +60,7 @@ enum
 
 #define wxMAX_FILE_HISTORY 9
 
-class WXDLLEXPORT wxDocument : public wxEvtHandler
+class WXDLLIMPEXP_CORE wxDocument : public wxEvtHandler
 {
 public:
     wxDocument(wxDocument *parent = (wxDocument *) NULL);
@@ -181,7 +181,7 @@ private:
     DECLARE_NO_COPY_CLASS(wxDocument)
 };
 
-class WXDLLEXPORT wxView: public wxEvtHandler
+class WXDLLIMPEXP_CORE wxView: public wxEvtHandler
 {
 public:
     //  wxView(wxDocument *doc = (wxDocument *) NULL);
@@ -241,7 +241,7 @@ private:
 };
 
 // Represents user interface (and other) properties of documents and views
-class WXDLLEXPORT wxDocTemplate: public wxObject
+class WXDLLIMPEXP_CORE wxDocTemplate: public wxObject
 {
 
 friend class WXDLLIMPEXP_FWD_CORE wxDocManager;
@@ -322,7 +322,7 @@ private:
 
 // One object of this class may be created in an application, to manage all
 // the templates and documents.
-class WXDLLEXPORT wxDocManager: public wxEvtHandler
+class WXDLLIMPEXP_CORE wxDocManager: public wxEvtHandler
 {
 public:
     wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true);
@@ -475,7 +475,7 @@ inline size_t wxDocManager::GetNoHistoryFiles() const
 // A default child frame
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDocChildFrame : public wxFrame
+class WXDLLIMPEXP_CORE wxDocChildFrame : public wxFrame
 {
 public:
     wxDocChildFrame(wxDocument *doc,
@@ -515,7 +515,7 @@ private:
 // A default parent frame
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDocParentFrame : public wxFrame
+class WXDLLIMPEXP_CORE wxDocParentFrame : public wxFrame
 {
 public:
     wxDocParentFrame();
@@ -561,7 +561,7 @@ private:
 // ----------------------------------------------------------------------------
 
 #if wxUSE_PRINTING_ARCHITECTURE
-class WXDLLEXPORT wxDocPrintout : public wxPrintout
+class WXDLLIMPEXP_CORE wxDocPrintout : public wxPrintout
 {
 public:
     wxDocPrintout(wxView *view = (wxView *) NULL, const wxString& title = wxT("Printout"));
@@ -585,7 +585,7 @@ private:
 // File history management
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFileHistory : public wxObject
+class WXDLLIMPEXP_CORE wxFileHistory : public wxObject
 {
 public:
     wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1);
@@ -651,13 +651,13 @@ inline size_t wxFileHistory::GetNoHistoryFiles() const
 #if wxUSE_STD_IOSTREAM
 // For compatibility with existing file formats:
 // converts from/to a stream to/from a temporary file.
-bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream);
-bool WXDLLEXPORT wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename);
+bool WXDLLIMPEXP_CORE wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream);
+bool WXDLLIMPEXP_CORE wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename);
 #else
 // For compatibility with existing file formats:
 // converts from/to a stream to/from a temporary file.
-bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, wxOutputStream& stream);
-bool WXDLLEXPORT wxTransferStreamToFile(wxInputStream& stream, const wxString& filename);
+bool WXDLLIMPEXP_CORE wxTransferFileToStream(const wxString& filename, wxOutputStream& stream);
+bool WXDLLIMPEXP_CORE wxTransferStreamToFile(wxInputStream& stream, const wxString& filename);
 #endif // wxUSE_STD_IOSTREAM
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE

include/wx/dynarray.h

@@ -633,7 +633,7 @@ private:                                                                 \
     WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, wxARRAY_DEFAULT_EXPORT)
 
 #define WX_DECLARE_EXPORTED_BASEARRAY(T, name)                    \
-    WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, WXDLLEXPORT)
+    WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, WXDLLIMPEXP_CORE)
 
 #define WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, expmode)      \
     typedef T _wxArray##name;                                     \
@@ -654,10 +654,10 @@ private:                                                                 \
     WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class wxARRAY_DEFAULT_EXPORT)
 
 #define WX_DEFINE_EXPORTED_TYPEARRAY(T, name, base)               \
-    WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class WXDLLEXPORT)
+    WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class WXDLLIMPEXP_CORE)
 
 #define WX_DEFINE_EXPORTED_TYPEARRAY_PTR(T, name, base)               \
-    WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class WXDLLEXPORT)
+    WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class WXDLLIMPEXP_CORE)
 
 #define WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, base, expdecl) \
     WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class expdecl)
@@ -710,7 +710,7 @@ private:                                                                 \
                                              wxARRAY_DEFAULT_EXPORT)
 
 #define WX_DEFINE_SORTED_EXPORTED_TYPEARRAY(T, name, base)                \
-    WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, WXDLLEXPORT)
+    WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, WXDLLIMPEXP_CORE)
 
 #define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, expmode)  \
     typedef T _wxArray##name;                                             \
@@ -736,7 +736,7 @@ private:                                                                 \
 
 #define WX_DEFINE_SORTED_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base)      \
     WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base,     \
-                                                 WXDLLEXPORT)
+                                                 WXDLLIMPEXP_CORE)
 
 #define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base, \
                                                      expmode)                \
@@ -789,7 +789,7 @@ private:                                                                 \
     WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, wxARRAY_DEFAULT_EXPORT)
 
 #define WX_DECLARE_EXPORTED_OBJARRAY(T, name)               \
-    WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, WXDLLEXPORT)
+    WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, WXDLLIMPEXP_CORE)
 
 #define WX_DECLARE_OBJARRAY_WITH_DECL(T, name, decl) \
     typedef T _wxObjArray##name;                            \

include/wx/effects.h

@@ -28,7 +28,7 @@
 #include "wx/gdicmn.h"
 #include "wx/dc.h"
 
-class WXDLLEXPORT wxEffectsImpl: public wxObject
+class WXDLLIMPEXP_CORE wxEffectsImpl: public wxObject
 {
 public:
     // Assume system colours

include/wx/encinfo.h

@@ -32,7 +32,7 @@
 // to create a font of non-standard encoding (like KOI8) under Windows - the
 // facename specifies the encoding then)
 
-struct WXDLLEXPORT wxNativeEncodingInfo
+struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
 {
     wxString facename;          // may be empty meaning "any"
 #ifndef __WXPALMOS__

include/wx/evtloop.h

@@ -123,7 +123,7 @@ protected:
 
 class WXDLLIMPEXP_FWD_CORE wxEventLoopImpl;
 
-class WXDLLEXPORT wxGUIEventLoop : public wxEventLoopBase
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase
 {
 public:
     wxGUIEventLoop() { m_impl = NULL; }
@@ -174,7 +174,7 @@ inline bool wxEventLoopBase::IsRunning() const { return GetActive() == this; }
 // implement modality, we will surely need platform-specific implementations
 // too, this generic implementation is here only temporarily to see how it
 // works
-class WXDLLEXPORT wxModalEventLoop : public wxGUIEventLoop
+class WXDLLIMPEXP_CORE wxModalEventLoop : public wxGUIEventLoop
 {
 public:
     wxModalEventLoop(wxWindow *winModal)

include/wx/fdrepdlg.h

@@ -60,7 +60,7 @@ enum wxFindReplaceDialogStyles
 // wxFindReplaceData: holds Setup Data/Feedback Data for wxFindReplaceDialog
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFindReplaceData : public wxObject
+class WXDLLIMPEXP_CORE wxFindReplaceData : public wxObject
 {
 public:
     wxFindReplaceData() { Init(); }
@@ -93,7 +93,7 @@ private:
 // wxFindReplaceDialogBase
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFindReplaceDialogBase : public wxDialog
+class WXDLLIMPEXP_CORE wxFindReplaceDialogBase : public wxDialog
 {
 public:
     // ctors and such
@@ -137,7 +137,7 @@ protected:
 // wxFindReplaceDialog events
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFindDialogEvent : public wxCommandEvent
+class WXDLLIMPEXP_CORE wxFindDialogEvent : public wxCommandEvent
 {
 public:
     wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0)

include/wx/filectrl.h

@@ -29,7 +29,7 @@ enum
 };
 
 #define wxFC_DEFAULT_STYLE wxFC_OPEN
-extern WXDLLEXPORT_DATA( const wxChar ) wxFileCtrlNameStr[]; // in filectrlcmn.cpp
+extern WXDLLIMPEXP_DATA_CORE( const wxChar ) wxFileCtrlNameStr[]; // in filectrlcmn.cpp
 
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_SELECTIONCHANGED;
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_FILEACTIVATED;

include/wx/filedlg.h

@@ -58,15 +58,15 @@ enum
 
 #define wxFD_DEFAULT_STYLE      wxFD_OPEN
 
-extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[];
-extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[];
-extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFileDialogNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorPromptStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[];
 
 //----------------------------------------------------------------------------
 // wxFileDialogBase
 //----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFileDialogBase: public wxDialog
+class WXDLLIMPEXP_CORE wxFileDialogBase: public wxDialog
 {
 public:
     wxFileDialogBase () { Init(); }
@@ -170,7 +170,7 @@ private:
 //----------------------------------------------------------------------------
 
 // File selector - backward compatibility
-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString
 wxFileSelector(const wxString& message = wxFileSelectorPromptStr,
                const wxString& default_path = wxEmptyString,
                const wxString& default_filename = wxEmptyString,
@@ -181,7 +181,7 @@ wxFileSelector(const wxString& message = wxFileSelectorPromptStr,
                int x = wxDefaultCoord, int y = wxDefaultCoord);
 
 // An extended version of wxFileSelector
-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString
 wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
                  const wxString& default_path = wxEmptyString,
                  const wxString& default_filename = wxEmptyString,
@@ -192,14 +192,14 @@ wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
                  int x = wxDefaultCoord, int y = wxDefaultCoord);
 
 // Ask for filename to load
-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString
 wxLoadFileSelector(const wxString& what,
                    const wxString& extension,
                    const wxString& default_name = wxEmptyString,
                    wxWindow *parent = NULL);
 
 // Ask for filename to save
-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString
 wxSaveFileSelector(const wxString& what,
                    const wxString& extension,
                    const wxString& default_name = wxEmptyString,

include/wx/filepicker.h

@@ -22,15 +22,15 @@
 class WXDLLIMPEXP_FWD_CORE wxDialog;
 class WXDLLIMPEXP_FWD_CORE wxFileDirPickerEvent;
 
-extern WXDLLEXPORT_DATA(const char) wxFilePickerWidgetLabel[];
-extern WXDLLEXPORT_DATA(const char) wxFilePickerWidgetNameStr[];
-extern WXDLLEXPORT_DATA(const char) wxFilePickerCtrlNameStr[];
-extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFilePickerWidgetLabel[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFilePickerWidgetNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFilePickerCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorPromptStr[];
 
-extern WXDLLEXPORT_DATA(const char) wxDirPickerWidgetLabel[];
-extern WXDLLEXPORT_DATA(const char) wxDirPickerWidgetNameStr[];
-extern WXDLLEXPORT_DATA(const char) wxDirPickerCtrlNameStr[];
-extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirPickerWidgetLabel[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirPickerWidgetNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirPickerCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[];
 
 
 // ----------------------------------------------------------------------------

include/wx/font.h

@@ -108,7 +108,7 @@ enum
 
 class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo;
 
-class WXDLLEXPORT wxFontBase : public wxGDIObject
+class WXDLLIMPEXP_CORE wxFontBase : public wxGDIObject
 {
 public:
     // creator function
@@ -276,7 +276,7 @@ public:
 #endif
 };
 
-extern WXDLLEXPORT_DATA(wxFontList*)    wxTheFontList;
+extern WXDLLIMPEXP_DATA_CORE(wxFontList*)    wxTheFontList;
 
 #endif
     // _WX_FONT_H_BASE_

include/wx/fontdlg.h

@@ -23,7 +23,7 @@
 // wxFontDialog interface
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFontDialogBase : public wxDialog
+class WXDLLIMPEXP_CORE wxFontDialogBase : public wxDialog
 {
 public:
     // create the font dialog
@@ -74,7 +74,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
-#if defined( __WXMAC_OSX__ ) 
+#if defined( __WXMAC_OSX__ )
 //set to 1 to use native mac font and color dialogs
 #define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1
 #else
@@ -108,9 +108,9 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 
 // get the font from user and return it, returns wxNullFont if the dialog was
 // cancelled
-wxFont WXDLLEXPORT
-wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
-                  const wxFont& fontInit = wxNullFont, const wxString& caption = wxEmptyString);
+WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
+                                          const wxFont& fontInit = wxNullFont,
+                                          const wxString& caption = wxEmptyString);
 
 #endif // wxUSE_FONTDLG
 

include/wx/fontenum.h

@@ -25,7 +25,7 @@
 // fonts with given attributes
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFontEnumerator
+class WXDLLIMPEXP_CORE wxFontEnumerator
 {
 public:
     wxFontEnumerator() {}

include/wx/fontpicker.h

@@ -22,8 +22,8 @@
 
 class WXDLLIMPEXP_FWD_CORE wxFontPickerEvent;
 
-extern WXDLLEXPORT_DATA(const char) wxFontPickerWidgetNameStr[];
-extern WXDLLEXPORT_DATA(const char) wxFontPickerCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFontPickerWidgetNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFontPickerCtrlNameStr[];
 
 
 // ----------------------------------------------------------------------------

include/wx/fontutil.h

@@ -65,7 +65,7 @@ enum wxXLFDField
 // functions, the user code can only get the objects of this type from
 // somewhere and pass it somewhere else (possibly save them somewhere using
 // ToString() and restore them using FromString())
-class WXDLLEXPORT wxNativeFontInfo
+class WXDLLIMPEXP_CORE wxNativeFontInfo
 {
 public:
 #if wxUSE_PANGO

include/wx/frame.h

@@ -19,8 +19,8 @@
 #include "wx/toplevel.h"      // the base class
 
 // the default names for various classs
-extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[];
-extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[];
 
 class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxMenuBar;
@@ -50,7 +50,7 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar;
 // CreateXXXBar() is called.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow
+class WXDLLIMPEXP_CORE wxFrameBase : public wxTopLevelWindow
 {
 public:
     // construction

include/wx/gauge.h

@@ -41,13 +41,13 @@
     #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0
 #endif
 
-extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGaugeBase : public wxControl
+class WXDLLIMPEXP_CORE wxGaugeBase : public wxControl
 {
 public:
     wxGaugeBase() { m_rangeMax = m_gaugePos = 0; }

include/wx/gbsizer.h

@@ -28,7 +28,7 @@
 // is used for this and also for wxGridCellCoords.
 //---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGBPosition
+class WXDLLIMPEXP_CORE wxGBPosition
 {
 public:
     wxGBPosition() : m_row(0), m_col(0) {}
@@ -50,7 +50,7 @@ private:
 };
 
 
-class WXDLLEXPORT wxGBSpan
+class WXDLLIMPEXP_CORE wxGBSpan
 {
 public:
     wxGBSpan() : m_rowspan(1), m_colspan(1) {}
@@ -72,7 +72,7 @@ private:
 };
 
 
-extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan;
+extern WXDLLIMPEXP_DATA_CORE(const wxGBSpan) wxDefaultSpan;
 
 
 //---------------------------------------------------------------------------
@@ -82,7 +82,7 @@ extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan;
 class WXDLLIMPEXP_FWD_CORE wxGridBagSizer;
 
 
-class WXDLLEXPORT wxGBSizerItem : public wxSizerItem
+class WXDLLIMPEXP_CORE wxGBSizerItem : public wxSizerItem
 {
 public:
     // spacer
@@ -165,7 +165,7 @@ private:
 //---------------------------------------------------------------------------
 
 
-class WXDLLEXPORT wxGridBagSizer : public wxFlexGridSizer
+class WXDLLIMPEXP_CORE wxGridBagSizer : public wxFlexGridSizer
 {
 public:
     wxGridBagSizer(int vgap = 0, int hgap = 0 );

include/wx/gdicmn.h

@@ -206,7 +206,7 @@ enum wxStockCursor
 // wxSize
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxSize
+class WXDLLIMPEXP_CORE wxSize
 {
 public:
     // members are public for compatibility, don't use them directly.
@@ -313,7 +313,7 @@ inline wxSize operator*(int i, const wxSize& s)
 // Point classes: with real or integer coordinates
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxRealPoint
+class WXDLLIMPEXP_CORE wxRealPoint
 {
 public:
     double x;
@@ -352,7 +352,7 @@ inline wxRealPoint operator-(const wxRealPoint& p1, const wxRealPoint& p2)
 // wxPoint: 2D point with integer coordinates
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPoint
+class WXDLLIMPEXP_CORE wxPoint
 {
 public:
     int x, y;
@@ -425,7 +425,7 @@ WX_DECLARE_LIST_WITH_DECL(wxPoint, wxPointList, class WXDLLIMPEXP_CORE);
 // wxRect
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxRect
+class WXDLLIMPEXP_CORE wxRect
 {
 public:
     wxRect()
@@ -620,7 +620,7 @@ protected:
 
 WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap);
 
-class WXDLLEXPORT wxColourDatabase
+class WXDLLIMPEXP_CORE wxColourDatabase
 {
 public:
     wxColourDatabase();
@@ -653,7 +653,7 @@ private:
     wxStringToColourHashMap *m_map;
 };
 
-class WXDLLEXPORT wxResourceCache: public wxList
+class WXDLLIMPEXP_CORE wxResourceCache: public wxList
 {
 public:
     wxResourceCache() { }
@@ -780,50 +780,50 @@ protected:
 #define wxSTANDARD_CURSOR   wxStockGDI::GetCursor(wxStockGDI::CURSOR_STANDARD)
 
 // 'Null' objects
-extern WXDLLEXPORT_DATA(wxBitmap)     wxNullBitmap;
-extern WXDLLEXPORT_DATA(wxIcon)       wxNullIcon;
-extern WXDLLEXPORT_DATA(wxCursor)     wxNullCursor;
-extern WXDLLEXPORT_DATA(wxPen)        wxNullPen;
-extern WXDLLEXPORT_DATA(wxBrush)      wxNullBrush;
-extern WXDLLEXPORT_DATA(wxPalette)    wxNullPalette;
-extern WXDLLEXPORT_DATA(wxFont)       wxNullFont;
-extern WXDLLEXPORT_DATA(wxColour)     wxNullColour;
-extern WXDLLEXPORT_DATA(wxIconBundle) wxNullIconBundle;
+extern WXDLLIMPEXP_DATA_CORE(wxBitmap)     wxNullBitmap;
+extern WXDLLIMPEXP_DATA_CORE(wxIcon)       wxNullIcon;
+extern WXDLLIMPEXP_DATA_CORE(wxCursor)     wxNullCursor;
+extern WXDLLIMPEXP_DATA_CORE(wxPen)        wxNullPen;
+extern WXDLLIMPEXP_DATA_CORE(wxBrush)      wxNullBrush;
+extern WXDLLIMPEXP_DATA_CORE(wxPalette)    wxNullPalette;
+extern WXDLLIMPEXP_DATA_CORE(wxFont)       wxNullFont;
+extern WXDLLIMPEXP_DATA_CORE(wxColour)     wxNullColour;
+extern WXDLLIMPEXP_DATA_CORE(wxIconBundle) wxNullIconBundle;
 
-extern WXDLLEXPORT_DATA(wxColourDatabase*)  wxTheColourDatabase;
+extern WXDLLIMPEXP_DATA_CORE(wxColourDatabase*)  wxTheColourDatabase;
 
-extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[];
 
-extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
-extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;
+extern WXDLLIMPEXP_DATA_CORE(const wxSize) wxDefaultSize;
+extern WXDLLIMPEXP_DATA_CORE(const wxPoint) wxDefaultPosition;
 
 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------
 
 // resource management
-extern void WXDLLEXPORT wxInitializeStockLists();
-extern void WXDLLEXPORT wxDeleteStockLists();
+extern void WXDLLIMPEXP_CORE wxInitializeStockLists();
+extern void WXDLLIMPEXP_CORE wxDeleteStockLists();
 
 // is the display colour (or monochrome)?
-extern bool WXDLLEXPORT wxColourDisplay();
+extern bool WXDLLIMPEXP_CORE wxColourDisplay();
 
 // Returns depth of screen
-extern int WXDLLEXPORT wxDisplayDepth();
+extern int WXDLLIMPEXP_CORE wxDisplayDepth();
 #define wxGetDisplayDepth wxDisplayDepth
 
 // get the display size
-extern void WXDLLEXPORT wxDisplaySize(int *width, int *height);
-extern wxSize WXDLLEXPORT wxGetDisplaySize();
-extern void WXDLLEXPORT wxDisplaySizeMM(int *width, int *height);
-extern wxSize WXDLLEXPORT wxGetDisplaySizeMM();
+extern void WXDLLIMPEXP_CORE wxDisplaySize(int *width, int *height);
+extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize();
+extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height);
+extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM();
 
 // Get position and size of the display workarea
-extern void WXDLLEXPORT wxClientDisplayRect(int *x, int *y, int *width, int *height);
-extern wxRect WXDLLEXPORT wxGetClientDisplayRect();
+extern void WXDLLIMPEXP_CORE wxClientDisplayRect(int *x, int *y, int *width, int *height);
+extern wxRect WXDLLIMPEXP_CORE wxGetClientDisplayRect();
 
 // set global cursor
-extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
+extern void WXDLLIMPEXP_CORE wxSetCursor(const wxCursor& cursor);
 
 #endif
     // _WX_GDICMNH__