wxGTK compatible clipboard implementation (not OLE clipboard - it will come

later)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gtk/clipbrd.h

@@ -42,37 +42,36 @@ extern wxClipboard* wxTheClipboard;
 // wxClipboard
 //-----------------------------------------------------------------------------
 
-class wxClipboard: public wxObject
+class wxClipboard : public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 public:
- 
     wxClipboard();
     ~wxClipboard();
 
-  /* open the clipboard before SetData() and GetData() */
+    // open the clipboard before SetData() and GetData()
     virtual bool Open();
 
-  /* close the clipboard after SetData() and GetData() */
+    // close the clipboard after SetData() and GetData()
     virtual void Close();
 
-  /* set the clipboard data. all other formats will be deleted. */
+    // set the clipboard data. all other formats will be deleted.
     virtual bool SetData( wxDataObject *data );
 
-  /* add to the clipboard data. */
+    // add to the clipboard data.
     virtual bool AddData( wxDataObject *data );
 
-  /* ask if data in correct format is available */
+    // ask if data in correct format is available
     virtual bool IsSupported( wxDataObject &data );
 
-  /* fill data with data on the clipboard (if available) */
+    // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject &data );
 
-  /* clears wxTheClipboard and the system's clipboard if possible */
+    // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
 
-  /* implementation */ 
+    // implementation
 
     bool              m_open;
 

include/wx/gtk1/clipbrd.h

@@ -42,37 +42,36 @@ extern wxClipboard* wxTheClipboard;
 // wxClipboard
 //-----------------------------------------------------------------------------
 
-class wxClipboard: public wxObject
+class wxClipboard : public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 public:
- 
     wxClipboard();
     ~wxClipboard();
 
-  /* open the clipboard before SetData() and GetData() */
+    // open the clipboard before SetData() and GetData()
     virtual bool Open();
 
-  /* close the clipboard after SetData() and GetData() */
+    // close the clipboard after SetData() and GetData()
     virtual void Close();
 
-  /* set the clipboard data. all other formats will be deleted. */
+    // set the clipboard data. all other formats will be deleted.
     virtual bool SetData( wxDataObject *data );
 
-  /* add to the clipboard data. */
+    // add to the clipboard data.
     virtual bool AddData( wxDataObject *data );
 
-  /* ask if data in correct format is available */
+    // ask if data in correct format is available
     virtual bool IsSupported( wxDataObject &data );
 
-  /* fill data with data on the clipboard (if available) */
+    // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject &data );
 
-  /* clears wxTheClipboard and the system's clipboard if possible */
+    // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
 
-  /* implementation */ 
+    // implementation
 
     bool              m_open;
 

include/wx/msw/clipbrd.h

@@ -24,30 +24,41 @@
 #include "wx/list.h"
 #include "wx/module.h"
 
-// These functions superceded by wxClipboard, but retained in order to implement
+// These functions superceded by wxClipboard, but retained in order to
-// wxClipboard, and for compatibility.
+// implement wxClipboard, and for compatibility.
-WXDLLEXPORT bool wxOpenClipboard(void);
+
-WXDLLEXPORT bool wxClipboardOpen(void);
+// open/close the clipboard
-WXDLLEXPORT bool wxCloseClipboard(void);
+WXDLLEXPORT bool wxOpenClipboard();
-WXDLLEXPORT bool wxEmptyClipboard(void);
+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 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 int  wxRegisterClipboardFormat(char *formatName);
-WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount);
+WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
+                                          char *formatName,
+                                          int maxCount);
 
 //-----------------------------------------------------------------------------
 // wxClipboard
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxDataObject;
-class WXDLLEXPORT wxClipboard: public wxObject
+class WXDLLEXPORT wxClipboard : public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 public:
- 
     wxClipboard();
     ~wxClipboard();
 
@@ -57,38 +68,37 @@ public:
     // close the clipboard after SetData() and GetData()
     virtual void Close();
 
-  // can be called several times
+    // set the clipboard data. all other formats will be deleted.
     virtual bool SetData( wxDataObject *data );
 
-  // format available on the clipboard ? 
+    // add to the clipboard data.
-  // supply ID if private format, the same as wxPrivateDataObject::SetId() 
+    virtual bool AddData( wxDataObject *data );
-  virtual bool IsSupportedFormat( wxDataFormat format, const wxString &id = wxEmptyString );
+
+    // ask if data in correct format is available
+    virtual bool IsSupported( wxDataFormat format );
 
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject *data );
 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
