wxCaret MSW bug fixes

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 5a38cb9f60b583918890ae4a07ca9c17f4c1f7f2..9fb76f0b08c5e250e4ff7e77c5f17fa75ea3ee40 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -6,405 +6,477 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #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__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/setup.h"
+    #include "wx/setup.h"

 #endif
 
 #if wxUSE_CLIPBOARD
 
 #ifndef WX_PRECOMP
 #endif
 
 #if wxUSE_CLIPBOARD
 
 #ifndef WX_PRECOMP

-#include "wx/object.h"
-#include "wx/event.h"
-#include "wx/app.h"
-#include "wx/frame.h"
-#include "wx/bitmap.h"
-#include "wx/utils.h"
+    #include "wx/object.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/frame.h"
+    #include "wx/bitmap.h"
+    #include "wx/utils.h"

 #endif
 
 #if wxUSE_METAFILE
 #endif
 
 #if wxUSE_METAFILE

-#include "wx/metafile.h"
+    #include "wx/metafile.h"

 #endif
 
 #endif
 

+#include "wx/log.h"

 #include "wx/clipbrd.h"
 
 #include <windows.h>
 
 #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/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>
 
 #endif
 
 #include <string.h>
 

-bool wxClipboardIsOpen = FALSE;
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// old-style clipboard functions using Windows API
+// ---------------------------------------------------------------------------

 
 

-bool wxOpenClipboard(void)
+static bool gs_wxClipboardIsOpen = FALSE;
+
+bool wxOpenClipboard()

 {
 {

-  if (wxTheApp->GetTopWindow() && !wxClipboardIsOpen)
-  {
-    wxClipboardIsOpen = (::OpenClipboard((HWND) wxTheApp->GetTopWindow()->GetHWND()) != 0);
-    return wxClipboardIsOpen;
-  }
-  else return FALSE;
+    wxCHECK_MSG( !gs_wxClipboardIsOpen, TRUE, "clipboard already opened." );
+
+    wxWindow *win = wxTheApp->GetTopWindow();
+    if ( win )
+    {
+        gs_wxClipboardIsOpen = ::OpenClipboard((HWND)win->GetHWND()) != 0;
+
+        if ( !gs_wxClipboardIsOpen )
+            wxLogSysError(_("Failed to open the clipboard."));
+
+        return gs_wxClipboardIsOpen;
+    }
+    else
+    {
+        wxLogDebug("Can not open clipboard without a main window,");
+
+        return FALSE;
+    }

 }
 
 }
 

