fixed (rare but fatal) bug in wxWindowDisabler

[wxWidgets.git] / src / mac / clipbrd.cpp

diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp
index 828b8984fc19c28f31c0f6bb2368f19318918320..36f4c0f4d9e72a4450050f5a0a9877009d768a43 100644 (file)
--- a/src/mac/clipbrd.cpp
+++ b/src/mac/clipbrd.cpp
@@ -23,6 +23,7 @@
 
 #include <string.h>
 
+// open/close
 bool wxOpenClipboard()
 {
     return TRUE;
@@ -30,54 +31,52 @@ bool wxOpenClipboard()
 
 bool wxCloseClipboard()
 {
-    return FALSE;
+    return TRUE;
 }
 
-bool wxEmptyClipboard()
+bool wxIsClipboardOpened()
 {
-               ZeroScrap() ;
-    return FALSE;
+     return TRUE;
 }
 
-bool wxClipboardOpen()
+// get/set data
+
+bool wxEmptyClipboard()
 {
-    // TODO
-    return FALSE;
+       ZeroScrap() ;
+    return TRUE;
 }
 
-bool wxIsClipboardFormatAvailable(int dataFormat)
+bool wxSetClipboardData(wxDataFormat dataFormat,const void *data,int width , int height)
 {
-    // TODO
     return FALSE;
 }
 
-bool wxSetClipboardData(int dataFormat, wxObject *obj, int width, int height)
+void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 {
-    // TODO
-    return FALSE;
+    return NULL;
 }
 
-wxObject *wxGetClipboardData(int dataFormat, long *len)
+
+// clipboard formats
+
+bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 {
-    // TODO
-    return NULL;
+     return FALSE;
 }
 
-int  wxEnumClipboardFormats(int dataFormat)
+wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat)
 {
-    // TODO
-    return 0;
+    return wxDataFormat();
 }
 
-int  wxRegisterClipboardFormat(char *formatName)
+int  wxRegisterClipboardFormat(wxChar *formatName)
 {
-    // TODO
     return 0;
 }
 
-bool wxGetClipboardFormatName(int dataFormat, char *formatName, int maxCount)
+bool wxGetClipboardFormatName(wxDataFormat dataFormat, wxChar *formatName, int maxCount)
 {
-    // TODO
     return FALSE;
 }
 
@@ -85,6 +84,8 @@ bool wxGetClipboardFormatName(int dataFormat, char *formatName, int maxCount)
  * Generalized clipboard implementation by Matthew Flatt
  */
 
+IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
+
 wxClipboard::wxClipboard()
 {
     m_clearOnExit = FALSE;