-
- // implementation 
- 
-  bool              m_open;
-  wxList            m_data;
 };
 
-/* The clipboard */
+// The global clipboard object
 WXDLLEXPORT_DATA(extern wxClipboard*) wxTheClipboard;
 
 //-----------------------------------------------------------------------------
-// wxClipboardModule
+// wxClipboardModule: module responsible for initializing the global clipboard
+// object
 //-----------------------------------------------------------------------------
 
-class wxClipboardModule: public wxModule
+class wxClipboardModule : public wxModule
 {
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 
 public:
-    wxClipboardModule() {}
+    wxClipboardModule() { }
+
     bool OnInit();
     void OnExit();
 };

include/wx/msw/ole/dataobj.h

@@ -87,7 +87,7 @@ class WXDLLEXPORT wxTextDataObject : public wxDataObject
 {
 public:
   // ctors
-  wxTextDataObject();
+  wxTextDataObject() { }
   wxTextDataObject(const wxString& strText) : m_strText(strText) { }
   void Init(const wxString& strText) { m_strText = strText; }
 

src/msw/clipbrd.cpp

@@ -9,102 +9,148 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
 #ifdef __GNUG__
-#pragma implementation "clipbrd.h"
+    #pragma implementation "clipbrd.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/setup.h"
+    #include "wx/setup.h"
 #endif
 
 #if wxUSE_CLIPBOARD
 
 #ifndef WX_PRECOMP
-#include "wx/object.h"
+    #include "wx/object.h"
-#include "wx/event.h"
+    #include "wx/event.h"
-#include "wx/app.h"
+    #include "wx/app.h"
-#include "wx/frame.h"
+    #include "wx/frame.h"
-#include "wx/bitmap.h"
+    #include "wx/bitmap.h"
-#include "wx/utils.h"
+    #include "wx/utils.h"
 #endif
 
 #if wxUSE_METAFILE
-#include "wx/metafile.h"
+    #include "wx/metafile.h"
 #endif
 
 #include "wx/clipbrd.h"
 
 #include <windows.h>
 
-HICON myIcon;
-
 #include "wx/msw/private.h"
 #include "wx/msw/dib.h"
 
 // wxDataObject is tied to OLE/drag and drop implementation,
 // therefore so is wxClipboard :-(
 #if wxUSE_DRAG_AND_DROP
-#include "wx/dataobj.h"
+    #include "wx/dataobj.h"
 #endif
 
 #include <string.h>
 
-bool wxClipboardIsOpen = FALSE;
+// ===========================================================================
+// implementation
+// ===========================================================================
 
-bool wxOpenClipboard(void)
+// ---------------------------------------------------------------------------
+// old-style clipboard functions using Windows API
+// ---------------------------------------------------------------------------
+
+static bool gs_wxClipboardIsOpen = FALSE;
+
+bool wxOpenClipboard()
 {
-  if (wxTheApp->GetTopWindow() && !wxClipboardIsOpen)
+    wxCHECK_MSG( !gs_wxClipboardIsOpen, TRUE, "clipboard already opened." );
+
+    wxWindow *win = wxTheApp->GetTopWindow();
+    if ( win )
     {
-    wxClipboardIsOpen = (::OpenClipboard((HWND) wxTheApp->GetTopWindow()->GetHWND()) != 0);
+        gs_wxClipboardIsOpen = ::OpenClipboard((HWND)win->GetHWND()) != 0;
-    return wxClipboardIsOpen;
-  }
-  else return FALSE;
-}
 
-bool wxCloseClipboard(void)
+        if ( !gs_wxClipboardIsOpen )
-{
+            wxLogSysError(_("Failed to open the clipboard."));
-  if (wxClipboardIsOpen)
+
+        return gs_wxClipboardIsOpen;
+    }
+    else
     {
-    wxClipboardIsOpen = FALSE;
+        wxLogDebug("Can not open clipboard without a main window,");
+
+        return FALSE;
     }
-  return (::CloseClipboard() != 0);
 }
 