-bool wxCloseClipboard(void)
+bool wxCloseClipboard()

 {
 {

-  if (wxClipboardIsOpen)
-  {
-    wxClipboardIsOpen = FALSE;
-  }
-  return (::CloseClipboard() != 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 wxEmptyClipboard(void)
+bool wxEmptyClipboard()

 {
 {

-  return (::EmptyClipboard() != 0);
+    if ( ::EmptyClipboard() == 0 )
+    {
+        wxLogSysError(_("Failed to empty the clipboard."));
+
+        return FALSE;
+    }
+
+    return TRUE;

 }
 
 }
 

-bool wxClipboardOpen(void)
+bool wxIsClipboardOpened()

 {
 {

-  return wxClipboardIsOpen;
+  return gs_wxClipboardIsOpen;

 }
 
 bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 {
 }
 
 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)

 {
 {

-  switch (dataFormat)
-  {
-    case wxDF_BITMAP:
-    {
-      wxBitmap *wxBM = (wxBitmap *)obj;
-
-      HDC hdcMem = CreateCompatibleDC(NULL);
-      HDC hdcSrc = CreateCompatibleDC(NULL);
-      HBITMAP old = (HBITMAP) ::SelectObject(hdcSrc, (HBITMAP) wxBM->GetHBITMAP());
-      HBITMAP hBitmap = CreateCompatibleBitmap(hdcSrc,
-                                              wxBM->GetWidth(), wxBM->GetHeight());
-      if (!hBitmap)
-      {
-        SelectObject(hdcSrc, old);
-        DeleteDC(hdcMem);
-        DeleteDC(hdcSrc);
-        return FALSE;
-      }
-      HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);
-      BitBlt(hdcMem, 0, 0, wxBM->GetWidth(), wxBM->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);
-
-      // Clean up
-      SelectObject(hdcSrc, old);
-      DeleteDC(hdcSrc);
-      DeleteDC(hdcMem);      
-      return success;
-      break;
-    }
-    case wxDF_DIB:
+    HANDLE handle = 0; // return value of SetClipboardData
+
+    switch (dataFormat)

     {
     {

+        case wxDF_BITMAP:
+            {
+                wxBitmap *bitmap = (wxBitmap *)data;
+
+                HDC hdcMem = CreateCompatibleDC((HDC) NULL);
+                HDC hdcSrc = CreateCompatibleDC((HDC) NULL);
+                HBITMAP old = (HBITMAP)
+                    ::SelectObject(hdcSrc, (HBITMAP)bitmap->GetHBITMAP());
+                HBITMAP hBitmap = CreateCompatibleBitmap(hdcSrc,
+                                                         bitmap->GetWidth(),
+                                                         bitmap->GetHeight());
+                if (!hBitmap)
+                {
+                    SelectObject(hdcSrc, old);
+                    DeleteDC(hdcMem);
+                    DeleteDC(hdcSrc);
+                    return FALSE;
+                }
+
+                HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);
+                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
+                handle = ::SetClipboardData(CF_BITMAP, hBitmap);
+
+                // Clean up
+                SelectObject(hdcSrc, old);
+                DeleteDC(hdcSrc);
+                DeleteDC(hdcMem);
+                break;
+            }
+
+        case wxDF_DIB:
+            {

 #if wxUSE_IMAGE_LOADING_IN_MSW
 #if wxUSE_IMAGE_LOADING_IN_MSW

-      HBITMAP hBitmap=(HBITMAP) ((wxBitmap *)obj)->GetHBITMAP();
-      HANDLE hDIB=BitmapToDIB(hBitmap,NULL); // NULL==uses system palette
-      bool success = (::SetClipboardData(CF_DIB,hDIB) != 0);
-#else
-      bool success=FALSE;
+                wxBitmap *bitmap = (wxBitmap *)data;
+                HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP();
+                // NULL palette means to use the system one
+                HANDLE hDIB = BitmapToDIB(hBitmap, (HPALETTE)NULL); 
+                handle = SetClipboardData(CF_DIB, hDIB);

 #endif
 #endif

-      return success;
-      break;
-    }
+                break;
+            }
+

 #if wxUSE_METAFILE
 #if wxUSE_METAFILE

-    case wxDF_METAFILE:
-    {
-      wxMetafile *wxMF = (wxMetafile *)obj;
-      HANDLE data = GlobalAlloc(GHND, sizeof(METAFILEPICT) + 1);
+        case wxDF_METAFILE:
+            {
+                wxMetafile *wxMF = (wxMetafile *)data;
+                HANDLE data = GlobalAlloc(GHND, sizeof(METAFILEPICT) + 1);

 #ifdef __WINDOWS_386__
 #ifdef __WINDOWS_386__

-      METAFILEPICT *mf = (METAFILEPICT *)MK_FP32(GlobalLock(data));
+                METAFILEPICT *mf = (METAFILEPICT *)MK_FP32(GlobalLock(data));

 #else
 #else

-      METAFILEPICT *mf = (METAFILEPICT *)GlobalLock(data);
+                METAFILEPICT *mf = (METAFILEPICT *)GlobalLock(data);

 #endif
 
 #endif
 

-      mf->mm = wxMF->GetWindowsMappingMode();
-      mf->xExt = width;
-      mf->yExt = height;
-      mf->hMF = (HMETAFILE) wxMF->GetHMETAFILE();
-      GlobalUnlock(data);
-      wxMF->SetHMETAFILE((WXHANDLE) NULL);
+                mf->mm = wxMF->GetWindowsMappingMode();
+                mf->xExt = width;
+                mf->yExt = height;
+                mf->hMF = (HMETAFILE) wxMF->GetHMETAFILE();
+                GlobalUnlock(data);
+                wxMF->SetHMETAFILE((WXHANDLE) NULL);

 
 

-      return (SetClipboardData(CF_METAFILEPICT, data) != 0);
-      break;
-    }
+                handle = SetClipboardData(CF_METAFILEPICT, data);
+                break;
+            }

 #endif
 #endif

-    case CF_SYLK:
-    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;
-      DWORD l;
+        case CF_SYLK:
+        case CF_DIF:
+        case CF_TIFF:
+        case CF_PALETTE:
+        default:
+            {
+                wxLogError(_("Unsupported clipboard format."));
+                return FALSE;
+            }

 
 

-      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__
 #ifdef __WINDOWS_386__

-      LPSTR lpGlobalMemory = (LPSTR)MK_FP32(GlobalLock(hGlobalMemory));
+                    LPSTR lpGlobalMemory = (LPSTR)MK_FP32(GlobalLock(hGlobalMemory));

 #else
 #else

-      LPSTR lpGlobalMemory = (LPSTR)GlobalLock(hGlobalMemory);
+                    LPSTR lpGlobalMemory = (LPSTR)GlobalLock(hGlobalMemory);

 #endif
 
 #ifdef __WIN32__
 #endif
 
 #ifdef __WIN32__

-      memcpy(lpGlobalMemory, s, l);
+                    memcpy(lpGlobalMemory, s, l);

 #elif defined(__WATCOMC__) && defined(__WINDOWS_386__)
 #elif defined(__WATCOMC__) && defined(__WINDOWS_386__)

-      memcpy(lpGlobalMemory, s, l);
+                    memcpy(lpGlobalMemory, s, l);

 #else
 #else

-      hmemcpy(lpGlobalMemory, s, l);
+                    hmemcpy(lpGlobalMemory, s, l);

 #endif
 
 #endif
 

-      GlobalUnlock(hGlobalMemory);
-      HANDLE success = SetClipboardData(dataFormat, hGlobalMemory);
-      return (success != 0);
-      break;
-    }
-  }
-  return FALSE;
-}
+                    GlobalUnlock(hGlobalMemory);
+                }

 
 

-wxObject *wxGetClipboardData(wxDataFormat dataFormat, long *len)
-{
-  switch (dataFormat)
-  {
-    case wxDF_BITMAP:
-    {
-      BITMAP bm;
-      HBITMAP hBitmap = (HBITMAP) GetClipboardData(CF_BITMAP);
-      if (!hBitmap)
-        return NULL;
-
-      HDC hdcMem = CreateCompatibleDC(NULL);
-      HDC hdcSrc = CreateCompatibleDC(NULL);
-
-      HBITMAP old = (HBITMAP) ::SelectObject(hdcSrc, hBitmap);
-      GetObject(hBitmap, sizeof(BITMAP), (LPSTR)&bm);
-
-      HBITMAP hNewBitmap = CreateBitmapIndirect(&bm);
-
-      if (!hNewBitmap)
-      {
-        SelectObject(hdcSrc, old);
-        DeleteDC(hdcMem);
-        DeleteDC(hdcSrc);
-        return NULL;
-      }
-
-      HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hNewBitmap);
-      BitBlt(hdcMem, 0, 0, bm.bmWidth, bm.bmHeight,
-             hdcSrc, 0, 0, SRCCOPY);
-
-      // Select new bitmap out of memory DC
-      SelectObject(hdcMem, old1);
-
-      // Clean up
-      SelectObject(hdcSrc, old);
-      DeleteDC(hdcSrc);
-      DeleteDC(hdcMem);
-
-      // Create and return a new wxBitmap
-      wxBitmap *wxBM = new wxBitmap;
-      wxBM->SetHBITMAP((WXHBITMAP) hNewBitmap);
-      wxBM->SetWidth(bm.bmWidth);
-      wxBM->SetHeight(bm.bmHeight);
-      wxBM->SetDepth(bm.bmPlanes);
-      wxBM->SetOk(TRUE);
-      return (wxObject *)wxBM;
-      break;
+                handle = SetClipboardData(dataFormat, hGlobalMemory);
+                break;
+            }

     }
     }

