fixed DLL linking of wxConvLibc etc.

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 4360b7f6a32928eeffb0ab7628a40f8a1c3eb38d..0fbe71bfd5fa2660fd8a56ebd300ee1242d15745 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -442,7 +442,7 @@ private:
 // instead.
 #define WX_DECLARE_GLOBAL_CONV(klass, name)                             \
     extern WXDLLIMPEXP_DATA_BASE(klass*) name##Ptr;                     \
-    extern klass* WXDLLIMPEXP_BASE wxGet_##name##Ptr();                 \
+    extern WXDLLIMPEXP_BASE klass* wxGet_##name##Ptr();                 \
     inline klass& wxGet_##name()                                        \
     {                                                                   \
         if ( !name##Ptr )                                               \

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index f2947edfd3ff6f8e25881b7684681d0edd306326..2a0cb613c663d598e89a26451adedef7f99fbabc 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -3666,7 +3666,7 @@ wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws)
 
 #define WX_DEFINE_GLOBAL_CONV2(klass, impl_klass, name, ctor_args)      \
     WXDLLIMPEXP_DATA_BASE(klass*) name##Ptr = NULL;                     \
-    klass* WXDLLIMPEXP_BASE wxGet_##name##Ptr()                         \
+    WXDLLIMPEXP_BASE klass* wxGet_##name##Ptr()                         \
     {                                                                   \
         static impl_klass name##Obj ctor_args;                          \
         return &name##Obj;                                              \