-bool wxEmptyClipboard(void)
+bool wxCloseClipboard()
 {
-  return (::EmptyClipboard() != 0);
+    wxCHECK_MSG( gs_wxClipboardIsOpen, FALSE, "clipboard is not opened" );
+
+    gs_wxClipboardIsOpen = FALSE;
+
+    if ( ::CloseClipboard() == 0 )
+    {
+        wxLogSysError(_("Failed to close the clipboard."));
+
+        return FALSE;
+    }
+
+    return TRUE;
 }
 
-bool wxClipboardOpen(void)
+bool wxEmptyClipboard()
 {
-  return wxClipboardIsOpen;
+    if ( ::EmptyClipboard() == 0 )
+    {
+        wxLogSysError(_("Failed to empty the clipboard."));
+
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+bool wxIsClipboardOpened()
+{
+  return gs_wxClipboardIsOpen;
 }
 
 bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 {
-  return (::IsClipboardFormatAvailable(dataFormat) != 0);
+    return ::IsClipboardFormatAvailable(dataFormat) != 0;
 }
 
-bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width, int height)
+bool wxSetClipboardData(wxDataFormat dataFormat,
+                        const void *data,
+                        int width, int height)
 {
+    HANDLE handle = 0; // return value of SetClipboardData
+
     switch (dataFormat)
     {
         case wxDF_BITMAP:
             {
-      wxBitmap *wxBM = (wxBitmap *)obj;
+                wxBitmap *bitmap = (wxBitmap *)data;
 
                 HDC hdcMem = CreateCompatibleDC((HDC) NULL);
                 HDC hdcSrc = CreateCompatibleDC((HDC) NULL);
-      HBITMAP old = (HBITMAP) ::SelectObject(hdcSrc, (HBITMAP) wxBM->GetHBITMAP());
+                HBITMAP old = (HBITMAP)
+                    ::SelectObject(hdcSrc, (HBITMAP)bitmap->GetHBITMAP());
                 HBITMAP hBitmap = CreateCompatibleBitmap(hdcSrc,
-                                              wxBM->GetWidth(), wxBM->GetHeight());
+                                                         bitmap->GetWidth(),
+                                                         bitmap->GetHeight());
                 if (!hBitmap)
                 {
                     SelectObject(hdcSrc, old);
@@ -112,39 +158,40 @@ bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width, int h
                     DeleteDC(hdcSrc);
                     return FALSE;
                 }
+
                 HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);
-      BitBlt(hdcMem, 0, 0, wxBM->GetWidth(), wxBM->GetHeight(),
+                BitBlt(hdcMem, 0, 0, bitmap->GetWidth(), bitmap->GetHeight(),
                        hdcSrc, 0, 0, SRCCOPY);
 
                 // Select new bitmap out of memory DC
                 SelectObject(hdcMem, old1);
 
                 // Set the data
-      bool success = (bool)(::SetClipboardData(CF_BITMAP, hBitmap) != 0);
+                handle = ::SetClipboardData(CF_BITMAP, hBitmap);
 
                 // Clean up
                 SelectObject(hdcSrc, old);
                 DeleteDC(hdcSrc);
                 DeleteDC(hdcMem);
-      return success;
                 break;
             }
+
         case wxDF_DIB:
             {
 #if wxUSE_IMAGE_LOADING_IN_MSW
-      HBITMAP hBitmap=(HBITMAP) ((wxBitmap *)obj)->GetHBITMAP();
+                wxBitmap *bitmap = (wxBitmap *)data;
-      HANDLE hDIB=BitmapToDIB(hBitmap,(HPALETTE) NULL); // NULL==uses system palette
+                HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP();
-      bool success = (::SetClipboardData(CF_DIB,hDIB) != 0);
+                // NULL palette means to use the system one
-#else
+                HANDLE hDIB = BitmapToDIB(hBitmap, (HPALETTE)NULL); 
-      bool success=FALSE;
+                handle = SetClipboardData(CF_DIB, hDIB);
 #endif
-      return success;
                 break;
             }
+
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
             {
-      wxMetafile *wxMF = (wxMetafile *)obj;
+                wxMetafile *wxMF = (wxMetafile *)data;
                 HANDLE data = GlobalAlloc(GHND, sizeof(METAFILEPICT) + 1);
 #ifdef __WINDOWS_386__
                 METAFILEPICT *mf = (METAFILEPICT *)MK_FP32(GlobalLock(data));
@@ -159,7 +206,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width, int h
                 GlobalUnlock(data);
                 wxMF->SetHMETAFILE((WXHANDLE) NULL);
 
-      return (SetClipboardData(CF_METAFILEPICT, data) != 0);
+                handle = SetClipboardData(CF_METAFILEPICT, data);
                 break;
             }
 #endif
@@ -167,25 +214,26 @@ bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width, int h
         case CF_DIF:
         case CF_TIFF:
         case CF_PALETTE:
-    {
-      return FALSE;
-      break;
-    }
-    case wxDF_OEMTEXT:
-      dataFormat = wxDF_TEXT;
-    case wxDF_TEXT:
-       width = strlen((char *)obj) + 1;
-       height = 1;
         default:
             {
-      char *s = (char *)obj;
+                wxLogError(_("Unsupported clipboard format."));
-      DWORD l;
-
-      l = (width * height);
-      HANDLE hGlobalMemory = GlobalAlloc(GHND, l);
-                if (!hGlobalMemory)
                 return FALSE;
+            }
 
+        case wxDF_OEMTEXT:
+            dataFormat = wxDF_TEXT;
+            // fall through
+
+        case wxDF_TEXT:
+            {
+                char *s = (char *)data;
+
+                width = strlen(s) + 1;
+                height = 1;
+                DWORD l = (width * height);
+                HANDLE hGlobalMemory = GlobalAlloc(GHND, l);
+                if ( hGlobalMemory )
+                {
 #ifdef __WINDOWS_386__
                     LPSTR lpGlobalMemory = (LPSTR)MK_FP32(GlobalLock(hGlobalMemory));
 #else
@@ -201,24 +249,35 @@ bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width, int h
 #endif
 
                     GlobalUnlock(hGlobalMemory);
-      HANDLE success = SetClipboardData(dataFormat, hGlobalMemory);
+                }
-      return (success != 0);
+
+                handle = SetClipboardData(dataFormat, hGlobalMemory);
                 break;
             }
     }
+
+    if ( handle == 0 )
+    {
+        wxLogSysError(_("Failed to set clipboard data."));
+
         return FALSE;
+    }
+
+    return TRUE;
 }
 
