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

Fixes from Mumit Khan to allow DLL compilation; most fixes related to

Browse Source 
missing WXDLLEXPORTs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-01-10 00:55:05 +00:00
parent dbefe3d8f5
commit 6f4968e281
6 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dataobj.h
View File

@@ -87,7 +87,7 @@ public:
// the value for default argument to some functions (corresponds to // the value for default argument to some functions (corresponds to
// wxDF_INVALID) // wxDF_INVALID)
extern const wxDataFormat& wxFormatInvalid; extern WXDLLEXPORT const wxDataFormat& wxFormatInvalid;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxDataObject represents a piece of data which knows which formats it // wxDataObject represents a piece of data which knows which formats it

16
include/wx/defs.h
View File

@@ -378,6 +378,22 @@ typedef int wxWindowID;
# define WXDLLEXPORT_CTORFN # define WXDLLEXPORT_CTORFN
# endif # 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__) #elif defined(__WXPM__)
# ifdef WXMAKINGDLL # ifdef WXMAKINGDLL

2
include/wx/font.h
View File

@@ -128,7 +128,7 @@ enum wxFontEncoding
class WXDLLEXPORT wxFontRefData; class WXDLLEXPORT wxFontRefData;
class wxFontBase : public wxGDIObject class WXDLLEXPORT wxFontBase : public wxGDIObject
{ {
public: public:
// creator function // creator function

4
include/wx/generic/grid.h
View File

@@ -52,7 +52,7 @@
#define WXGRID_DEFAULT_TOPEDIT_HEIGHT 60 #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 ) DECLARE_DYNAMIC_CLASS( wxGrid )

4
include/wx/mstream.h
View File

@@ -15,7 +15,7 @@
#if wxUSE_STREAMS #if wxUSE_STREAMS
class wxMemoryInputStream: public wxInputStream { class WXDLLEXPORT wxMemoryInputStream: public wxInputStream {
private: private:
size_t m_length; size_t m_length;
@@ -37,7 +37,7 @@ class wxMemoryInputStream: public wxInputStream {
off_t OnSysTell() const; off_t OnSysTell() const;
}; };
class wxMemoryOutputStream: public wxOutputStream { class WXDLLEXPORT wxMemoryOutputStream: public wxOutputStream {
public: public:
wxMemoryOutputStream(char *data = NULL, size_t length = 0); wxMemoryOutputStream(char *data = NULL, size_t length = 0);
virtual ~wxMemoryOutputStream(); virtual ~wxMemoryOutputStream();

2
include/wx/msw/tooltip.h
View File

@@ -9,7 +9,7 @@
// Licence: wxWindows license // Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class wxToolTip : public wxObject class WXDLLEXPORT wxToolTip : public wxObject
{ {
public: public:
// ctor & dtor // ctor & dtor