Committing in .

[wxWidgets.git] / include / wx / dataobj.h

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 1607559a5df051249f68f59a338576b61869dd6c..e7042d2b07310580b918a6c197dfa27e74823991 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -79,13 +79,15 @@ public:
     #include "wx/motif/dataform.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataform.h"
     #include "wx/motif/dataform.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataform.h"

+#elif defined(__WXMAC__)
+    #include "wx/mac/dataform.h"

 #elif defined(__WXPM__)
     #include "wx/os2/dataform.h"
 #endif
 
 // the value for default argument to some functions (corresponds to
 // wxDF_INVALID)
 #elif defined(__WXPM__)
     #include "wx/os2/dataform.h"
 #endif
 
 // 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


@@ -144,6 +146,9 @@ public:
     {
         return FALSE;
     }
     {
         return FALSE;
     }

+
+    // returns TRUE if this format is supported
+    bool IsSupported(const wxDataFormat& format, Direction dir = Get) const;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -159,7 +164,7 @@ public:
 #elif defined(__WXQT__)
     #include "wx/qt/dnd.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXQT__)
     #include "wx/qt/dnd.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/dnd.h"
+    #include "wx/mac/dataobj.h"

 #elif defined(__WXPM__)
     #include "wx/os2/dataobj.h"
 #elif defined(__WXSTUBS__)
 #elif defined(__WXPM__)
     #include "wx/os2/dataobj.h"
 #elif defined(__WXSTUBS__)


@@ -245,7 +250,7 @@ private:
 // wxDataObject directly.
 // ----------------------------------------------------------------------------
 
 // wxDataObject directly.
 // ----------------------------------------------------------------------------
 

-WX_DECLARE_LIST(wxDataObjectSimple, wxSimpleDataObjectList);
+WX_DECLARE_EXPORTED_LIST(wxDataObjectSimple, wxSimpleDataObjectList);

 
 class WXDLLEXPORT wxDataObjectComposite : public wxDataObject
 {
 
 class WXDLLEXPORT wxDataObjectComposite : public wxDataObject
 {


@@ -320,8 +325,8 @@ private:
     // virtual function hiding supression
     size_t GetDataSize(const wxDataFormat& format) const
         { return(wxDataObjectSimple::GetDataSize(format)); }
     // virtual function hiding supression
     size_t GetDataSize(const wxDataFormat& format) const
         { return(wxDataObjectSimple::GetDataSize(format)); }

-    bool GetDataHere(const wxDataFormat& WXUNUSED(format), void *pBuf) const
-        { return(wxDataObjectSimple::GetDataHere(pBuf)); }
+    bool GetDataHere(const wxDataFormat& format, void *pBuf) const
+        { return(wxDataObjectSimple::GetDataHere(format, pBuf)); }

     bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf)
         { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); }
 };
     bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf)
         { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); }
 };


@@ -376,8 +381,8 @@ private:
     // Virtual function hiding supression
     size_t GetDataSize(const wxDataFormat& format) const
         { return(wxDataObjectSimple::GetDataSize(format)); }
     // Virtual function hiding supression
     size_t GetDataSize(const wxDataFormat& format) const
         { return(wxDataObjectSimple::GetDataSize(format)); }

-    bool GetDataHere(const wxDataFormat& WXUNUSED(format), void* pBuf) const
-        { return(wxDataObjectSimple::GetDataHere(pBuf)); }
+    bool GetDataHere(const wxDataFormat& format, void* pBuf) const
+        { return(wxDataObjectSimple::GetDataHere(format, pBuf)); }

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -444,6 +449,8 @@ private:
     // #include "wx/motif/dataobj2.h" -- not yet
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataobj2.h"
     // #include "wx/motif/dataobj2.h" -- not yet
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataobj2.h"

+#elif defined(__WXMAC__)
+    #include "wx/mac/dataobj2.h"

 #elif defined(__WXPM__)
     #include "wx/os2/dataobj2.h"
 #endif
 #elif defined(__WXPM__)
     #include "wx/os2/dataobj2.h"
 #endif