Added wxRadioButton::MSWWindowProc to reset m_focusJustSet -- otherwise,

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

diff --git a/include/wx/mac/clipbrd.h b/include/wx/mac/clipbrd.h
index 0c9bee6acfcb6016c55be132577eb9cb0ba1f613..62fe3e51c471bccb3cd6173b5ad13cddc7a81466 100644 (file)
--- a/include/wx/mac/clipbrd.h
+++ b/include/wx/mac/clipbrd.h
@@ -25,37 +25,12 @@
 #include "wx/module.h"
 #include "wx/dataobj.h"     // for wxDataFormat
 
-// These functions superceded by wxClipboard, but retained in order to
-// implement wxClipboard, and for compatibility.
-
-// open/close the clipboard
-WXDLLEXPORT bool wxOpenClipboard();
-WXDLLEXPORT bool wxIsClipboardOpened();
-#define wxClipboardOpen wxIsClipboardOpened
-WXDLLEXPORT bool wxCloseClipboard();
-
-// get/set data
-WXDLLEXPORT bool wxEmptyClipboard();
-WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat,
-                                    const void *data,
-                                    int width = 0, int height = 0);
-WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat,
-                                     long *len = NULL);
-
-// clipboard formats
-WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
-WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
-WXDLLEXPORT int  wxRegisterClipboardFormat(wxChar *formatName);
-WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
-                                          wxChar *formatName,
-                                          int maxCount);
-
 //-----------------------------------------------------------------------------
 // wxClipboard
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxDataObject;
-class WXDLLEXPORT wxClipboard : public wxObject
+class WXDLLEXPORT wxClipboard : public wxClipboardBase
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
@@ -79,7 +54,7 @@ public:
     virtual bool AddData( wxDataObject *data );
 
     // ask if data in correct format is available
-    virtual bool IsSupported( wxDataFormat format );
+    virtual bool IsSupported( const wxDataFormat& format );
 
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject& data );
@@ -96,7 +71,8 @@ public:
     void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
 
 private:
-    bool m_clearOnExit;
+    wxDataObject     *m_data;
+    bool              m_open;
 };
 
 #endif // wxUSE_CLIPBOARD