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

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 5d80b6f16e83da95bd84b8016dcff699789b2df4..08171926b88da6306324a63a4e832990115ff6e7 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -87,7 +87,7 @@ public:
 
 // the value for default argument to some functions (corresponds to
 // wxDF_INVALID)
 
 // 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
 
 // ----------------------------------------------------------------------------
 // wxDataObject represents a piece of data which knows which formats it

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 9ac82a237ac3d6621f190e73ba92e53f4e8ee97a..7adcc6ae051a91bed9b568eb323cb6ed9503c693 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -378,6 +378,22 @@ typedef int wxWindowID;
 #    define WXDLLEXPORT_CTORFN
 #  endif
 
 #    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
 #elif defined(__WXPM__)
 
 #  ifdef WXMAKINGDLL

diff --git a/include/wx/font.h b/include/wx/font.h
index 3860ec3d54ee3e61a89e1fedab3e28904245c5b6..6b1737db518b97972cdcebd08b83c59184d36274 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -128,7 +128,7 @@ enum wxFontEncoding
 
 class WXDLLEXPORT wxFontRefData;
 
 
 class WXDLLEXPORT wxFontRefData;
 

-class wxFontBase : public wxGDIObject
+class WXDLLEXPORT wxFontBase : public wxGDIObject

 {
 public:
     // creator function
 {
 public:
     // creator function

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 4ab8ec061ec68e8ffea2a25d844f3d8027e4208d..23bef5c25a003bae6974b591ee9d959737505cdc 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -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 )
 

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 7a71e8059a3dd3cdb442922f6b6d763ae0a9f188..85e0b30e35479f4903f0d54235254486caf13998 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -15,7 +15,7 @@
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-class wxMemoryInputStream: public wxInputStream {
+class WXDLLEXPORT wxMemoryInputStream: public wxInputStream {

  private:
   size_t m_length;
   
  private:
   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:
   wxMemoryOutputStream(char *data = NULL, size_t length = 0);
   virtual ~wxMemoryOutputStream();
  public:
   wxMemoryOutputStream(char *data = NULL, size_t length = 0);
   virtual ~wxMemoryOutputStream();

diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
index 135e87116e987fb769d2e802904872ad0b023a24..7c637340c27392e0bb41dd8299fbf94c49373cff 100644 (file)
--- a/include/wx/msw/tooltip.h
+++ b/include/wx/msw/tooltip.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

-class wxToolTip : public wxObject
+class WXDLLEXPORT wxToolTip : public wxObject

 {
 public:
     // ctor & dtor
 {
 public:
     // ctor & dtor