fixes needed for separate DLL build to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
#include "wx/defs.h"
|
||||
#include "wx/memory.h"
|
||||
|
||||
class WXDLLEXPORT wxObject;
|
||||
class WXDLLEXPORT_BASE wxObject;
|
||||
|
||||
#if wxUSE_DYNAMIC_CLASSES
|
||||
|
||||
@@ -41,9 +41,9 @@ class WXDLLEXPORT wxObject;
|
||||
#undef GetClassInfo
|
||||
#endif
|
||||
|
||||
class WXDLLEXPORT wxClassInfo;
|
||||
class WXDLLEXPORT wxHashTable;
|
||||
class WXDLLEXPORT wxObjectRefData;
|
||||
class WXDLLEXPORT_BASE wxClassInfo;
|
||||
class WXDLLEXPORT_BASE wxHashTable;
|
||||
class WXDLLEXPORT_BASE wxObjectRefData;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxClassInfo
|
||||
@@ -51,7 +51,7 @@ class WXDLLEXPORT wxObjectRefData;
|
||||
|
||||
typedef wxObject *(*wxObjectConstructorFn)(void);
|
||||
|
||||
class WXDLLEXPORT wxClassInfo
|
||||
class WXDLLEXPORT_BASE wxClassInfo
|
||||
{
|
||||
public:
|
||||
wxClassInfo( const wxChar *className,
|
||||
@@ -133,7 +133,7 @@ private:
|
||||
DECLARE_NO_COPY_CLASS(wxClassInfo)
|
||||
};
|
||||
|
||||
WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name);
|
||||
WXDLLEXPORT_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Dynamic class macros
|
||||
@@ -392,7 +392,7 @@ inline void wxCheckCast(void *ptr)
|
||||
// wxObject: the root class of wxWindows object hierarchy
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxObject
|
||||
class WXDLLEXPORT_BASE wxObject
|
||||
{
|
||||
DECLARE_ABSTRACT_CLASS(wxObject)
|
||||
|
||||
@@ -490,9 +490,9 @@ protected:
|
||||
// wxObjectRefData: ref counted data meant to be stored in wxObject
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxObjectRefData
|
||||
class WXDLLEXPORT_BASE wxObjectRefData
|
||||
{
|
||||
friend class WXDLLEXPORT wxObject;
|
||||
friend class WXDLLEXPORT_BASE wxObject;
|
||||
|
||||
public:
|
||||
wxObjectRefData() : m_count(1) { }
|
||||
|
Reference in New Issue
Block a user