fixed DLL linking of wxConvLibc etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
8f6d9cb3f7
commit
092ee46f03
@ -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 ) \
|
||||
|
@ -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; \
|
||||
|
Loading…
Reference in New Issue
Block a user