X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3399051ee9fa4dfa5fa7ac2dd9034062f4414d64..bd00fe32fb099384c5fdd337e3749ae461ae497f:/include/wx/motif/clipbrd.h diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h index 5a420ed322..bd502e32bd 100644 --- a/include/wx/motif/clipbrd.h +++ b/include/wx/motif/clipbrd.h @@ -12,16 +12,15 @@ #ifndef _WX_CLIPBRD_H_ #define _WX_CLIPBRD_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "clipbrd.h" -#endif - #if wxUSE_CLIPBOARD -class wxDataObject; +class WXDLLIMPEXP_CORE wxDataObject; +struct wxDataIdToDataObject; #include "wx/list.h" + WX_DECLARE_LIST(wxDataObject, wxDataObjectList); +WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList); bool WXDLLEXPORT wxOpenClipboard(); bool WXDLLEXPORT wxClipboardOpen(); @@ -38,7 +37,7 @@ bool WXDLLEXPORT wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatN // wxClipboard //----------------------------------------------------------------------------- -class wxClipboard : public wxClipboardBase +class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { public: wxClipboard(); @@ -72,11 +71,11 @@ public: { m_usePrimary = primary; } // implementation from now on - bool m_open; wxDataObjectList m_data; bool m_usePrimary; - + wxDataIdToDataObjectList m_idToObject; + private: DECLARE_DYNAMIC_CLASS(wxClipboard) };