X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/222ed1d678dff2f5c3c4164321dd05e8f47de487..2d4957f2401a8814f90cda21ef945d99bc74596e:/include/wx/dataobj.h diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index a80b6a4c6e..958db8d706 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -12,7 +12,7 @@ #ifndef _WX_DATAOBJ_H_BASE_ #define _WX_DATAOBJ_H_BASE_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dataobjbase.h" #endif @@ -86,6 +86,8 @@ public: #include "wx/x11/dataform.h" #elif defined(__WXMAC__) #include "wx/mac/dataform.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/dataform.h" #elif defined(__WXPM__) #include "wx/os2/dataform.h" #endif @@ -170,6 +172,8 @@ public: #include "wx/gtk/dataobj.h" #elif defined(__WXMAC__) #include "wx/mac/dataobj.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/dataobj.h" #elif defined(__WXPM__) #include "wx/os2/dataobj.h" #endif @@ -241,6 +245,8 @@ public: private: // the one and only format we support wxDataFormat m_format; + + DECLARE_NO_COPY_CLASS(wxDataObjectSimple) }; // ---------------------------------------------------------------------------- @@ -294,6 +300,8 @@ private: // the index of the preferred one (0 initially, so by default the first // one is the preferred) size_t m_preferred; + + DECLARE_NO_COPY_CLASS(wxDataObjectComposite) }; // ============================================================================ @@ -341,6 +349,8 @@ private: { return(wxDataObjectSimple::GetDataHere(format, pBuf)); } bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); } + + DECLARE_NO_COPY_CLASS(wxTextDataObject) }; // ---------------------------------------------------------------------------- @@ -364,6 +374,8 @@ public: protected: wxBitmap m_bitmap; + + DECLARE_NO_COPY_CLASS(wxBitmapDataObjectBase) }; // ---------------------------------------------------------------------------- @@ -395,6 +407,8 @@ private: { return(wxDataObjectSimple::GetDataSize(format)); } bool GetDataHere(const wxDataFormat& format, void* pBuf) const { return(wxDataObjectSimple::GetDataHere(format, pBuf)); } + + DECLARE_NO_COPY_CLASS(wxFileDataObjectBase) }; // ---------------------------------------------------------------------------- @@ -470,6 +484,8 @@ private: #include "wx/motif/dataobj2.h" #elif defined(__WXMAC__) #include "wx/mac/dataobj2.h" + #elif defined(__WXCOCOA__) + #include "wx/cocoa/dataobj2.h" #elif defined(__WXPM__) #include "wx/os2/dataobj2.h" #endif