X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..cba5a276e4821a0ae7d1e7a435d6aab38baa0a9f:/include/wx/dataobj.h diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index 1e6ecad470..24f599fe56 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_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "dataobjbase.h" #endif @@ -161,14 +161,14 @@ public: #include "wx/msw/ole/dataobj.h" #elif defined(__WXMOTIF__) #include "wx/motif/dataobj.h" +#elif defined(__WXX11__) + #include "wx/x11/dataobj.h" #elif defined(__WXGTK__) #include "wx/gtk/dataobj.h" #elif defined(__WXMAC__) #include "wx/mac/dataobj.h" #elif defined(__WXPM__) #include "wx/os2/dataobj.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/dnd.h" #endif // ---------------------------------------------------------------------------- @@ -445,6 +445,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(wxCustomDataObject) }; // ---------------------------------------------------------------------------- @@ -458,6 +460,8 @@ private: #else // !__WXMSW__ #if defined(__WXGTK__) #include "wx/gtk/dataobj2.h" + #elif defined(__WXX11__) + #include "wx/x11/dataobj2.h" #elif defined(__WXMAC__) #include "wx/mac/dataobj2.h" #elif defined(__WXPM__)