From: Václav Slavík <vslavik@fastmail.fm>
Date: Wed, 2 Jul 2003 12:50:48 +0000 (+0000)
Subject: fixed to make wxBase DLL compile
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fd242375198e16a92283f633dfe0bdb80d1ffa58

fixed to make wxBase DLL compile


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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index bbd8ce8369..29710e6d04 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -50,19 +50,19 @@
 // ----------------------------------------------------------------------------
 
 #if wxUSE_WCHAR_T
-    WXDLLEXPORT_DATA(wxMBConv) wxConvLibc;
-    WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
-    WXDLLEXPORT_DATA(wxCSConv) wxConvISO8859_1(_T("iso-8859-1"));
+    WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc;
+    WXDLLIMPEXP_DATA_BASE(wxCSConv) wxConvLocal((const wxChar *)NULL);
+    WXDLLIMPEXP_DATA_BASE(wxCSConv) wxConvISO8859_1(_T("iso-8859-1"));
 #else
     // stand-ins in absence of wchar_t
-    WXDLLEXPORT_DATA(wxMBConv) wxConvLibc,
-                               wxConvFile,
-                               wxConvISO8859_1,
-                               wxConvLocal,
-                               wxConvUTF8;
+    WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
+                                    wxConvFile,
+                                    wxConvISO8859_1,
+                                    wxConvLocal,
+                                    wxConvUTF8;
 #endif // wxUSE_WCHAR_T
 
-WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
+WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibc;
 
 class wxStrConvModule: public wxModule
 {
@@ -281,7 +281,7 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
 
 #ifdef __WXGTK12__
 
-WXDLLEXPORT_DATA(wxMBConvGdk) wxConvGdk;
+WXDLLIMPEXP_DATA_BASE(wxMBConvGdk) wxConvGdk;
 
 #include <gdk/gdk.h>
 
@@ -321,7 +321,7 @@ size_t wxMBConvGdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 // UTF-7
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(wxMBConvUTF7) wxConvUTF7;
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7) wxConvUTF7;
 
 #if 0
 static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -352,7 +352,7 @@ size_t wxMBConvUTF7::WC2MB(char * WXUNUSED(buf),
 // UTF-8
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(wxMBConvUTF8) wxConvUTF8;
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8) wxConvUTF8;
 
 static wxUint32 utf8_max[]=
     { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };
diff --git a/src/common/string.cpp b/src/common/string.cpp
index 34776e1caa..25e4aa3de3 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -79,7 +79,7 @@ static const struct
 } g_strEmpty = { {-1, 0, 0}, wxT('\0') };
 
 // empty C style string: points to 'string data' byte of g_strEmpty
-extern const wxChar WXDLLEXPORT *wxEmptyString = &g_strEmpty.dummy;
+extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = &g_strEmpty.dummy;
 
 // ----------------------------------------------------------------------------
 // global functions
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 0580ea7678..03deb7925c 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -144,8 +144,8 @@ wxRegisterId (long id)
 
 #if WXWIN_COMPATIBILITY_2_4
 
-WXDLLEXPORT_DATA(const wxChar *) wxFloatToStringStr = wxT("%.2f");
-WXDLLEXPORT_DATA(const wxChar *) wxDoubleToStringStr = wxT("%.2f");
+WXDLLIMPEXP_DATA_BASE(const wxChar *) wxFloatToStringStr = wxT("%.2f");
+WXDLLIMPEXP_DATA_BASE(const wxChar *) wxDoubleToStringStr = wxT("%.2f");
 
 void
 StringToFloat (const wxChar *s, float *number)
diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index d2dd9665ba..b7399182ca 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -44,13 +44,13 @@ using namespace std ;
 
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
-wxVariant WXDLLEXPORT wxNullVariant;
+wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 /*
  * wxVariantDataList
  */
 
-class WXDLLEXPORT wxVariantDataList: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataList)
 public:
@@ -198,7 +198,7 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str))
  * wxVariantDataStringList
  */
 
-class WXDLLEXPORT wxVariantDataStringList: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
 public:
@@ -306,7 +306,7 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
  * wxVariantDataLong
  */
 
-class WXDLLEXPORT wxVariantDataLong: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
 public:
@@ -407,7 +407,7 @@ bool wxVariantDataLong::Read(wxString& str)
  * wxVariantDataReal
  */
 
-class WXDLLEXPORT wxVariantDataReal: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataReal: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataReal)
 public:
@@ -508,7 +508,7 @@ bool wxVariantDataReal::Read(wxString& str)
  * wxVariantDataBool
  */
 
-class WXDLLEXPORT wxVariantDataBool: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataBool)
 public:
@@ -612,7 +612,7 @@ bool wxVariantDataBool::Read(wxString& str)
  * wxVariantDataChar
  */
 
-class WXDLLEXPORT wxVariantDataChar: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
 public:
@@ -718,7 +718,7 @@ bool wxVariantDataChar::Read(wxString& str)
 #define wxVariantDataString wxVariantStringData
 #endif
 
-class WXDLLEXPORT wxVariantDataString: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData
 {
 #if defined(__BORLANDC__) && defined(__WIN16__)
 DECLARE_DYNAMIC_CLASS(wxVariantStringData)