Applied patch [ 1845819 ] wxMSW Top level window freeze fix for trunk

[wxWidgets.git] / include / wx / motif / clipbrd.h

diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index e0baf4a4ac5eee6f526f8bdd0bcd70fb72853dc5..d0aa3db2749fefb14e98f8e56379db1bb4a60de4 100644 (file)
--- a/include/wx/motif/clipbrd.h
+++ b/include/wx/motif/clipbrd.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        clipbrd.h
+// Name:        wx/motif/clipbrd.h
 // Purpose:     Clipboard functionality.
 // Author:      Julian Smart
 // Modified by:
@@ -12,34 +12,36 @@
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 
-#ifdef __GNUG__
-    #pragma interface "clipbrd.h"
-#endif
-
 #if wxUSE_CLIPBOARD
 
+class WXDLLIMPEXP_FWD_CORE wxDataObject;
+struct wxDataIdToDataObject;
+
 #include "wx/list.h"
 
-bool WXDLLEXPORT wxOpenClipboard();
-bool WXDLLEXPORT wxClipboardOpen();
-bool WXDLLEXPORT wxCloseClipboard();
-bool WXDLLEXPORT wxEmptyClipboard();
-bool WXDLLEXPORT wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
-bool WXDLLEXPORT wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width = 0, int height = 0);
-wxObject* WXDLLEXPORT wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL);
-wxDataFormat WXDLLEXPORT wxEnumClipboardFormats(wxDataFormat dataFormat);
-wxDataFormat WXDLLEXPORT wxRegisterClipboardFormat(char *formatName);
-bool WXDLLEXPORT wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount);
+WX_DECLARE_LIST(wxDataObject, wxDataObjectList);
+WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList);
+
+WXDLLEXPORT bool wxOpenClipboard();
+WXDLLEXPORT bool wxClipboardOpen();
+WXDLLEXPORT bool wxCloseClipboard();
+WXDLLEXPORT bool wxEmptyClipboard();
+WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
+WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width = 0, int height = 0);
+WXDLLEXPORT wxObject* wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL);
+WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
+WXDLLEXPORT wxDataFormat wxRegisterClipboardFormat(char *formatName);
+WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount);
 
 //-----------------------------------------------------------------------------
 // wxClipboard
 //-----------------------------------------------------------------------------
 
-class wxClipboard : public wxClipboardBase
+class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
 {
 public:
     wxClipboard();
-    ~wxClipboard();
+    virtual ~wxClipboard();
 
     // open the clipboard before SetData() and GetData()
     virtual bool Open();
@@ -65,14 +67,10 @@ public:
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
 
-    virtual void UsePrimarySelection(bool primary = TRUE)
-        { m_usePrimary = primary; }
-
     // implementation from now on
-
     bool              m_open;
-    wxList            m_data;
-    bool              m_usePrimary;
+    wxDataObjectList  m_data;
+    wxDataIdToDataObjectList m_idToObject;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboard)
@@ -80,5 +78,4 @@ private:
 
 #endif // wxUSE_CLIPBOARD
 
-#endif
-    // _WX_CLIPBRD_H_
+#endif // _WX_CLIPBRD_H_