Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed DLL linking of wxConvLibc etc.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-05-03 15:35:07 +00:00
parent 8f6d9cb3f7
commit 092ee46f03
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/strconv.h
View File

@@ -442,7 +442,7 @@ private:
// instead. // instead.
#define WX_DECLARE_GLOBAL_CONV(klass, name) \ #define WX_DECLARE_GLOBAL_CONV(klass, name) \
extern WXDLLIMPEXP_DATA_BASE(klass*) name##Ptr; \ 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() \ inline klass& wxGet_##name() \
{ \ { \
if ( !name##Ptr ) \ if ( !name##Ptr ) \

2
src/common/strconv.cpp
View File

@@ -3666,7 +3666,7 @@ wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws)
#define WX_DEFINE_GLOBAL_CONV2(klass, impl_klass, name, ctor_args) \ #define WX_DEFINE_GLOBAL_CONV2(klass, impl_klass, name, ctor_args) \
WXDLLIMPEXP_DATA_BASE(klass*) name##Ptr = NULL; \ 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; \ static impl_klass name##Obj ctor_args; \
return &name##Obj; \ return &name##Obj; \