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

@@ -16,7 +16,7 @@
 #include "wx/string.h"
 #include "wx/event.h"
 
-class WXDLLEXPORT wxAcceleratorTable: public wxObject
+class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 public:
@@ -34,7 +34,7 @@ public:
     wxAcceleratorEntry* GetEntries() const;
 };
 
-WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
+WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable;
 
 #endif
 // _WX_ACCEL_H_

include/wx/motif/app.h

@@ -38,7 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxPerDisplayData;
 
 WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData*, wxPerDisplayDataMap );
 
-class WXDLLEXPORT wxApp : public wxAppBase
+class WXDLLIMPEXP_CORE wxApp : public wxAppBase
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 

include/wx/motif/bmpbuttn.h

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

include/wx/motif/bmpmotif.h

@@ -15,7 +15,7 @@
 #include "wx/defs.h"
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxBitmapCache
+class WXDLLIMPEXP_CORE wxBitmapCache
 {
 public:
     wxBitmapCache()

include/wx/motif/button.h

@@ -13,7 +13,7 @@
 #define _WX_BUTTON_H_
 
 // Pushbutton
-class WXDLLEXPORT wxButton: public wxButtonBase
+class WXDLLIMPEXP_CORE wxButton: public wxButtonBase
 {
 public:
     wxButton() { }

include/wx/motif/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
 {
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 

include/wx/motif/choice.h

@@ -22,7 +22,7 @@
 #endif
 
 // Choice item
-class WXDLLEXPORT wxChoice: public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
 

include/wx/motif/clipbrd.h

@@ -22,16 +22,16 @@ struct wxDataIdToDataObject;
 WX_DECLARE_LIST(wxDataObject, wxDataObjectList);
 WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList);
 
-WXDLLEXPORT bool wxOpenClipboard();
-WXDLLEXPORT bool wxClipboardOpen();
-WXDLLEXPORT bool wxCloseClipboard();
-WXDLLEXPORT bool wxEmptyClipboard();
-WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
-WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width = 0, int height = 0);
-WXDLLEXPORT wxObject* wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL);
-WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
-WXDLLEXPORT wxDataFormat wxRegisterClipboardFormat(char *formatName);
-WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount);
+WXDLLIMPEXP_CORE bool wxOpenClipboard();
+WXDLLIMPEXP_CORE bool wxClipboardOpen();
+WXDLLIMPEXP_CORE bool wxCloseClipboard();
+WXDLLIMPEXP_CORE bool wxEmptyClipboard();
+WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
+WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width = 0, int height = 0);
+WXDLLIMPEXP_CORE wxObject* wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL);
+WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
+WXDLLIMPEXP_CORE wxDataFormat wxRegisterClipboardFormat(char *formatName);
+WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount);
 
 //-----------------------------------------------------------------------------
 // wxClipboard

include/wx/motif/colour.h

@@ -16,7 +16,7 @@
 #include "wx/string.h"
 
 // Colour