-wxObject *wxGetClipboardData(wxDataFormat dataFormat, long *len)
+void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 {
-  switch (dataFormat)
+    void *retval = NULL;
+
+    switch ( dataFormat )
     {
         case wxDF_BITMAP:
             {
                 BITMAP bm;
                 HBITMAP hBitmap = (HBITMAP) GetClipboardData(CF_BITMAP);
                 if (!hBitmap)
-        return NULL;
+                    break;
 
                 HDC hdcMem = CreateCompatibleDC((HDC) NULL);
                 HDC hdcSrc = CreateCompatibleDC((HDC) NULL);
@@ -233,7 +292,7 @@ wxObject *wxGetClipboardData(wxDataFormat dataFormat, long *len)
                     SelectObject(hdcSrc, old);
                     DeleteDC(hdcMem);
                     DeleteDC(hdcSrc);
-        return NULL;
+                    break;
                 }
 
                 HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hNewBitmap);
@@ -255,62 +314,72 @@ wxObject *wxGetClipboardData(wxDataFormat dataFormat, long *len)
                 wxBM->SetHeight(bm.bmHeight);
                 wxBM->SetDepth(bm.bmPlanes);
                 wxBM->SetOk(TRUE);
-      return (wxObject *)wxBM;
+                retval = wxBM;
                 break;
             }
+
         case wxDF_METAFILE:
         case CF_SYLK:
         case CF_DIF:
         case CF_TIFF:
         case CF_PALETTE:
         case wxDF_DIB:
-    {
-      return FALSE;
-      break;
-    }
-    case wxDF_OEMTEXT:
-      dataFormat = wxDF_TEXT;
-         case wxDF_TEXT:
         default:
             {
-      HANDLE hGlobalMemory = GetClipboardData(dataFormat);
+                wxLogError(_("Unsupported clipboard format."));
-      if (!hGlobalMemory)
+                return FALSE;
-        return NULL;
+            }
 
