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/palmos/accel.h

@@ -16,7 +16,7 @@
 // the accel table has all accelerators for a given window or menu
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxAcceleratorTable : public wxObject
+class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject
 {
 public:
     // default ctor

include/wx/palmos/app.h

@@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_BASE wxLog;
 
 // 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)
 
@@ -84,8 +84,7 @@ protected:
     #define SW_SHOWNORMAL 1
 #endif
 
-extern int WXDLLEXPORT
-wxEntry();
+extern WXDLLIMPEXP_CORE int wxEntry();
 
 #define IMPLEMENT_WXWIN_MAIN                                              \
                                                                           \

include/wx/palmos/bitmap.h

@@ -35,7 +35,7 @@ class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 // wxBitmap: a mono or colour bitmap
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmap : public wxGDIImage
+class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage
 {
 public:
     // default ctor creates an invalid bitmap, you must Create() it later
@@ -176,7 +176,7 @@ private:
 // wxMask: a mono bitmap used for drawing bitmaps transparently.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMask : public wxObject
+class WXDLLIMPEXP_CORE wxMask : public wxObject
 {
 public:
     wxMask();
@@ -215,7 +215,7 @@ protected:
 // wxBitmapHandler is a class which knows how to load/save bitmaps to/from file
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmapHandler : public wxGDIImageHandler
+class WXDLLIMPEXP_CORE wxBitmapHandler : public wxGDIImageHandler
 {
 public:
     wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; }

include/wx/palmos/bmpbuttn.h

@@ -17,7 +17,7 @@
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
-class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
 {
 public:
     wxBitmapButton()

include/wx/palmos/brush.h

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

include/wx/palmos/button.h

@@ -16,7 +16,7 @@
 // Pushbutton
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxButton : public wxButtonBase
+class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
 {
 public:
     wxButton() { }

include/wx/palmos/caret.h

@@ -12,7 +12,7 @@
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 
-class WXDLLEXPORT wxCaret : public wxCaretBase
+class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase
 {
 public:
     wxCaret() { Init(); }

include/wx/palmos/checkbox.h

@@ -13,7 +13,7 @@
 #define _WX_CHECKBOX_H_
 
 // Checkbox item (single checkbox)
-class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
+class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
 {
 public:
     wxCheckBox() { }

include/wx/palmos/checklst.h

@@ -19,7 +19,7 @@
 class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn;
 class WXDLLIMPEXP_FWD_CORE wxCheckListBoxItem; // fwd decl, defined in checklst.cpp
 
-class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase
+class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
 {
 public:
   // ctors

include/wx/palmos/choice.h

@@ -16,7 +16,7 @@
 // Choice item
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxChoice : public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase
 {
 public:
     // ctors

include/wx/palmos/clipbrd.h

@@ -22,24 +22,24 @@
 // implement wxClipboard, and for compatibility.
 
 // open/close the clipboard
-WXDLLEXPORT bool wxOpenClipboard();
-WXDLLEXPORT bool wxIsClipboardOpened();
+WXDLLIMPEXP_CORE bool wxOpenClipboard();
+WXDLLIMPEXP_CORE bool wxIsClipboardOpened();
 #define wxClipboardOpen wxIsClipboardOpened
-WXDLLEXPORT bool wxCloseClipboard();
+WXDLLIMPEXP_CORE bool wxCloseClipboard();
 
 // get/set data
-WXDLLEXPORT bool wxEmptyClipboard();
-WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat,
+WXDLLIMPEXP_CORE bool wxEmptyClipboard();
+WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat,
                                     const void *data,
                                     int width = 0, int height = 0);
-WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat,
+WXDLLIMPEXP_CORE void* wxGetClipboardData(wxDataFormat dataFormat,
                                      long *len = NULL);
 
 // clipboard formats
-WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
-WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
-WXDLLEXPORT int  wxRegisterClipboardFormat(wxChar *formatName);
-WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
+WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
+WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
+WXDLLIMPEXP_CORE int  wxRegisterClipboardFormat(wxChar *formatName);
+WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat,
                                           wxChar *formatName,
                                           int maxCount);
 
@@ -48,7 +48,7 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
 //-----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_FWD_CORE wxDataObject;
-class WXDLLEXPORT wxClipboard : public wxObject
+class WXDLLIMPEXP_CORE wxClipboard : public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 

include/wx/palmos/colordlg.h

@@ -20,7 +20,7 @@
 // wxColourDialog: dialog for choosing a colours
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxColourDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog
 {
 public:
     wxColourDialog();

include/wx/palmos/combobox.h

@@ -20,7 +20,7 @@
 // Combobox control
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxComboBox: public wxChoice
+class WXDLLIMPEXP_CORE wxComboBox: public wxChoice
 {
 public:
     wxComboBox() { }

include/wx/palmos/control.h

@@ -15,7 +15,7 @@
 #include "wx/dynarray.h"
 
 // General item class
-class WXDLLEXPORT wxControl : public wxControlBase
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase
 {
 public:
     wxControl() { Init(); }

include/wx/palmos/cursor.h

@@ -17,7 +17,7 @@
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 // Cursor
-class WXDLLEXPORT wxCursor : public wxGDIImage
+class WXDLLIMPEXP_CORE wxCursor : public wxGDIImage
 {
 public:
     // constructors

include/wx/palmos/dc.h

@@ -43,7 +43,7 @@ public:
 
 // this is an ABC: use one of the derived classes to create a DC associated
 // with a window, screen, printer and so on
-class WXDLLEXPORT wxPalmDCImpl: public wxDCImpl
+class WXDLLIMPEXP_CORE wxPalmDCImpl: public wxDCImpl
 {
 public:
     wxPalmDCImpl(wxDC *owner, WXHDC hDC);
@@ -319,7 +319,7 @@ protected:
 // only/mainly)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDCTempImpl : public wxPalmDCImpl
+class WXDLLIMPEXP_CORE wxDCTempImpl : public wxPalmDCImpl
 {
 public:
     // construct a temporary DC with the specified HDC and size (it should be
@@ -355,7 +355,7 @@ private:
     DECLARE_NO_COPY_CLASS(wxDCTempImpl)
 };
 
-class WXDLLEXPORT wxDCTemp : public wxDC
+class WXDLLIMPEXP_CORE wxDCTemp : public wxDC
 {
 public:
     wxDCTemp(WXHDC hdc, const wxSize& size = wxDefaultSize)

include/wx/palmos/dcclient.h

@@ -34,7 +34,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
 // DC classes
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindowDCImpl : public wxPalmDCImpl
+class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxPalmDCImpl
 {
 public:
     // default ctor
@@ -53,7 +53,7 @@ protected:
     DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
 };
 
-class WXDLLEXPORT wxClientDCImpl : public wxWindowDCImpl
+class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
 {
 public:
     // default ctor
@@ -73,7 +73,7 @@ protected:
     DECLARE_NO_COPY_CLASS(wxClientDCImpl)
 };
 
-class WXDLLEXPORT wxPaintDCImpl : public wxClientDCImpl
+class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
 {
 public:
     wxPaintDCImpl( wxDC *owner );

include/wx/palmos/dcmemory.h

@@ -15,7 +15,7 @@
 #include "wx/dcmemory.h"
 #include "wx/palmos/dc.h"
 
-class WXDLLEXPORT wxMemoryDCImpl: public wxPalmDCImpl
+class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPalmDCImpl
 {
 public:
     wxMemoryDCImpl( wxMemoryDC *owner );

include/wx/palmos/dcprint.h

@@ -17,7 +17,7 @@
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 
-class WXDLLEXPORT wxPrinterDC : public wxDC
+class WXDLLIMPEXP_CORE wxPrinterDC : public wxDC
 {
 public:
     // Create a printer DC (obsolete function: use wxPrintData version now)
@@ -54,10 +54,10 @@ private:
 };
 
 // Gets an HDC for the default printer configuration
-// WXHDC WXDLLEXPORT wxGetPrinterDC(int orientation);
+// WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(int orientation);
 
 // Gets an HDC for the specified printer configuration
-WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& data);
+WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& data);
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 

include/wx/palmos/dcscreen.h

@@ -15,7 +15,7 @@
 #include "wx/dcscreen.h"
 #include "wx/palmos/dc.h"
 
-class WXDLLEXPORT wxScreenDCImpl : public wxPalmDCImpl
+class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxPalmDCImpl
 {
 public:
     // Create a DC representing the whole screen

include/wx/palmos/dialog.h

@@ -14,12 +14,12 @@
 
 #include "wx/panel.h"
 
-//WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
+//WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxDialogNameStr[];
 
 class WXDLLIMPEXP_FWD_CORE wxDialogModalData;
 
 // Dialog boxes
-class WXDLLEXPORT wxDialog : public wxDialogBase
+class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
 {
 public:
     wxDialog() { Init(); }

include/wx/palmos/dib.h

@@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxPalette;
 // wxDIB: represents a DIB section
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDIB
+class WXDLLIMPEXP_CORE wxDIB
 {
 public:
     // ctors and such

include/wx/palmos/dirdlg.h

@@ -12,7 +12,7 @@
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 
-class WXDLLEXPORT wxDirDialog : public wxDirDialogBase
+class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase
 {
 public:
     wxDirDialog(wxWindow *parent,

include/wx/palmos/dragimag.h

@@ -88,7 +88,7 @@
  * wxDragImage
  */
 
-class WXDLLEXPORT wxDragImage: public wxObject
+class WXDLLIMPEXP_CORE wxDragImage: public wxObject
 {
 public:
 

include/wx/palmos/enhmeta.h

@@ -23,7 +23,7 @@
 // wxEnhMetaFile: encapsulation of Win32 HENHMETAFILE
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxEnhMetaFile : public wxGDIObject
+class WXDLLIMPEXP_CORE wxEnhMetaFile : public wxGDIObject
 {
 public:
     wxEnhMetaFile(const wxString& file = wxEmptyString) : m_filename(file)
@@ -73,7 +73,7 @@ private:
 // wxEnhMetaFileDC: allows to create a wxEnhMetaFile
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxEnhMetaFileDC : public wxDC
+class WXDLLIMPEXP_CORE wxEnhMetaFileDC : public wxDC
 {
 public:
     // the ctor parameters specify the filename (empty for memory metafiles),
@@ -99,7 +99,7 @@ private:
 
 // notice that we want to support both CF_METAFILEPICT and CF_ENHMETAFILE and
 // so we derive from wxDataObject and not from wxDataObjectSimple
-class WXDLLEXPORT wxEnhMetaFileDataObject : public wxDataObject
+class WXDLLIMPEXP_CORE wxEnhMetaFileDataObject : public wxDataObject
 {
 public:
     // ctors
@@ -137,7 +137,7 @@ protected:
 // CF_ENHMETAFILE
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple
+class WXDLLIMPEXP_CORE wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple
 {
 public:
     // ctors

include/wx/palmos/evtloop.h

@@ -16,7 +16,7 @@
 // wxEventLoop
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGUIEventLoop : public wxEventLoopBase
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase
 {
 public:
     wxGUIEventLoop();

include/wx/palmos/fdrepdlg.h

@@ -16,7 +16,7 @@
 // wxFindReplaceDialog: dialog for searching / replacing text
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFindReplaceDialog : public wxFindReplaceDialogBase
+class WXDLLIMPEXP_CORE wxFindReplaceDialog : public wxFindReplaceDialogBase
 {
 public:
     // ctors and such

include/wx/palmos/filedlg.h

@@ -16,7 +16,7 @@
 // wxFileDialog
 //-------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFileDialog: public wxFileDialogBase
+class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
 {
 public:
     wxFileDialog(wxWindow *parent,

include/wx/palmos/font.h

@@ -18,7 +18,7 @@
 // wxFont
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFont : public wxFontBase
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase
 {
 public:
     // ctors and such

include/wx/palmos/fontdlg.h

@@ -16,7 +16,7 @@
 // wxFontDialog
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFontDialog : public wxFontDialogBase
+class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase
 {
 public:
     wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }

include/wx/palmos/frame.h

@@ -12,7 +12,7 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
-class WXDLLEXPORT wxFrame : public wxFrameBase
+class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
 {
 public:
     // construction

include/wx/palmos/gauge.h

@@ -14,10 +14,10 @@
 
 #if wxUSE_GAUGE
 
-WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[];
+WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxGaugeNameStr[];
 
 // Group box
-class WXDLLEXPORT wxGauge : public wxGaugeBase
+class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase
 {
 public:
     wxGauge() { }

include/wx/palmos/gdiimage.h

@@ -30,7 +30,7 @@ WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
 // wxGDIImageRefData: common data fields for all derived classes
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGDIImageRefData : public wxGDIRefData
+class WXDLLIMPEXP_CORE wxGDIImageRefData : public wxGDIRefData
 {
 public:
     wxGDIImageRefData()
@@ -70,7 +70,7 @@ public:
 // wxGDIImageHandler: a class which knows how to load/save wxGDIImages.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGDIImageHandler : public wxObject
+class WXDLLIMPEXP_CORE wxGDIImageHandler : public wxObject
 {
 public:
     // ctor
@@ -117,7 +117,7 @@ protected:
 // format. It also falls back to wxImage if no appropriate image is found.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGDIImage : public wxGDIObject
+class WXDLLIMPEXP_CORE wxGDIImage : public wxGDIObject
 {
 public:
     // handlers list interface

include/wx/palmos/help.h

@@ -18,7 +18,7 @@
 
 #include "wx/helpbase.h"
 
-class WXDLLEXPORT wxPalmHelpController: public wxHelpControllerBase
+class WXDLLIMPEXP_CORE wxPalmHelpController: public wxHelpControllerBase
 {
     DECLARE_CLASS(wxPalmHelpController)
 

include/wx/palmos/imaglist.h

@@ -32,7 +32,7 @@
 // now, the app must take care of ownership issues. That is, the
 // image lists must be explicitly deleted after the control(s) that uses them
 // is (are) deleted, or when the app exits.
-class WXDLLEXPORT wxImageList : public wxObject
+class WXDLLIMPEXP_CORE wxImageList : public wxObject
 {
 public:
   /*

include/wx/palmos/listbox.h

@@ -34,7 +34,7 @@ class wxArrayInt;
 // List box control
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxListBox : public wxListBoxBase
+class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase
 {
 public:
     // ctors and such

include/wx/palmos/listctrl.h

@@ -73,7 +73,7 @@ class WXDLLIMPEXP_FWD_CORE wxImageList;
 
  */
 
-class WXDLLEXPORT wxListCtrl: public wxControl
+class WXDLLIMPEXP_CORE wxListCtrl: public wxControl
 {
 public:
     /*

include/wx/palmos/mdi.h

@@ -14,7 +14,7 @@
 
 #include "wx/frame.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
+WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxStatusLineNameStr[];
 
 class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
 class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
@@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 // wxMDIParentFrame
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMDIParentFrame : public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxFrame
 {
 public:
     wxMDIParentFrame();
@@ -110,7 +110,7 @@ private:
 // wxMDIChildFrame
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMDIChildFrame : public wxFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxFrame
 {
 public:
     wxMDIChildFrame() { Init(); }
@@ -183,7 +183,7 @@ private:
 // wxMDIClientWindow
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMDIClientWindow : public wxWindow
+class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxWindow
 {
 public:
     wxMDIClientWindow() { Init(); }

include/wx/palmos/menu.h

@@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar;
 // Menu
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMenu : public wxMenuBase
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
 {
 public:
     // ctors & dtor
@@ -103,7 +103,7 @@ private:
 // Menu Bar (a la Windows)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMenuInfo : public wxObject
+class WXDLLIMPEXP_CORE wxMenuInfo : public wxObject
 {
 public :
     wxMenuInfo() { m_menu = NULL ; }
@@ -122,7 +122,7 @@ private :
 
 WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
 
-class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
+class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
 {
 public:
     // ctors & dtor

include/wx/palmos/menuitem.h

@@ -24,7 +24,7 @@
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMenuItem : public wxMenuItemBase
+class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
 #if wxUSE_OWNER_DRAWN
                              , public wxOwnerDrawn
 #endif

include/wx/palmos/metafile.h

@@ -25,7 +25,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxMetafile;
 
-class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
+class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData
 {
 public:
     wxMetafileRefData();
@@ -43,7 +43,7 @@ public:
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 
-class WXDLLEXPORT wxMetafile: public wxGDIObject
+class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject
 {
 public:
     wxMetafile(const wxString& file = wxEmptyString);
@@ -73,7 +73,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 };
 
-class WXDLLEXPORT wxMetafileDC: public wxDC
+class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
 {
 public:
     // Don't supply origin and extent
@@ -115,10 +115,10 @@ private:
  */
 
 // No origin or extent
-bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
+bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
 
 // Optional origin and extent
-bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE);
+bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE);
 
 // ----------------------------------------------------------------------------
 // wxMetafileDataObject is a specialization of wxDataObject for metafile data
@@ -126,7 +126,7 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y
 
 #if wxUSE_DRAG_AND_DROP
 
-class WXDLLEXPORT wxMetafileDataObject : public wxDataObjectSimple
+class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple
 {
 public:
     // ctors

include/wx/palmos/minifram.h

@@ -14,7 +14,7 @@
 
 #include "wx/frame.h"
 
-class WXDLLEXPORT wxMiniFrame : public wxFrame
+class WXDLLIMPEXP_CORE wxMiniFrame : public wxFrame
 {
 public:
   wxMiniFrame() { }

include/wx/palmos/msgdlg.h

@@ -12,7 +12,7 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
-class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase
+class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
 {
 public:
     wxMessageDialog(wxWindow *parent,

include/wx/palmos/mslu.h

@@ -33,7 +33,7 @@ inline bool wxUsingUnicowsDll()
 
 #if wxUSE_GUI
 
-WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
+WXDLLIMPEXP_CORE int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
                                   WXLPARAM lData, WXWPARAM wData,
                                   int x, int y, int cx, int cy,
                                   unsigned int flags);
@@ -41,10 +41,10 @@ WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
     wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \
                       ld, wd, x, y, cx, cy, flags)
 
-WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn);
+WXDLLIMPEXP_CORE int wxMSLU_GetOpenFileNameW(void *ofn);
 #define GetOpenFileNameW(ofn) wxMSLU_GetOpenFileNameW((void*)ofn)
 
-WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn);
+WXDLLIMPEXP_CORE int wxMSLU_GetSaveFileNameW(void *ofn);
 #define GetSaveFileNameW(ofn) wxMSLU_GetSaveFileNameW((void*)ofn)
 
 #endif
@@ -53,8 +53,8 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn);
 // Missing libc file manipulation functions in Win9x
 //------------------------------------------------------------------------
 
-WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname);
-WXDLLEXPORT int wxMSLU__tremove(const wxChar *name);
+WXDLLIMPEXP_CORE int wxMSLU__trename(const wxChar *oldname, const wxChar *newname);
+WXDLLIMPEXP_CORE int wxMSLU__tremove(const wxChar *name);
 
 #endif // wxUSE_UNICODE_MSLU
 

include/wx/palmos/notebook.h

@@ -24,7 +24,7 @@
 // wxNotebook
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxNotebookPageInfo : public wxObject
+class WXDLLIMPEXP_CORE wxNotebookPageInfo : public wxObject
 {
 public :
     wxNotebookPageInfo() { m_page = NULL ; m_imageId = -1 ; m_selected = false ; }
@@ -48,7 +48,7 @@ private :
 
 WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList );
 
-class WXDLLEXPORT wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
 {
 public:
     // ctors

include/wx/palmos/palette.h

@@ -16,7 +16,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxPalette;
 
-class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
+class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData
 {
     friend class WXDLLIMPEXP_FWD_CORE wxPalette;
 public:
@@ -28,7 +28,7 @@ protected:
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
-class WXDLLEXPORT wxPalette: public wxPaletteBase
+class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
 {
   DECLARE_DYNAMIC_CLASS(wxPalette)
 

include/wx/palmos/pen.h

@@ -21,7 +21,7 @@ typedef WXDWORD wxMSWDash;
 class WXDLLIMPEXP_FWD_CORE wxPen;
 
 // VZ: this class should be made private
-class WXDLLEXPORT wxPenRefData : public wxGDIRefData
+class WXDLLIMPEXP_CORE wxPenRefData : public wxGDIRefData
 {
 public:
     wxPenRefData();
@@ -71,7 +71,7 @@ private:
 // Pen
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPen : public wxPenBase
+class WXDLLIMPEXP_CORE wxPen : public wxPenBase
 {
 public:
     wxPen();

include/wx/palmos/popupwin.h

@@ -16,7 +16,7 @@
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
+class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
 {
 public:
     wxPopupWindow() { }

include/wx/palmos/printdlg.h

@@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxDC;
 // wxPrinterDialog: the common dialog for printing.
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPrintDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxPrintDialog : public wxDialog
 {
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
 
@@ -49,7 +49,7 @@ private:
     DECLARE_NO_COPY_CLASS(wxPrintDialog)
 };
 
-class WXDLLEXPORT wxPageSetupDialog: public wxDialog
+class WXDLLIMPEXP_CORE wxPageSetupDialog: public wxDialog
 {
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
 

include/wx/palmos/printpalm.h

@@ -18,7 +18,7 @@
 // Represents the printer: manages printing a wxPrintout object
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPalmPrinter : public wxPrinterBase
+class WXDLLIMPEXP_CORE wxPalmPrinter : public wxPrinterBase
 {
     DECLARE_DYNAMIC_CLASS(wxPalmPrinter)
 
@@ -43,7 +43,7 @@ private:
 // wxPrintout.
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPalmPrintPreview : public wxPrintPreviewBase
+class WXDLLIMPEXP_CORE wxPalmPrintPreview : public wxPrintPreviewBase
 {
 public:
     wxPalmPrintPreview(wxPrintout *printout,

include/wx/palmos/private/timer.h

@@ -14,7 +14,7 @@
 
 #include "wx/private/timer.h"
 
-class WXDLLEXPORT wxPalmOSTimerImpl : public wxTimerImpl
+class WXDLLIMPEXP_CORE wxPalmOSTimerImpl : public wxTimerImpl
 {
 friend void wxProcessTimer(wxTimer& timer);
 

include/wx/palmos/progdlg.h

@@ -18,7 +18,7 @@
 
 #include "wx/dialog.h"
 
-class WXDLLEXPORT wxProgressDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxProgressDialog : public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxProgressDialog)
 public:

include/wx/palmos/radiobox.h

@@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxRadioButton;
 // wxRadioBox
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
+class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase
 {
 public:
     wxRadioBox():m_radios(wxKEY_INTEGER,32)

include/wx/palmos/radiobut.h

@@ -12,7 +12,7 @@
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 
-class WXDLLEXPORT wxRadioButton: public wxControl
+class WXDLLIMPEXP_CORE wxRadioButton: public wxControl
 {
 public:
     // ctors and creation functions

include/wx/palmos/region.h

@@ -12,7 +12,7 @@
 #ifndef _WX_PALMOS_REGION_H_
 #define _WX_PALMOS_REGION_H_
 
-class WXDLLEXPORT wxRegion : public wxRegionWithCombine
+class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine
 {
 public:
     wxRegion();
@@ -60,7 +60,7 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxRegion)
 };
 
-class WXDLLEXPORT wxRegionIterator : public wxObject
+class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject
 {
 public:
     wxRegionIterator() { Init(); }

include/wx/palmos/scrolbar.h

@@ -13,7 +13,7 @@
 #define _WX_SCROLBAR_H_
 
 // Scrollbar item
-class WXDLLEXPORT wxScrollBar: public wxScrollBarBase
+class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase
 {
 public:
     wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }

include/wx/palmos/slider.h

@@ -13,7 +13,7 @@
 #define _SLIDERPALM_H_
 
 // Slider
-class WXDLLEXPORT wxSlider : public wxSliderBase
+class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase
 {
 public:
     wxSlider()

include/wx/palmos/spinbutt.h

@@ -15,7 +15,7 @@
 #include "wx/control.h"
 #include "wx/event.h"
 
-class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
+class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase
 {
 public:
     // construction

include/wx/palmos/spinctrl.h

@@ -25,7 +25,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins);
 // control is clicked.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxSpinCtrl : public wxSpinButton
+class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton
 {
 public:
     wxSpinCtrl() { }

include/wx/palmos/statbmp.h

@@ -16,10 +16,10 @@
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxStaticBitmapNameStr[];
+WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxStaticBitmapNameStr[];
 
 // a control showing an icon or a bitmap
-class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
 {
 public:
     wxStaticBitmap() { Init(); }

include/wx/palmos/statbox.h

@@ -13,7 +13,7 @@
 #define _WX_STATBOX_H_
 
 // Group box
-class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
+class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
 {
 public:
     wxStaticBox() { }

include/wx/palmos/statline.h

@@ -16,7 +16,7 @@
 // wxStaticLine
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
+class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
 {
 public:
     // constructors and pseudo-constructors

include/wx/palmos/stattext.h

@@ -12,7 +12,7 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
-class WXDLLEXPORT wxStaticText : public wxStaticTextBase
+class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
 {
 public:
     wxStaticText() { }

include/wx/palmos/statusbr.h

@@ -14,7 +14,7 @@
 
 #if wxUSE_NATIVE_STATUSBAR
 
-class WXDLLEXPORT wxStatusBarPalm : public wxStatusBarBase
+class WXDLLIMPEXP_CORE wxStatusBarPalm : public wxStatusBarBase
 {
 public:
     // ctors and such

include/wx/palmos/tabctrl.h

@@ -14,7 +14,7 @@
 
 class wxImageList;
 
-// WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
+// WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxToolBarNameStr[];
 
 /*
  * Flags returned by HitTest
@@ -25,7 +25,7 @@ class wxImageList;
 #define wxTAB_HITTEST_ONLABEL           4
 #define wxTAB_HITTEST_ONITEM            6
 
-class WXDLLEXPORT wxTabCtrl: public wxControl
+class WXDLLIMPEXP_CORE wxTabCtrl: public wxControl
 {
   DECLARE_DYNAMIC_CLASS(wxTabCtrl)
  public:
@@ -120,7 +120,7 @@ DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxTabCtrl)
 };
 
-class WXDLLEXPORT wxTabEvent : public wxNotifyEvent
+class WXDLLIMPEXP_CORE wxTabEvent : public wxNotifyEvent
 {
 public:
     wxTabEvent(wxEventType commandType = wxEVT_NULL, int id = 0,

include/wx/palmos/textctrl.h

@@ -12,7 +12,7 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
-class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
+class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase
 {
 public:
     // creation

include/wx/palmos/tglbtn.h

@@ -14,10 +14,10 @@
 #define _WX_TOGGLEBUTTON_H_
 
 #include "wx/checkbox.h" // wxCheckBoxNameStr, in Datacmn.cpp
-//WXDLLEXPORT_DATA(extern const wxChar) wxCheckBoxNameStr[];
+//WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxCheckBoxNameStr[];
 
 // Checkbox item (single checkbox)
-class WXDLLEXPORT wxToggleButton : public wxToggleButtonBase
+class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
 {
 public:
     wxToggleButton() {}

include/wx/palmos/toolbar.h

@@ -16,7 +16,7 @@
 
 #include "wx/dynarray.h"
 
-class WXDLLEXPORT wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
 {
 public:
     // ctors and dtor

include/wx/palmos/tooltip.h

@@ -12,7 +12,7 @@
 #ifndef _WX_PALMOS_TOOLTIP_H_
 #define _WX_PALMOS_TOOLTIP_H_
 
-class WXDLLEXPORT wxToolTip : public wxObject
+class WXDLLIMPEXP_CORE wxToolTip : public wxObject
 {
 public:
     // ctor & dtor

include/wx/palmos/toplevel.h

@@ -16,7 +16,7 @@
 // wxTopLevelWindowPalm
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTopLevelWindowPalm : public wxTopLevelWindowBase
+class WXDLLIMPEXP_CORE wxTopLevelWindowPalm : public wxTopLevelWindowBase
 {
 public:
     // constructors and such

include/wx/palmos/treectrl.h

@@ -24,8 +24,8 @@
 #include "wx/hashmap.h"
 
 // fwd decl
-class  WXDLLEXPORT wxImageList;
-class  WXDLLEXPORT wxDragImage;
+class  WXDLLIMPEXP_CORE wxImageList;
+class  WXDLLIMPEXP_CORE wxDragImage;
 struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem;
 
 // hash storing attributes for our items
@@ -35,7 +35,7 @@ WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
 // wxTreeCtrl
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTreeCtrl : public wxControl
+class WXDLLIMPEXP_CORE wxTreeCtrl : public wxControl
 {
 public:
     // creation

include/wx/palmos/window.h

@@ -27,7 +27,7 @@
 // wxWindow declaration for Palm
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindowPalm : public wxWindowBase
+class WXDLLIMPEXP_CORE wxWindowPalm : public wxWindowBase
 {
 public:
     wxWindowPalm() { Init(); }