-class WXDLLEXPORT wxColour : public wxColourBase
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase
 {
     DECLARE_DYNAMIC_CLASS(wxColour)
 public:

include/wx/motif/combobox.h

@@ -16,7 +16,7 @@
 #include "wx/textentry.h"
 
 // Combobox item
-class WXDLLEXPORT wxComboBox : public wxChoice,
+class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
                                public wxTextEntry
 {
 public:

include/wx/motif/control.h

@@ -17,7 +17,7 @@
 #include "wx/validate.h"
 
 // General item class
-class WXDLLEXPORT wxControl: public wxControlBase
+class WXDLLIMPEXP_CORE wxControl: public wxControlBase
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 

include/wx/motif/cursor.h

@@ -18,7 +18,7 @@
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 // Cursor
-class WXDLLEXPORT wxCursor : public wxGDIObject
+class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 {
 public:
     wxCursor();
@@ -57,7 +57,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
-extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
+extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);
 
 #endif
 // _WX_CURSOR_H_

include/wx/motif/dc.h

@@ -18,7 +18,7 @@
 // wxMotifDCImpl
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMotifDCImpl : public wxDCImpl
+class WXDLLIMPEXP_CORE wxMotifDCImpl : public wxDCImpl
 {
 public:
     wxMotifDCImpl(wxDC *owner);

include/wx/motif/dcclient.h

@@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;
 // wxWindowDCImpl
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindowDCImpl : public wxMotifDCImpl
+class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMotifDCImpl
 {
 public:
     wxWindowDCImpl(wxDC *owner);
@@ -158,7 +158,7 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxWindowDCImpl)
 };
 
-class WXDLLEXPORT wxPaintDCImpl: public wxWindowDCImpl
+class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxWindowDCImpl
 {
 public:
     wxPaintDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { }
@@ -169,7 +169,7 @@ public:
     DECLARE_DYNAMIC_CLASS(wxPaintDCImpl)
 };
 
-class WXDLLEXPORT wxClientDCImpl: public wxWindowDCImpl
+class WXDLLIMPEXP_CORE wxClientDCImpl: public wxWindowDCImpl
 {
 public:
     wxClientDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { }

include/wx/motif/dcprint.h

@@ -14,7 +14,7 @@
 
 #include "wx/motif/dc.h"
 
-class WXDLLEXPORT wxPrinterDC : public wxMotifDCImpl
+class WXDLLIMPEXP_CORE wxPrinterDC : public wxMotifDCImpl
 {
 public:
     // Create a printer DC

include/wx/motif/dcscreen.h

@@ -14,7 +14,7 @@
 
 #include "wx/motif/dcclient.h"
 
-class WXDLLEXPORT wxScreenDCImpl : public wxWindowDCImpl
+class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxWindowDCImpl
 {
 public:
     // Create a DC representing the whole screen

include/wx/motif/dialog.h

@@ -15,7 +15,7 @@
 class WXDLLIMPEXP_FWD_CORE wxEventLoop;
 
 // Dialog boxes
-class WXDLLEXPORT wxDialog : public wxDialogBase
+class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
 {
 public:
     wxDialog();

include/wx/motif/dnd.h

@@ -36,7 +36,7 @@ class WXDLLIMPEXP_FWD_CORE wxDropSource;
 // wxDropTarget
 //-------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDropTarget: public wxObject
+class WXDLLIMPEXP_CORE wxDropTarget: public wxObject
 {
 public:
 
@@ -59,7 +59,7 @@ public:
 // wxTextDropTarget
 //-------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTextDropTarget: public wxDropTarget
+class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget
 {
 public:
 
@@ -77,7 +77,7 @@ protected:
 // wxPrivateDropTarget
 //-------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPrivateDropTarget: public wxDropTarget
+class WXDLLIMPEXP_CORE wxPrivateDropTarget: public wxDropTarget
 {
 public:
 
@@ -107,7 +107,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:
 
@@ -136,7 +136,7 @@ enum wxDragResult
         wxDragCancel    // the operation was cancelled by user (not an error)
 };
 
-class WXDLLEXPORT wxDropSource: public wxObject
+class WXDLLIMPEXP_CORE wxDropSource: public wxObject
 {
 public:
 

include/wx/motif/filedlg.h

@@ -16,7 +16,7 @@
 // wxFileDialog
 //-------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFileDialog: public wxFileDialogBase
+class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
 public:

include/wx/motif/frame.h

@@ -12,7 +12,7 @@
 #ifndef _WX_MOTIF_FRAME_H_
 #define _WX_MOTIF_FRAME_H_
 
-class WXDLLEXPORT wxFrame : public wxFrameBase
+class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
 {
 public:
     wxFrame() { Init(); }

include/wx/motif/gauge.h

@@ -13,7 +13,7 @@
 #define _WX_GAUGE_H_
 
 // Group box
-class WXDLLEXPORT wxGauge : public wxGaugeBase
+class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase
 {
     DECLARE_DYNAMIC_CLASS(wxGauge)
 

include/wx/motif/icon.h

@@ -15,7 +15,7 @@
 #include "wx/bitmap.h"
 
 // Icon
-class WXDLLEXPORT wxIcon : public wxBitmap
+class WXDLLIMPEXP_CORE wxIcon : public wxBitmap
 {
 public:
     wxIcon();

include/wx/motif/listbox.h

@@ -19,7 +19,7 @@
 class WXDLLIMPEXP_FWD_BASE wxArrayInt;
 
 // List box item
-class WXDLLEXPORT wxListBox: public wxListBoxBase
+class WXDLLIMPEXP_CORE wxListBox: public wxListBoxBase
 {
     DECLARE_DYNAMIC_CLASS(wxListBox)
 

include/wx/motif/mdi.h

@@ -26,7 +26,7 @@ but wxMDIChildFrame::GetParent should return the parent frame.
 class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
 class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 
-class WXDLLEXPORT wxMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame
 {
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 
@@ -112,7 +112,7 @@ protected:
     DECLARE_EVENT_TABLE()
 };
 
-class WXDLLEXPORT wxMDIChildFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame
 {
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 
@@ -205,7 +205,7 @@ protected:
 * of the children. Phew! So the children are sort of 'adopted'...
 */
 
-class WXDLLEXPORT wxMDIClientWindow: public wxNotebook
+class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxNotebook
 {
     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 

include/wx/motif/minifram.h

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

include/wx/motif/msgdlg.h

@@ -17,7 +17,7 @@
 // Message box dialog
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase
+class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
 {
 public:
     wxMessageDialog(wxWindow *parent,

include/wx/motif/print.h

@@ -18,7 +18,7 @@
 * Represents the printer: manages printing a wxPrintout object
 */
 
-class WXDLLEXPORT wxPrinter: public wxPrinterBase
+class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase
 {
     DECLARE_DYNAMIC_CLASS(wxPrinter)
 
@@ -36,7 +36,7 @@ public:
 * Programmer creates an object of this class to preview a wxPrintout.
 */
 
-class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase
+class WXDLLIMPEXP_CORE wxPrintPreview: public wxPrintPreviewBase
 {
     DECLARE_CLASS(wxPrintPreview)
 

include/wx/motif/private/timer.h

@@ -13,7 +13,7 @@
 
 #include "wx/private/timer.h"
 
-class WXDLLEXPORT wxMotifTimerImpl : public wxTimerImpl
+class WXDLLIMPEXP_CORE wxMotifTimerImpl : public wxTimerImpl
 {
 public:
     wxMotifTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_id = 0; }

include/wx/motif/radiobox.h

@@ -21,7 +21,7 @@
 
 #include "wx/arrstr.h"
 
-class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
+class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase
 {
 public:
     wxRadioBox() { Init(); }

include/wx/motif/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
 {
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 public:

include/wx/motif/scrolbar.h

@@ -13,7 +13,7 @@
 #define _WX_SCROLBAR_H_
 
 // Scrollbar item
-class WXDLLEXPORT wxScrollBar: public wxScrollBarBase
+class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase
 {
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
 

include/wx/motif/slider.h

@@ -15,7 +15,7 @@
 #include "wx/control.h"
 
 // Slider
-class WXDLLEXPORT wxSlider: public wxSliderBase
+class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
 {
     DECLARE_DYNAMIC_CLASS(wxSlider)
 

include/wx/motif/spinbutt.h

@@ -14,7 +14,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxArrowButton; // internal
 
-class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
+class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase
 {
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 

include/wx/motif/statbmp.h

@@ -15,7 +15,7 @@
 #include "wx/motif/bmpmotif.h"
 #include "wx/icon.h"
 
-class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
 

include/wx/motif/statbox.h

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

include/wx/motif/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
 {
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 

include/wx/motif/textctrl.h

@@ -13,7 +13,7 @@
 #define _WX_TEXTCTRL_H_
 
 // Single-line text item
-class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
+class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase
 {
 public:
     // creation

include/wx/motif/tglbtn.h

@@ -15,7 +15,7 @@
 
 #include "wx/checkbox.h"
 
-class WXDLLEXPORT wxToggleButton : public wxCheckBox
+class WXDLLIMPEXP_CORE wxToggleButton : public wxCheckBox
 {
 public:
     wxToggleButton() { Init(); }

include/wx/motif/toolbar.h

@@ -12,7 +12,7 @@
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 
-class WXDLLEXPORT wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
 {
 public:
     // ctors and dtor

include/wx/motif/window.h

@@ -319,7 +319,7 @@ private:
 // from scope.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxNoOptimize
+class WXDLLIMPEXP_CORE wxNoOptimize
 {
 public:
     wxNoOptimize() { ms_count++; }