wxMotif compilation fixes for wxDataObject and PROCESS_EVENTS (wxSocket)

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index a24d4c3c5834fd993a35bf231d6ee607b7340ceb..d9ca91ec449636965bfca7a19cab8c4cb072fe3e 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -474,6 +474,15 @@ bool wxClipboard::Open()
 #endif
 }
 
+bool wxClipboard::IsOpened() const
+{
+#if wxUSE_OLE_CLIPBOARD
+    return TRUE;
+#else
+    return wxIsClipboardOpened();
+#endif
+}
+
 bool wxClipboard::SetData( wxDataObject *data )
 {
     (void)wxEmptyClipboard();
@@ -584,7 +593,7 @@ bool wxClipboard::GetData( wxDataObject *data )
     }
 
     // build the list of supported formats
-    size_t nFormats = data->GetFormatCount(FALSE /* for SetData() */);
+    size_t nFormats = data->GetFormatCount(wxDataObject::Set);
     wxDataFormat format, *formats;
     if ( nFormats == 1 )
     {
@@ -597,7 +606,7 @@ bool wxClipboard::GetData( wxDataObject *data )
         formats = new wxDataFormat[nFormats];
     }
 
-    data->GetAllFormats(formats, FALSE);
+    data->GetAllFormats(formats, wxDataObject::Set);
 
     // get the format enumerator
     bool result = FALSE;