-    case wxDF_METAFILE:
-    case CF_SYLK:
-    case CF_DIF:
-    case CF_TIFF:
-    case CF_PALETTE:
-    case wxDF_DIB:
+
+    if ( handle == 0 )

     {
     {

-      return FALSE;
-      break;
+        wxLogSysError(_("Failed to set clipboard data."));
+
+        return FALSE;

     }
     }

-    case wxDF_OEMTEXT:
-      dataFormat = wxDF_TEXT;
-         case wxDF_TEXT:
-    default:
+
+    return TRUE;
+}
+
+void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
+{
+    void *retval = NULL;
+
+    switch ( dataFormat )

     {
     {

-      HANDLE hGlobalMemory = GetClipboardData(dataFormat);
-      if (!hGlobalMemory)
-        return NULL;
+        case wxDF_BITMAP:
+            {
+                BITMAP bm;
+                HBITMAP hBitmap = (HBITMAP) GetClipboardData(CF_BITMAP);
+                if (!hBitmap)
+                    break;
+
+                HDC hdcMem = CreateCompatibleDC((HDC) NULL);
+                HDC hdcSrc = CreateCompatibleDC((HDC) NULL);
+
+                HBITMAP old = (HBITMAP) ::SelectObject(hdcSrc, hBitmap);
+                GetObject(hBitmap, sizeof(BITMAP), (LPSTR)&bm);
+
+                HBITMAP hNewBitmap = CreateBitmapIndirect(&bm);
+
+                if (!hNewBitmap)
+                {
+                    SelectObject(hdcSrc, old);
+                    DeleteDC(hdcMem);
+                    DeleteDC(hdcSrc);
+                    break;
+                }
+
+                HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hNewBitmap);
+                BitBlt(hdcMem, 0, 0, bm.bmWidth, bm.bmHeight,
+                       hdcSrc, 0, 0, SRCCOPY);
+
+                // Select new bitmap out of memory DC
+                SelectObject(hdcMem, old1);
+
+                // Clean up
+                SelectObject(hdcSrc, old);
+                DeleteDC(hdcSrc);
+                DeleteDC(hdcMem);
+
+                // Create and return a new wxBitmap
+                wxBitmap *wxBM = new wxBitmap;
+                wxBM->SetHBITMAP((WXHBITMAP) hNewBitmap);
+                wxBM->SetWidth(bm.bmWidth);
+                wxBM->SetHeight(bm.bmHeight);
+                wxBM->SetDepth(bm.bmPlanes);
+                wxBM->SetOk(TRUE);
+                retval = wxBM;
+                break;
+            }
+
+        case wxDF_METAFILE:
+        case CF_SYLK:
+        case CF_DIF:
+        case CF_TIFF:
+        case CF_PALETTE:
+        case wxDF_DIB:
+        default:
+            {
+                wxLogError(_("Unsupported clipboard format."));
+                return FALSE;
+            }
+
+        case wxDF_OEMTEXT:
+            dataFormat = wxDF_TEXT;
+            // fall through
+
+        case wxDF_TEXT:
+            {
+                HANDLE hGlobalMemory = ::GetClipboardData(dataFormat);
+                if (!hGlobalMemory)
+                    break;

 
 

-      int hsize = (int)GlobalSize(hGlobalMemory);
-      if (len)
-        *len = hsize;
+                DWORD hsize = ::GlobalSize(hGlobalMemory);
+                if (len)
+                    *len = hsize;

 
 

-      char *s = new char[hsize];
-      if (!s)
-        return NULL;
+                char *s = new char[hsize];
+                if (!s)
+                    break;

 
 #ifdef __WINDOWS_386__
 
 #ifdef __WINDOWS_386__

-      LPSTR lpGlobalMemory = (LPSTR)MK_FP32(GlobalLock(hGlobalMemory));
+                LPSTR lpGlobalMemory = (LPSTR)MK_FP32(GlobalLock(hGlobalMemory));

 #else
 #else

-      LPSTR lpGlobalMemory = (LPSTR)GlobalLock(hGlobalMemory);
+                LPSTR lpGlobalMemory = (LPSTR)::GlobalLock(hGlobalMemory);

 #endif
 
 #ifdef __WIN32__
 #endif
 
 #ifdef __WIN32__

-      memcpy(s, lpGlobalMemory, GlobalSize(hGlobalMemory));
+                memcpy(s, lpGlobalMemory, hsize);

 #elif __WATCOMC__ && defined(__WINDOWS_386__)
 #elif __WATCOMC__ && defined(__WINDOWS_386__)

-      memcpy(s, lpGlobalMemory, GlobalSize(hGlobalMemory));
+                memcpy(s, lpGlobalMemory, hsize);

 #else
 #else

-      hmemcpy(s, lpGlobalMemory, GlobalSize(hGlobalMemory));
+                hmemcpy(s, lpGlobalMemory, hsize);

 #endif
 
 #endif
 

-      GlobalUnlock(hGlobalMemory);
+                ::GlobalUnlock(hGlobalMemory);
+
+                retval = s;
+                break;
+            }
+    }

 
 

-      return (wxObject *)s;
-      break;
+    if ( !retval )
+    {
+        wxLogSysError(_("Failed to retrieve data from the clipboard."));

     }
     }

