Fixes from Mumit Khan to allow DLL compilation; most fixes related to
missing WXDLLEXPORTs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
dbefe3d8f5
commit
6f4968e281
@ -87,7 +87,7 @@ public:
|
||||
|
||||
// the value for default argument to some functions (corresponds to
|
||||
// wxDF_INVALID)
|
||||
extern const wxDataFormat& wxFormatInvalid;
|
||||
extern WXDLLEXPORT const wxDataFormat& wxFormatInvalid;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxDataObject represents a piece of data which knows which formats it
|
||||
|
@ -378,6 +378,22 @@ typedef int wxWindowID;
|
||||
# define WXDLLEXPORT_CTORFN
|
||||
# endif
|
||||
|
||||
#elif defined(__GNUC__)
|
||||
|
||||
# ifdef WXMAKINGDLL
|
||||
# define WXDLLEXPORT __declspec( dllexport )
|
||||
# define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type
|
||||
# define WXDLLEXPORT_CTORFN
|
||||
# elif defined(WXUSINGDLL)
|
||||
# define WXDLLEXPORT __declspec( dllimport )
|
||||
# define WXDLLEXPORT_DATA(type) __declspec( dllimport ) type
|
||||
# define WXDLLEXPORT_CTORFN
|
||||
# else
|
||||
# define WXDLLEXPORT
|
||||
# define WXDLLEXPORT_DATA(type) type
|
||||
# define WXDLLEXPORT_CTORFN
|
||||
# endif
|
||||
|
||||
#elif defined(__WXPM__)
|
||||
|
||||
# ifdef WXMAKINGDLL
|
||||
|
@ -128,7 +128,7 @@ enum wxFontEncoding
|
||||
|
||||
class WXDLLEXPORT wxFontRefData;
|
||||
|
||||
class wxFontBase : public wxGDIObject
|
||||
class WXDLLEXPORT wxFontBase : public wxGDIObject
|
||||
{
|
||||
public:
|
||||
// creator function
|
||||
|
@ -52,7 +52,7 @@
|
||||
#define WXGRID_DEFAULT_TOPEDIT_HEIGHT 60
|
||||
|
||||
|
||||
class wxGrid;
|
||||
class WXDLLEXPORT wxGrid;
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
@ -283,7 +283,7 @@ class wxGridTextCtrl : public wxTextCtrl
|
||||
};
|
||||
|
||||
|
||||
class wxGrid : public wxPanel
|
||||
class WXDLLEXPORT wxGrid : public wxPanel
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( wxGrid )
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
|
||||
class wxMemoryInputStream: public wxInputStream {
|
||||
class WXDLLEXPORT wxMemoryInputStream: public wxInputStream {
|
||||
private:
|
||||
size_t m_length;
|
||||
|
||||
@ -37,7 +37,7 @@ class wxMemoryInputStream: public wxInputStream {
|
||||
off_t OnSysTell() const;
|
||||
};
|
||||
|
||||
class wxMemoryOutputStream: public wxOutputStream {
|
||||
class WXDLLEXPORT wxMemoryOutputStream: public wxOutputStream {
|
||||
public:
|
||||
wxMemoryOutputStream(char *data = NULL, size_t length = 0);
|
||||
virtual ~wxMemoryOutputStream();
|
||||
|
@ -9,7 +9,7 @@
|
||||
// Licence: wxWindows license
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
class wxToolTip : public wxObject
|
||||
class WXDLLEXPORT wxToolTip : public wxObject
|
||||
{
|
||||
public:
|
||||
// ctor & dtor
|
||||
|
Loading…
Reference in New Issue
Block a user