X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd304d989b2c5c35ac1a849d508cb21f4d54609e..47cd661014b0bcf3311d8b6b01e87a13a04a2465:/include/wx/motif/clipbrd.h diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h index 6b17de1e9f..1e16040456 100644 --- a/include/wx/motif/clipbrd.h +++ b/include/wx/motif/clipbrd.h @@ -12,16 +12,19 @@ #ifndef _WX_CLIPBRD_H_ #define _WX_CLIPBRD_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "clipbrd.h" #endif #if wxUSE_CLIPBOARD class wxDataObject; +struct wxDataIdToDataObject; #include "wx/list.h" + WX_DECLARE_LIST(wxDataObject, wxDataObjectList); +WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList); bool WXDLLEXPORT wxOpenClipboard(); bool WXDLLEXPORT wxClipboardOpen(); @@ -68,15 +71,15 @@ public: // clears wxTheClipboard and the system's clipboard if possible virtual void Clear(); - virtual void UsePrimarySelection(bool primary = TRUE) + virtual void UsePrimarySelection(bool primary = true) { m_usePrimary = primary; } // implementation from now on - bool m_open; wxDataObjectList m_data; bool m_usePrimary; - + wxDataIdToDataObjectList m_idToObject; + private: DECLARE_DYNAMIC_CLASS(wxClipboard) };