-      int hsize = (int)GlobalSize(hGlobalMemory);
+        case wxDF_OEMTEXT:
+            dataFormat = wxDF_TEXT;
+            // fall through
+
+        case wxDF_TEXT:
+            {
+                HANDLE hGlobalMemory = ::GetClipboardData(dataFormat);
+                if (!hGlobalMemory)
+                    break;
+
+                DWORD hsize = ::GlobalSize(hGlobalMemory);
                 if (len)
                     *len = hsize;
 
                 char *s = new char[hsize];
                 if (!s)
-        return NULL;
+                    break;
 
 #ifdef __WINDOWS_386__
                 LPSTR lpGlobalMemory = (LPSTR)MK_FP32(GlobalLock(hGlobalMemory));
 #else
-      LPSTR lpGlobalMemory = (LPSTR)GlobalLock(hGlobalMemory);
+                LPSTR lpGlobalMemory = (LPSTR)::GlobalLock(hGlobalMemory);
 #endif
 
 #ifdef __WIN32__
-      memcpy(s, lpGlobalMemory, GlobalSize(hGlobalMemory));
+                memcpy(s, lpGlobalMemory, hsize);
 #elif __WATCOMC__ && defined(__WINDOWS_386__)
-      memcpy(s, lpGlobalMemory, GlobalSize(hGlobalMemory));
+                memcpy(s, lpGlobalMemory, hsize);
 #else
-      hmemcpy(s, lpGlobalMemory, GlobalSize(hGlobalMemory));
+                hmemcpy(s, lpGlobalMemory, hsize);
 #endif
 
-      GlobalUnlock(hGlobalMemory);
+                ::GlobalUnlock(hGlobalMemory);
 
-      return (wxObject *)s;
+                retval = s;
                 break;
             }
     }
-  return NULL;
+
+    if ( !retval )
+    {
+        wxLogSysError(_("Failed to retrieve data from the clipboard."));
+    }
+
+    return retval;
 }
 
 wxDataFormat  wxEnumClipboardFormats(wxDataFormat dataFormat)
 {
-  return (wxDataFormat) ::EnumClipboardFormats(dataFormat);
+  return (wxDataFormat)::EnumClipboardFormats(dataFormat);
 }
 
 int wxRegisterClipboardFormat(char *formatName)
@@ -318,22 +387,23 @@ int  wxRegisterClipboardFormat(char *formatName)
   return ::RegisterClipboardFormat(formatName);
 }
 
-bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount)
+bool wxGetClipboardFormatName(wxDataFormat dataFormat,
+                              char *formatName,
+                              int maxCount)
 {
-  return (::GetClipboardFormatName((int) dataFormat, formatName, maxCount) > 0);
+  return ::GetClipboardFormatName((int)dataFormat, formatName, maxCount) > 0;
 }
 
-//-----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 // wxClipboard
-//-----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
-wxClipboard* wxTheClipboard = (wxClipboard*) NULL;
+wxClipboard* wxTheClipboard = (wxClipboard *)NULL;
 
 wxClipboard::wxClipboard()
 {
-    m_open = FALSE;
 }
 
 wxClipboard::~wxClipboard()
@@ -343,65 +413,68 @@ wxClipboard::~wxClipboard()
 
 void wxClipboard::Clear()
 {
-#if wxUSE_DRAG_AND_DROP
-    wxNode* node = m_data.First();
-    while (node)
-    {
-        wxDataObject* data = (wxDataObject*) node->Data();
-        delete data;
-        node = node->Next();
-    }
-    m_data.Clear();
-#endif
 }
 
 bool wxClipboard::Open()
 {
-    wxCHECK_MSG( !m_open, FALSE, "clipboard already open" );
-  
-    m_open = TRUE;
-
     return wxOpenClipboard();
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
-#if wxUSE_DRAG_AND_DROP
+    (void)wxEmptyClipboard();
-    wxCHECK_MSG( data, FALSE, "data is invalid" );
-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
 
-    switch (data->GetFormat())
+    if ( data )
+        return AddData(data);
+    else
+        return TRUE;
+}
+
+bool wxClipboard::AddData( wxDataObject *data )
+{
+    wxCHECK_MSG( data, FALSE, "data is invalid" );
+
+#if wxUSE_DRAG_AND_DROP
+    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, "clipboard not open" );
+
+    wxDataFormat format = data->GetFormat();
+
+    switch ( format )
     {
         case wxDF_TEXT:
         case wxDF_OEMTEXT:
         {
             wxTextDataObject* textDataObject = (wxTextDataObject*) data;
             wxString str(textDataObject->GetText());
-            return wxSetClipboardData(data->GetFormat(), (wxObject*) (const char*) str);
+            return wxSetClipboardData(format, str.c_str());
-            break;
         }
+
         case wxDF_BITMAP:
         case wxDF_DIB:
         {
             wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
             wxBitmap bitmap(bitmapDataObject->GetBitmap());
-            return wxSetClipboardData(data->GetFormat(), & bitmap);
+            return wxSetClipboardData(data->GetFormat(), &bitmap);
-            break;
         }
+
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {
-            wxMetafileDataObject* metaFileDataObject = (wxMetafileDataObject*) data;
+            wxMetafileDataObject* metaFileDataObject = 
+                (wxMetafileDataObject*) data;
             wxMetafile metaFile = metaFileDataObject->GetMetafile();
-            return wxSetClipboardData(wxDF_METAFILE, & metaFile, metaFileDataObject->GetWidth(), metaFileDataObject->GetHeight());
+            return wxSetClipboardData(wxDF_METAFILE, &metaFile,
-            break;
+                                      metaFileDataObject->GetWidth(),
+                                      metaFileDataObject->GetHeight());
         }
-#endif
+#endif // wxUSE_METAFILE
+
         default:
-        {
+            wxLogError(_("Can not put data in format '%s' on clipboard."),
+                       wxDataObject::GetFormatName(format));
+
             return FALSE;
     }
-    }
 
     return FALSE;
 #else