-  }
-  return NULL;
+
+    return retval;

 }
 
 wxDataFormat  wxEnumClipboardFormats(wxDataFormat dataFormat)
 {
 }
 
 wxDataFormat  wxEnumClipboardFormats(wxDataFormat dataFormat)
 {

-  return (wxDataFormat) ::EnumClipboardFormats(dataFormat);
+  return (wxDataFormat)::EnumClipboardFormats(dataFormat);

 }
 
 }
 

-int  wxRegisterClipboardFormat(char *formatName)
+int wxRegisterClipboardFormat(char *formatName)

 {
   return ::RegisterClipboardFormat(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
- */
-
-//-----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------

 // wxClipboard
 // wxClipboard

-//-----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)

 
 

-wxClipboard* wxTheClipboard = (wxClipboard*) NULL;
+wxClipboard* wxTheClipboard = (wxClipboard *)NULL;

 
 wxClipboard::wxClipboard()
 {
 
 wxClipboard::wxClipboard()
 {

-    m_open = FALSE;

 }
 
 wxClipboard::~wxClipboard()
 {
 }
 
 wxClipboard::~wxClipboard()
 {

-    Clear();  
+    Clear();

 }
 
 void wxClipboard::Clear()
 {
 }
 
 void wxClipboard::Clear()
 {

-    wxNode* node = m_data.First();
-    while (node)
-    {
-        wxDataObject* data = (wxDataObject*) node->Data();
-        delete data;
-        node = node->Next();
-    }
-    m_data.Clear();

 }
 
 bool wxClipboard::Open()
 {
 }
 
 bool wxClipboard::Open()
 {

-    wxCHECK_MSG( !m_open, FALSE, "clipboard already open" );
-  
-    m_open = TRUE;
-

     return wxOpenClipboard();
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
     return wxOpenClipboard();
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {

-#if wxUSE_DRAG_AND_DROP
+    (void)wxEmptyClipboard();
+
+    if ( data )
+        return AddData(data);
+    else
+        return TRUE;
+}
+
+bool wxClipboard::AddData( wxDataObject *data )
+{

     wxCHECK_MSG( data, FALSE, "data is invalid" );
     wxCHECK_MSG( data, FALSE, "data is invalid" );

-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );

 
 

-    switch (data->GetFormat())
+#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());
     {
         case wxDF_TEXT:
         case wxDF_OEMTEXT:
         {
             wxTextDataObject* textDataObject = (wxTextDataObject*) data;
             wxString str(textDataObject->GetText());

-            return wxSetClipboardData(data->GetFormat(), (wxObject*) (const char*) str);
-            break;
+            return wxSetClipboardData(format, str.c_str());

         }
         }

+

         case wxDF_BITMAP:
         case wxDF_DIB:
         {
             wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
             wxBitmap bitmap(bitmapDataObject->GetBitmap());
         case wxDF_BITMAP:
         case wxDF_DIB:
         {
             wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
             wxBitmap bitmap(bitmapDataObject->GetBitmap());

-            return wxSetClipboardData(data->GetFormat(), & bitmap);
-            break;
+            return wxSetClipboardData(data->GetFormat(), &bitmap);

         }
         }

+

 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {

-            wxMetafileDataObject* metaFileDataObject = (wxMetafileDataObject*) data;
+            wxMetafileDataObject* metaFileDataObject = 
+                (wxMetafileDataObject*) data;

             wxMetafile metaFile = metaFileDataObject->GetMetafile();
             wxMetafile metaFile = metaFileDataObject->GetMetafile();

-            return wxSetClipboardData(wxDF_METAFILE, & metaFile, metaFileDataObject->GetWidth(), metaFileDataObject->GetHeight());
-            break;
+            return wxSetClipboardData(wxDF_METAFILE, &metaFile,
+                                      metaFileDataObject->GetWidth(),
+                                      metaFileDataObject->GetHeight());

         }
         }

-#endif
+#endif // wxUSE_METAFILE
+

         default:
         default:

-        {
+            wxLogError(_("Can not put data in format '%s' on clipboard."),
+                       wxDataObject::GetFormatName(format));
+

             return FALSE;
             return FALSE;

-        }

     }
     }

-  
+

     return FALSE;
 #else
     return FALSE;
     return FALSE;
 #else
     return FALSE;


@@ -413,30 +485,28 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 void wxClipboard::Close()
 {
 
 void wxClipboard::Close()
 {

-    wxCHECK_RET( m_open, "clipboard not open" );
-    
-    m_open = FALSE;

     wxCloseClipboard();
 }
 
     wxCloseClipboard();
 }
 

-bool wxClipboard::IsSupportedFormat( wxDataFormat format, const wxString& WXUNUSED(id) )
+bool wxClipboard::IsSupported( wxDataFormat format )

 {
     return wxIsClipboardFormatAvailable(format);
 }
 
 bool wxClipboard::GetData( wxDataObject *data )
 {
 {
     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
 #if wxUSE_DRAG_AND_DROP

-    switch (data->GetFormat())
+    wxDataFormat format = data->GetFormat();
+    switch ( format )

     {
         case wxDF_TEXT:
         case wxDF_OEMTEXT:
         {
             wxTextDataObject* textDataObject = (wxTextDataObject*) data;
     {
         case wxDF_TEXT:
         case wxDF_OEMTEXT:
         {
             wxTextDataObject* textDataObject = (wxTextDataObject*) data;

-            char* s = (char*) wxGetClipboardData(data->GetFormat());
-            if (s)
+            char* s = (char*) wxGetClipboardData(format);
+            if ( s )

             {
                 textDataObject->SetText(s);
                 delete[] s;
             {
                 textDataObject->SetText(s);
                 delete[] s;


@@ -444,13 +514,13 @@ bool wxClipboard::GetData( wxDataObject *data )
             }
             else
                 return FALSE;
             }
             else
                 return FALSE;

-            break;

         }
         }

+

         case wxDF_BITMAP:
         case wxDF_DIB:
         {
         case wxDF_BITMAP:
         case wxDF_DIB:
         {

-            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
-            wxBitmap* bitmap = (wxBitmap*) wxGetClipboardData(data->GetFormat());
+            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject *)data;
+            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetFormat());

             if (bitmap)
             {
                 bitmapDataObject->SetBitmap(* bitmap);
             if (bitmap)
             {
                 bitmapDataObject->SetBitmap(* bitmap);


@@ -459,31 +529,28 @@ bool wxClipboard::GetData( wxDataObject *data )
             }
             else
                 return FALSE;
             }
             else
                 return FALSE;

-            break;

         }
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {
         }
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {

-            wxMetafileDataObject* metaFileDataObject = (wxMetafileDataObject*) data;
-            wxMetafile* metaFile = (wxMetafile*) wxGetClipboardData(wxDF_METAFILE);
+            wxMetafileDataObject* metaFileDataObject = (wxMetafileDataObject *)data;
+            wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);

             if (metaFile)
             {
             if (metaFile)
             {

-                metaFileDataObject->SetMetafile(* metaFile);
+                metaFileDataObject->SetMetafile(*metaFile);

                 delete metaFile;
                 return TRUE;
             }
             else
                 return FALSE;
                 delete metaFile;
                 return TRUE;
             }
             else
                 return FALSE;

-
-            break;

         }
 #endif
         default:
         }
 #endif
         default:

-        {
+            wxLogError(_("Can not get data in format '%s' from clipboard."),
+                       wxDataObject::GetFormatName(format));
+

             return FALSE;
             return FALSE;

-        }

     }
     }

-    return FALSE;

 #else
     return FALSE;
 #endif
 #else
     return FALSE;
 #endif


@@ -498,7 +565,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule)
 bool wxClipboardModule::OnInit()
 {
     wxTheClipboard = new wxClipboard();
 bool wxClipboardModule::OnInit()
 {
     wxTheClipboard = new wxClipboard();

-  
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -508,5 +575,7 @@ void wxClipboardModule::OnExit()
     wxTheClipboard = (wxClipboard*) NULL;
 }
 
     wxTheClipboard = (wxClipboard*) NULL;
 }
 

+#else
+    #error "Please turn wxUSE_CLIPBOARD on to compile this file."

 #endif // wxUSE_CLIPBOARD
 
 #endif // wxUSE_CLIPBOARD