From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 12 Dec 2007 01:35:53 +0000 (+0000)
Subject: replace wrong WXDLLEXPORT declarations with correct WXDLLIMPEXP_BASE/ADV/GL (patch... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/163b3ad72c6729733881e74608af586a99f43726

replace wrong WXDLLEXPORT declarations with correct WXDLLIMPEXP_BASE/ADV/GL (patch from Tim Stahlhut)

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

diff --git a/include/wx/animdecod.h b/include/wx/animdecod.h
index 0af0491816..ee0e21ab48 100644
--- a/include/wx/animdecod.h
+++ b/include/wx/animdecod.h
@@ -84,7 +84,7 @@ enum wxAnimationType
 // wxAnimationDecoder class
 // --------------------------------------------------------------------------
 
-class WXDLLEXPORT wxAnimationDecoder : public wxObjectRefData
+class WXDLLIMPEXP_ADV wxAnimationDecoder : public wxObjectRefData
 {
 public:
     wxAnimationDecoder()
diff --git a/include/wx/cocoa/sound.h b/include/wx/cocoa/sound.h
index d764e8bfea..10c3d81893 100644
--- a/include/wx/cocoa/sound.h
+++ b/include/wx/cocoa/sound.h
@@ -16,7 +16,7 @@
 #include "wx/object.h"
 #include "wx/cocoa/ObjcRef.h"
 
-class WXDLLEXPORT wxSound : public wxSoundBase
+class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
 {
 public:
     wxSound()
diff --git a/include/wx/cocoa/taskbar.h b/include/wx/cocoa/taskbar.h
index 5c9dc6366c..1410ae6873 100644
--- a/include/wx/cocoa/taskbar.h
+++ b/include/wx/cocoa/taskbar.h
@@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenu;
 
 class wxTaskBarIconCocoaImpl;
 
-class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
+class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
 {
     friend class wxTaskBarIconCocoaImpl;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 72544270eb..2ac99a2548 100644
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_BASE wxFileOutputStream;
 
 
 
-class WXDLLIMPEXP_FWD_BASE wxSVGFileDC;
+class WXDLLIMPEXP_FWD_CORE wxSVGFileDC;
 
 class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
 {
diff --git a/include/wx/flags.h b/include/wx/flags.h
index 6f9c00a841..def2feb0d8 100644
--- a/include/wx/flags.h
+++ b/include/wx/flags.h
@@ -154,7 +154,7 @@ private :
 };
 
 #define WX_DEFINE_FLAGS( flags ) \
-    class WXDLLEXPORT flags \
+    class WXDLLIMPEXP_BASE flags \
     {\
     public : \
         flags(long data=0) :m_data(data) {} \
diff --git a/include/wx/generic/private/timer.h b/include/wx/generic/private/timer.h
index fcf598d1da..6613e28448 100644
--- a/include/wx/generic/private/timer.h
+++ b/include/wx/generic/private/timer.h
@@ -20,7 +20,7 @@
 
 class wxTimerDesc;
 
-class WXDLLEXPORT wxGenericTimerImpl : public wxTimerImpl
+class WXDLLIMPEXP_BASE wxGenericTimerImpl : public wxTimerImpl
 {
 public:
     wxGenericTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { Init(); }
diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index 031be9dc66..bf97a23063 100644
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -18,7 +18,7 @@
 // wxGLCanvas
 //---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGLCanvas : public wxGLCanvasX11
+class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11
 {
 public:
     wxGLCanvas(wxWindow *parent,
diff --git a/include/wx/mac/carbon/apptrait.h b/include/wx/mac/carbon/apptrait.h
index 1b4d2ee9ef..f77a515da5 100644
--- a/include/wx/mac/carbon/apptrait.h
+++ b/include/wx/mac/carbon/apptrait.h
@@ -16,7 +16,7 @@
 // wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
+class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
     // no timer support in wxBase yet
diff --git a/include/wx/mac/carbon/drawer.h b/include/wx/mac/carbon/drawer.h
index e2230aca8c..ea9b70b15a 100644
--- a/include/wx/mac/carbon/drawer.h
+++ b/include/wx/mac/carbon/drawer.h
@@ -25,7 +25,7 @@
 
 #if ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
 
-class WXDLLEXPORT wxDrawerWindow : public wxTopLevelWindow
+class WXDLLIMPEXP_ADV wxDrawerWindow : public wxTopLevelWindow
 {
     DECLARE_DYNAMIC_CLASS(wxDrawerWindow)
 
diff --git a/include/wx/mac/carbon/glcanvas.h b/include/wx/mac/carbon/glcanvas.h
index 00cf0e625a..4daedf6dc6 100644
--- a/include/wx/mac/carbon/glcanvas.h
+++ b/include/wx/mac/carbon/glcanvas.h
@@ -20,7 +20,7 @@
 #  include <agl.h>
 #endif
 
-class WXDLLEXPORT wxGLContext : public wxGLContextBase
+class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase
 {
 public:
     wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL);
@@ -37,7 +37,7 @@ private:
     DECLARE_NO_COPY_CLASS(wxGLContext)
 };
 
-class WXDLLEXPORT wxGLCanvas : public wxGLCanvasBase
+class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase
 {
 public:
     wxGLCanvas(wxWindow *parent,
diff --git a/include/wx/mac/carbon/joystick.h b/include/wx/mac/carbon/joystick.h
index 2aabceb8c3..94de2470e1 100644
--- a/include/wx/mac/carbon/joystick.h
+++ b/include/wx/mac/carbon/joystick.h
@@ -14,7 +14,7 @@
 
 #include "wx/event.h"
 
-class WXDLLEXPORT wxJoystick: public wxObject
+class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxJoystick)
  public:
diff --git a/include/wx/mac/carbon/sound.h b/include/wx/mac/carbon/sound.h
index ab2555f5e9..670b170b9e 100644
--- a/include/wx/mac/carbon/sound.h
+++ b/include/wx/mac/carbon/sound.h
@@ -17,7 +17,7 @@
 
 #include "wx/object.h"
 
-class WXDLLEXPORT wxSound : public wxSoundBase
+class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
 {
 public:
   wxSound();
diff --git a/include/wx/mac/carbon/taskbarosx.h b/include/wx/mac/carbon/taskbarosx.h
index 3e6c9accb0..6f86eecf51 100644
--- a/include/wx/mac/carbon/taskbarosx.h
+++ b/include/wx/mac/carbon/taskbarosx.h
@@ -15,7 +15,7 @@
 class WXDLLIMPEXP_FWD_CORE wxIcon;
 class WXDLLIMPEXP_FWD_CORE wxMenu;
 
-class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
+class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
 {
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
 public:
diff --git a/include/wx/mac/corefoundation/joystick.h b/include/wx/mac/corefoundation/joystick.h
index e57bf28cb7..a909070072 100644
--- a/include/wx/mac/corefoundation/joystick.h
+++ b/include/wx/mac/corefoundation/joystick.h
@@ -16,7 +16,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxJoystickThread;
 
-class WXDLLEXPORT wxJoystick: public wxObject
+class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxJoystick)
  public:
diff --git a/include/wx/math.h b/include/wx/math.h
index b398fcc243..e5fdef0a58 100644
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -132,13 +132,13 @@
     extern "C" {
 #endif
     /* functions from common/extended.c */
-    WXDLLEXPORT wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes);
-    WXDLLEXPORT void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
+    WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes);
+    WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
 
     /* use wxConvertFromIeeeExtended() and wxConvertToIeeeExtended() instead */
 #if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( WXDLLEXPORT wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
-    wxDEPRECATED( WXDLLEXPORT void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );
+    wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
+    wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );
 #endif // WXWIN_COMPATIBILITY_2_8
 
 #ifdef __cplusplus
diff --git a/include/wx/os2/joystick.h b/include/wx/os2/joystick.h
index 0d1e113d01..ffd64308b8 100644
--- a/include/wx/os2/joystick.h
+++ b/include/wx/os2/joystick.h
@@ -14,7 +14,7 @@
 
 #include "wx/event.h"
 
-class WXDLLEXPORT wxJoystick: public wxObject
+class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxJoystick)
  public:
diff --git a/include/wx/palmos/timer.h b/include/wx/palmos/timer.h
index c072c4d929..cf9e490712 100644
--- a/include/wx/palmos/timer.h
+++ b/include/wx/palmos/timer.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
-class WXDLLEXPORT wxTimer : public wxTimerBase
+class WXDLLIMPEXP_BASE wxTimer : public wxTimerBase
 {
 friend void wxProcessTimer(wxTimer& timer);
 
diff --git a/include/wx/timer.h b/include/wx/timer.h
index 8c6e01625b..4e36b6d35f 100644
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -116,7 +116,7 @@ protected:
 // wxTimerRunner: starts the timer in its ctor, stops in the dtor
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTimerRunner
+class WXDLLIMPEXP_BASE wxTimerRunner
 {
 public:
     wxTimerRunner(wxTimer& timer) : m_timer(timer) { }
diff --git a/include/wx/unix/apptbase.h b/include/wx/unix/apptbase.h
index fc238d1b19..319efeeb09 100644
--- a/include/wx/unix/apptbase.h
+++ b/include/wx/unix/apptbase.h
@@ -19,7 +19,7 @@ class wxPipe;
 // wxAppTraits: the Unix version adds extra hooks needed by Unix code
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase
+class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
 {
 public:
     // wxExecute() support methods
diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 8e1d0d73c9..3735243e2b 100644
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -16,7 +16,7 @@
 // wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
+class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
 #if wxUSE_CONSOLE_EVENTLOOP
diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index 4e20ce6a56..ab61c7376a 100644
--- a/include/wx/x11/glcanvas.h
+++ b/include/wx/x11/glcanvas.h
@@ -15,7 +15,7 @@
 
 #include "wx/unix/glx11.h"
 
-class WXDLLEXPORT wxGLCanvas : public wxGLCanvasX11
+class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11
 {
 public:
     wxGLCanvas(wxWindow *parent,
diff --git a/include/wx/x11/joystick.h b/include/wx/x11/joystick.h
index 19d21b69d6..bc7c583e6a 100644
--- a/include/wx/x11/joystick.h
+++ b/include/wx/x11/joystick.h
@@ -14,7 +14,7 @@
 
 #include "wx/event.h"
 
-class WXDLLEXPORT wxJoystick: public wxObject
+class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxJoystick)
 public:
diff --git a/include/wx/xrc/xh_collpane.h b/include/wx/xrc/xh_collpane.h
index c6ade911cb..be4b49f995 100644
--- a/include/wx/xrc/xh_collpane.h
+++ b/include/wx/xrc/xh_collpane.h
@@ -15,7 +15,7 @@
 
 #if wxUSE_XRC && wxUSE_COLLPANE
 
-class WXDLLIMPEXP_FWD_ADV wxCollapsiblePane;
+class WXDLLIMPEXP_FWD_CORE wxCollapsiblePane;
 
 class WXDLLIMPEXP_XRC wxCollapsiblePaneXmlHandler : public wxXmlResourceHandler
 {
diff --git a/src/common/extended.c b/src/common/extended.c
index 6933fb2ac9..6844663420 100644
--- a/src/common/extended.c
+++ b/src/common/extended.c
@@ -105,7 +105,7 @@
  * and a 64-bit mantissa, with no hidden bit.
  ****************************************************************/
 
-WXDLLEXPORT wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes)
+WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes)
 {
     wxFloat64 f;
     wxInt32 expon;
@@ -145,7 +145,7 @@ WXDLLEXPORT wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes)
 /****************************************************************/
 
 
-WXDLLEXPORT void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
+WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
 {
     wxInt32 sign;
     wxInt32 expon;
@@ -192,12 +192,12 @@ WXDLLEXPORT void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
 }
 
 #if WXWIN_COMPATIBILITY_2_8
-WXDLLEXPORT wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes)
+WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes)
 {
     return wxConvertFromIeeeExtended(bytes);
 }
 
-WXDLLEXPORT void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
+WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
 {
     wxConvertToIeeeExtended(num, bytes);
 }
diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 2d97a8a741..686f80bbd7 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1703,7 +1703,7 @@ bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& sz
     return false;
 }
 
-void WXDLLEXPORT wxSplitPath(const wxString& fileName,
+void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt)
@@ -1713,7 +1713,7 @@ void WXDLLEXPORT wxSplitPath(const wxString& fileName,
 
 #if wxUSE_DATETIME
 
-time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename)
 {
     wxDateTime mtime;
     if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
@@ -1729,7 +1729,7 @@ time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
 // Returns 0 if none or if there's a problem.
 // filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"
 
-int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr,
+int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,
                                            wxArrayString& descriptions,
                                            wxArrayString& filters)
 {
diff --git a/src/common/log.cpp b/src/common/log.cpp
index c2a69b6714..80418f1c89 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -385,13 +385,13 @@ static inline wxString wxLogSysErrorHelper(long err)
     return wxString::Format(_(" (error %ld: %s)"), err, wxSysErrorMsg(err));
 }
 
-void WXDLLEXPORT wxVLogSysError(const wxString& format, va_list argptr)
+void WXDLLIMPEXP_BASE wxVLogSysError(const wxString& format, va_list argptr)
 {
     wxVLogSysError(wxSysErrorCode(), format, argptr);
 }
 
 #if !wxUSE_UTF8_LOCALE_ONLY
-void WXDLLEXPORT wxDoLogSysErrorWchar(const wxChar *format, ...)
+void WXDLLIMPEXP_BASE wxDoLogSysErrorWchar(const wxChar *format, ...)
 {
     va_list argptr;
     va_start(argptr, format);
@@ -401,7 +401,7 @@ void WXDLLEXPORT wxDoLogSysErrorWchar(const wxChar *format, ...)
 #endif // !wxUSE_UTF8_LOCALE_ONLY
 
 #if wxUSE_UNICODE_UTF8
-void WXDLLEXPORT wxDoLogSysErrorUtf8(const char *format, ...)
+void WXDLLIMPEXP_BASE wxDoLogSysErrorUtf8(const char *format, ...)
 {
     va_list argptr;
     va_start(argptr, format);
@@ -410,7 +410,7 @@ void WXDLLEXPORT wxDoLogSysErrorUtf8(const char *format, ...)
 }
 #endif // wxUSE_UNICODE_UTF8
 
-void WXDLLEXPORT wxVLogSysError(long err, const wxString& format, va_list argptr)
+void WXDLLIMPEXP_BASE wxVLogSysError(long err, const wxString& format, va_list argptr)
 {
     if ( wxLog::IsEnabled() ) {
         wxLog::OnLog(wxLOG_Error,
@@ -420,7 +420,7 @@ void WXDLLEXPORT wxVLogSysError(long err, const wxString& format, va_list argptr
 }
 
 #if !wxUSE_UTF8_LOCALE_ONLY
-void WXDLLEXPORT wxDoLogSysErrorWchar(long lErrCode, const wxChar *format, ...)
+void WXDLLIMPEXP_BASE wxDoLogSysErrorWchar(long lErrCode, const wxChar *format, ...)
 {
     va_list argptr;
     va_start(argptr, format);
@@ -430,7 +430,7 @@ void WXDLLEXPORT wxDoLogSysErrorWchar(long lErrCode, const wxChar *format, ...)
 #endif // !wxUSE_UTF8_LOCALE_ONLY
 
 #if wxUSE_UNICODE_UTF8
-void WXDLLEXPORT wxDoLogSysErrorUtf8(long lErrCode, const char *format, ...)
+void WXDLLIMPEXP_BASE wxDoLogSysErrorUtf8(long lErrCode, const char *format, ...)
 {
     va_list argptr;
     va_start(argptr, format);
@@ -441,7 +441,7 @@ void WXDLLEXPORT wxDoLogSysErrorUtf8(long lErrCode, const char *format, ...)
 
 #ifdef __WATCOMC__
 // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-void WXDLLEXPORT wxDoLogSysErrorWchar(unsigned long lErrCode, const wxChar *format, ...)
+void WXDLLIMPEXP_BASE wxDoLogSysErrorWchar(unsigned long lErrCode, const wxChar *format, ...)
 {
     va_list argptr;
     va_start(argptr, format);
@@ -449,7 +449,7 @@ void WXDLLEXPORT wxDoLogSysErrorWchar(unsigned long lErrCode, const wxChar *form
     va_end(argptr);
 }
 
-void WXDLLEXPORT wxVLogSysError(unsigned long err, const wxString& format, va_list argptr)
+void WXDLLIMPEXP_BASE wxVLogSysError(unsigned long err, const wxString& format, va_list argptr)
     { wxVLogSysError((long)err, format, argptr); }
 #endif // __WATCOMC__
 
diff --git a/src/msw/snglinst.cpp b/src/msw/snglinst.cpp
index 83f66d46a0..7ccf5af9e0 100644
--- a/src/msw/snglinst.cpp
+++ b/src/msw/snglinst.cpp
@@ -40,7 +40,7 @@
 // wxSingleInstanceCheckerImpl: the real implementation class
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxSingleInstanceCheckerImpl
+class WXDLLIMPEXP_BASE wxSingleInstanceCheckerImpl
 {
 public:
     wxSingleInstanceCheckerImpl()