@@ -411,30 +484,28 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 void wxClipboard::Close()
 {
-    wxCHECK_RET( m_open, "clipboard not open" );
-    
-    m_open = FALSE;
     wxCloseClipboard();
 }
 
-bool wxClipboard::IsSupportedFormat( wxDataFormat format, const wxString& WXUNUSED(id) )
+bool wxClipboard::IsSupported( wxDataFormat format )
 {
     return wxIsClipboardFormatAvailable(format);
 }
 
 bool wxClipboard::GetData( wxDataObject *data )
 {
-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, "clipboard not open" );
 
 #if wxUSE_DRAG_AND_DROP
-    switch (data->GetFormat())
+    wxDataFormat format = data->GetFormat();
+    switch ( format )
     {
         case wxDF_TEXT:
         case wxDF_OEMTEXT:
         {
             wxTextDataObject* textDataObject = (wxTextDataObject*) data;
-            char* s = (char*) wxGetClipboardData(data->GetFormat());
+            char* s = (char*) wxGetClipboardData(format);
-            if (s)
+            if ( s )
             {
                 textDataObject->SetText(s);
                 delete[] s;
@@ -442,13 +513,13 @@ bool wxClipboard::GetData( wxDataObject *data )
             }
             else
                 return FALSE;
-            break;
         }
+
         case wxDF_BITMAP:
         case wxDF_DIB:
         {
-            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
+            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject *)data;
-            wxBitmap* bitmap = (wxBitmap*) wxGetClipboardData(data->GetFormat());
+            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetFormat());
             if (bitmap)
             {
                 bitmapDataObject->SetBitmap(* bitmap);
@@ -457,31 +528,28 @@ bool wxClipboard::GetData( wxDataObject *data )
             }
             else
                 return FALSE;
-            break;
         }
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {
-            wxMetafileDataObject* metaFileDataObject = (wxMetafileDataObject*) data;
+            wxMetafileDataObject* metaFileDataObject = (wxMetafileDataObject *)data;
-            wxMetafile* metaFile = (wxMetafile*) wxGetClipboardData(wxDF_METAFILE);
+            wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
             if (metaFile)
             {
-                metaFileDataObject->SetMetafile(* metaFile);
+                metaFileDataObject->SetMetafile(*metaFile);
                 delete metaFile;
                 return TRUE;
             }
             else
                 return FALSE;
-
-            break;
         }
 #endif
         default:
-        {
+            wxLogError(_("Can not get data in format '%s' from clipboard."),
+                       wxDataObject::GetFormatName(format));
+
             return FALSE;
     }
-    }
-    return FALSE;
 #else
     return FALSE;
 #endif
@@ -506,5 +574,7 @@ void wxClipboardModule::OnExit()
     wxTheClipboard = (wxClipboard*) NULL;
 }
 
+#else
+    #error "Please turn wxUSE_CLIPBOARD on to compile this file."
 #endif // wxUSE_CLIPBOARD