1. minor fixes in wxDynLib

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index af48db1a5abb69605869b100a9fdf03285955398..5f8cc9d74d6f1c5b941bc502449c6958bc33ac03 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -6,460 +6,618 @@
 // 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
-#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
 
 #endif
 

-#if USE_CLIPBOARD
+#if wxUSE_CLIPBOARD

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-#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"
+    #include "wx/intl.h"
+#endif
+
+#if wxUSE_METAFILE
+    #include "wx/metafile.h"

 #endif
 
 #endif
 

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

 #include "wx/clipbrd.h"
 #include "wx/clipbrd.h"

+
+#include <string.h>
+#include <windows.h>
+

 #include "wx/msw/private.h"
 #include "wx/msw/dib.h"
 
 #include "wx/msw/private.h"
 #include "wx/msw/dib.h"
 

-#include <string.h>
+// wxDataObject is tied to OLE/drag and drop implementation,
+// therefore so is wxClipboard :-(
+#if wxUSE_DRAG_AND_DROP
+    #include "wx/dataobj.h"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxClipboardClient, wxObject)
+    static bool wxSetClipboardData(wxDataObject *data);
+#endif
+
+#ifdef __WIN16__
+    #define memcpy hmemcpy

 #endif
 
 #endif
 

-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, _T("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(_T("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, _T("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(int dataFormat)
+bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)

 {
 {

-  return (::IsClipboardFormatAvailable(dataFormat) != 0);
+    return ::IsClipboardFormatAvailable(dataFormat) != 0;

 }
 
 }
 

-bool wxSetClipboardData(int dataFormat, wxObject *obj, int width, int height)
+#if wxUSE_DRAG_AND_DROP
+static bool wxSetClipboardData(wxDataObject *data)

 {
 {

-  switch (dataFormat)
-  {
-    case wxCF_BITMAP:
+    size_t size = data->GetDataSize();
+    HANDLE hGlobal = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, size);
+    if ( !hGlobal )

     {
     {

-      wxBitmap *wxBM = (wxBitmap *)obj;
-
-      HDC hdcMem = CreateCompatibleDC(NULL);
-      HDC hdcSrc = CreateCompatibleDC(NULL);
-      HBITMAP old = ::SelectObject(hdcSrc, (HBITMAP) wxBM->GetHBITMAP());
-      HBITMAP hBitmap = CreateCompatibleBitmap(hdcSrc,
-                                              wxBM->GetWidth(), wxBM->GetHeight());
-      if (!hBitmap)
-      {
-        SelectObject(hdcSrc, old);
-        DeleteDC(hdcMem);
-        DeleteDC(hdcSrc);
+        wxLogSysError(_("Failed to allocate %dKb of memory for clipboard "
+                        "transfer."), size / 1024);
+

         return FALSE;
         return FALSE;

-      }
-      HBITMAP old1 = 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 wxCF_DIB:
-    {
-#if USE_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;
-#endif
-      return success;
-      break;
-    }
-#if USE_METAFILE
-    case wxCF_METAFILE:
-    {
-      wxMetaFile *wxMF = (wxMetaFile *)obj;
-      HANDLE data = GlobalAlloc(GHND, sizeof(METAFILEPICT) + 1);
-#ifdef __WINDOWS_386__
-      METAFILEPICT *mf = (METAFILEPICT *)MK_FP32(GlobalLock(data));
-#else
-      METAFILEPICT *mf = (METAFILEPICT *)GlobalLock(data);
-#endif

 
 

-      mf->mm = wxMF->GetWindowsMappingMode();
-      mf->xExt = width;
-      mf->yExt = height;
-      mf->hMF = (HANDLE) wxMF->GetHMETAFILE();
-      GlobalUnlock(data);
-      wxMF->SetHMETAFILE((WXHANDLE) NULL);
+    LPVOID lpGlobalMemory = ::GlobalLock(hGlobal);

 
 

-      return (SetClipboardData(CF_METAFILEPICT, data) != 0);
-      break;
-    }
-#endif
-    case CF_SYLK:
-    case CF_DIF:
-    case CF_TIFF:
-    case CF_PALETTE:
-    {
-      return FALSE;
-      break;
-    }
-    case wxCF_OEMTEXT:
-      dataFormat = wxCF_TEXT;
-    case wxCF_TEXT:
-       width = strlen((char *)obj) + 1;
-       height = 1;
-    default:
-    {
-      char *s = (char *)obj;
-      DWORD l;
-
-      l = (width * height);
-      HANDLE hGlobalMemory = GlobalAlloc(GHND, l);
-                if (!hGlobalMemory)
-        return FALSE;
+    data->GetDataHere(lpGlobalMemory);

 
 

-#ifdef __WINDOWS_386__
-      LPSTR lpGlobalMemory = (LPSTR)MK_FP32(GlobalLock(hGlobalMemory));
-#else
-      LPSTR lpGlobalMemory = (LPSTR)GlobalLock(hGlobalMemory);
-#endif
+    GlobalUnlock(hGlobal);

 
 

-#ifdef __WIN32__
-      memcpy(lpGlobalMemory, s, l);
-#elif defined(__WATCOMC__) && defined(__WINDOWS_386__)
-      memcpy(lpGlobalMemory, s, l);
-#else
-      hmemcpy(lpGlobalMemory, s, l);
-#endif
+    wxDataFormat format = data->GetPreferredFormat();
+    if ( !::SetClipboardData(format, hGlobal) )
+    {
+        wxLogSysError(_("Failed to set clipboard data in format %s"),
+                      wxDataObject::GetFormatName(format));

 
 

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

     }
     }

-  }
-  return FALSE;
+
+    return TRUE;

 }
 }

+#endif // wxUSE_DRAG_AND_DROP

 
 

-wxObject *wxGetClipboardData(int dataFormat, long *len)
+bool wxSetClipboardData(wxDataFormat dataFormat,
+                        const void *data,
+                        int width, int height)

 {
 {

-  switch (dataFormat)
-  {
-    case wxCF_BITMAP:
+    HANDLE handle = 0; // return value of SetClipboardData
+
+    switch (dataFormat)

     {
     {

-      BITMAP bm;
-      HBITMAP hBitmap = GetClipboardData(CF_BITMAP);
-      if (!hBitmap)
-        return NULL;
-
-      HDC hdcMem = CreateCompatibleDC(NULL);
-      HDC hdcSrc = CreateCompatibleDC(NULL);
-
-      HBITMAP old = ::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 = 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;
+        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
+                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
+                break;
+            }
+
+#if wxUSE_METAFILE
+        case wxDF_METAFILE:
+            {
+                wxMetafile *wxMF = (wxMetafile *)data;
+                HANDLE data = GlobalAlloc(GHND, sizeof(METAFILEPICT) + 1);
+                METAFILEPICT *mf = (METAFILEPICT *)GlobalLock(data);
+
+                mf->mm = wxMF->GetWindowsMappingMode();
+                mf->xExt = width;
+                mf->yExt = height;
+                mf->hMF = (HMETAFILE) wxMF->GetHMETAFILE();
+                GlobalUnlock(data);
+                wxMF->SetHMETAFILE((WXHANDLE) NULL);
+
+                handle = SetClipboardData(CF_METAFILEPICT, data);
+                break;
+            }
+#endif
+        case CF_SYLK:
+        case CF_DIF:
+        case CF_TIFF:
+        case CF_PALETTE:
+        default:
+            {
+                wxLogError(_("Unsupported clipboard format."));
+                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 )
+                {
+                    LPSTR lpGlobalMemory = (LPSTR)GlobalLock(hGlobalMemory);
+
+                    memcpy(lpGlobalMemory, s, l);
+
+                    GlobalUnlock(hGlobalMemory);
+                }
+
+                handle = SetClipboardData(dataFormat, hGlobalMemory);
+                break;
+            }

     }
     }

-    case wxCF_METAFILE:
-    case CF_SYLK:
-    case CF_DIF:
-    case CF_TIFF:
-    case CF_PALETTE:
-    case wxCF_DIB:
+
+    if ( handle == 0 )

     {
     {

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

     }
     }

-    case wxCF_OEMTEXT:
-      dataFormat = wxCF_TEXT;
-         case wxCF_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:
+            {
+                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__
-      LPSTR lpGlobalMemory = (LPSTR)MK_FP32(GlobalLock(hGlobalMemory));
-#else
-      LPSTR lpGlobalMemory = (LPSTR)GlobalLock(hGlobalMemory);
-#endif
+                LPSTR lpGlobalMemory = (LPSTR)::GlobalLock(hGlobalMemory);

 
 

-#ifdef __WIN32__
-      memcpy(s, lpGlobalMemory, GlobalSize(hGlobalMemory));
-#elif __WATCOMC__ && defined(__WINDOWS_386__)
-      memcpy(s, lpGlobalMemory, GlobalSize(hGlobalMemory));
-#else
-      hmemcpy(s, lpGlobalMemory, GlobalSize(hGlobalMemory));
-#endif
+                memcpy(s, lpGlobalMemory, hsize);
+
+                ::GlobalUnlock(hGlobalMemory);
+
+                retval = s;
+                break;
+            }
+
+        default:
+            {
+                HANDLE hGlobalMemory = ::GetClipboardData(dataFormat);
+                if ( !hGlobalMemory )
+                    break;
+
+                DWORD size = ::GlobalSize(hGlobalMemory);
+                if ( len )
+                    *len = size;

 
 

-      GlobalUnlock(hGlobalMemory);
+                void *buf = malloc(size);
+                if ( !buf )
+                    break;

 
 

-      return (wxObject *)s;
-      break;
+                LPSTR lpGlobalMemory = (LPSTR)::GlobalLock(hGlobalMemory);
+
+                memcpy(buf, lpGlobalMemory, size);
+
+                ::GlobalUnlock(hGlobalMemory);
+
+                retval = buf;
+                break;
+            }

     }
     }

-  }
-  return NULL;
+
+    if ( !retval )
+    {
+        wxLogSysError(_("Failed to retrieve data from the clipboard."));
+    }
+
+    return retval;

 }
 
 }
 

-int  wxEnumClipboardFormats(int dataFormat)
+wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat)

 {
   return ::EnumClipboardFormats(dataFormat);
 }
 
 {
   return ::EnumClipboardFormats(dataFormat);
 }
 

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

 {
   return ::RegisterClipboardFormat(formatName);
 }
 
 {
   return ::RegisterClipboardFormat(formatName);
 }
 

-bool wxGetClipboardFormatName(int dataFormat, char *formatName, int maxCount)
+bool wxGetClipboardFormatName(wxDataFormat dataFormat,
+                              wxChar *formatName,
+                              int maxCount)

 {
 {

-  return (::GetClipboardFormatName(dataFormat, formatName, maxCount) > 0);
+  return ::GetClipboardFormatName((int)dataFormat, formatName, maxCount) > 0;

 }
 
 }
 

-/*
- * Generalized clipboard implementation by Matthew Flatt
- */
+// ---------------------------------------------------------------------------
+// wxClipboard
+// ---------------------------------------------------------------------------

 
 

-wxClipboard *wxTheClipboard = NULL;
+IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)

 
 

-void wxInitClipboard(void)
-{
-  if (!wxTheClipboard)
-    wxTheClipboard = new wxClipboard;
-}
+wxClipboard* wxTheClipboard = (wxClipboard *)NULL;

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

-  clipOwner = NULL;
-  cbString = NULL;

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

-  if (clipOwner)
-    clipOwner->BeingReplaced();
-  if (cbString)
-    delete[] cbString;
+    Clear();

 }
 
 }
 

-static int FormatStringToID(char *str)
+void wxClipboard::Clear()

 {
 {

-  if (!strcmp(str, "TEXT"))
-    return wxCF_TEXT;
-  
-  return wxRegisterClipboardFormat(str);

 }
 
 }
 

-void wxClipboard::SetClipboardClient(wxClipboardClient *client, long time)
+bool wxClipboard::Open()

 {
 {

-  bool got_selection;
-
-  if (clipOwner)
-    clipOwner->BeingReplaced();
-  clipOwner = client;
-  if (cbString) {
-    delete[] cbString;
-    cbString = NULL;
-  }
-
-  if (wxOpenClipboard()) {
-    char **formats, *data;
-         int i;
-    int ftype;
-    long size;
-
-    formats = clipOwner->formats.ListToArray(FALSE);
-    for (i = clipOwner->formats.Number(); i--; ) {
-      ftype = FormatStringToID(formats[i]);
-      data = clipOwner->GetData(formats[i], &size);
-      if (!wxSetClipboardData(ftype, (wxObject *)data, size, 1)) {
-        got_selection = FALSE;
-        break;
-      }
-    }
-
-    if (i < 0)
-      got_selection = wxCloseClipboard();
-  } else
-    got_selection = FALSE;
-  
-  got_selection = FALSE; // Assume another process takes over
-
-  if (!got_selection) {
-    clipOwner->BeingReplaced();
-         clipOwner = NULL;
-  }
+    return wxOpenClipboard();

 }
 
 }
 

-wxClipboardClient *wxClipboard::GetClipboardClient()
+bool wxClipboard::SetData( wxDataObject *data )

 {
 {

-  return clipOwner;
+    (void)wxEmptyClipboard();
+
+    if ( data )
+        return AddData(data);
+    else
+        return TRUE;

 }
 
 }
 

-void wxClipboard::SetClipboardString(char *str, long time)
+bool wxClipboard::AddData( wxDataObject *data )

 {
 {

-  bool got_selection;
+    wxCHECK_MSG( data, FALSE, _T("data is invalid") );

 
 

-  if (clipOwner) {
-    clipOwner->BeingReplaced();
-    clipOwner = NULL;
-  }
-  if (cbString)
-    delete[] cbString;
+#if wxUSE_DRAG_AND_DROP
+    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, _T("clipboard not open") );

 
 

-  cbString = str;
+    wxDataFormat format = data->GetFormat();

 
 

-  if (wxOpenClipboard()) {
-    if (!wxSetClipboardData(wxCF_TEXT, (wxObject *)str))
-      got_selection = FALSE;
-    else
-                got_selection = wxCloseClipboard();
-  } else
-    got_selection = FALSE;
-
-  got_selection = FALSE; // Assume another process takes over
+    switch ( format )
+    {
+        case wxDF_TEXT:
+        case wxDF_OEMTEXT:
+        {
+            wxTextDataObject* textDataObject = (wxTextDataObject*) data;
+            wxString str(textDataObject->GetText());
+            return wxSetClipboardData(format, str.c_str());
+        }
+
+        case wxDF_BITMAP:
+        case wxDF_DIB:
+        {
+            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
+            wxBitmap bitmap(bitmapDataObject->GetBitmap());
+            return wxSetClipboardData(data->GetFormat(), &bitmap);
+        }
+
+#if wxUSE_METAFILE
+        case wxDF_METAFILE:
+        {
+            wxMetafileDataObject* metaFileDataObject = 
+                (wxMetafileDataObject*) data;
+            wxMetafile metaFile = metaFileDataObject->GetMetafile();
+            return wxSetClipboardData(wxDF_METAFILE, &metaFile,
+                                      metaFileDataObject->GetWidth(),
+                                      metaFileDataObject->GetHeight());
+        }
+#endif // wxUSE_METAFILE
+
+        default:
+            return wxSetClipboardData(data);
+    }
+#else // !wxUSE_DRAG_AND_DROP
+    return FALSE;
+#endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP
+}

 
 

-  if (!got_selection) {
-    delete[] cbString;
-    cbString = NULL;
-  }
+void wxClipboard::Close()
+{
+    wxCloseClipboard();

 }
 
 }
 

-char *wxClipboard::GetClipboardString(long time)
+bool wxClipboard::IsSupported( wxDataFormat format )

 {
 {

-  char *str;
-  long length;
+    return wxIsClipboardFormatAvailable(format);
+}

 
 

-  str = GetClipboardData("TEXT", &length, time);
-  if (!str) {
-    str = new char[1];
-    *str = 0;
-  }
+bool wxClipboard::GetData( wxDataObject *data )
+{
+    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, _T("clipboard not open") );

 
 

-  return str;
+#if wxUSE_DRAG_AND_DROP
+    wxDataFormat format = data->GetFormat();
+    switch ( format )
+    {
+        case wxDF_TEXT:
+        case wxDF_OEMTEXT:
+        {
+            wxTextDataObject* textDataObject = (wxTextDataObject*) data;
+            char* s = (char*) wxGetClipboardData(format);
+            if ( s )
+            {
+                textDataObject->SetText(s);
+                delete[] s;
+                return TRUE;
+            }
+            else
+                return FALSE;
+        }
+
+        case wxDF_BITMAP:
+        case wxDF_DIB:
+        {
+            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject *)data;
+            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetFormat());
+            if (bitmap)
+            {
+                bitmapDataObject->SetBitmap(* bitmap);
+                delete bitmap;
+                return TRUE;
+            }
+            else
+                return FALSE;
+        }
+#if wxUSE_METAFILE
+        case wxDF_METAFILE:
+        {
+            wxMetafileDataObject* metaFileDataObject = (wxMetafileDataObject *)data;
+            wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
+            if (metaFile)
+            {
+                metaFileDataObject->SetMetafile(*metaFile);
+                delete metaFile;
+                return TRUE;
+            }
+            else
+                return FALSE;
+        }
+#endif
+        default:
+            {
+                long len;
+                void *buf = wxGetClipboardData(format, &len);
+                if ( buf )
+                {
+                    // FIXME this is for testing only!!
+                    ((wxPrivateDataObject *)data)->SetData(buf, len);
+                    free(buf);
+
+                    return TRUE;
+                }
+            }
+
+            return FALSE;
+    }
+#else
+    return FALSE;
+#endif

 }
 
 }
 

-char *wxClipboard::GetClipboardData(char *format, long *length, long time)
+//-----------------------------------------------------------------------------
+// wxClipboardModule
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule)
+
+bool wxClipboardModule::OnInit()

 {
 {

-  if (clipOwner)  {
-         if (clipOwner->formats.Member(format))
-      return clipOwner->GetData(format, length);
-    else
-      return NULL;
-  } else if (cbString) {
-    if (!strcmp(format, "TEXT"))
-      return copystring(cbString);
-    else
-      return NULL;
-  } else {
-    if (wxOpenClipboard()) {
-      receivedString = (char *)wxGetClipboardData(FormatStringToID(format), 
-                                                  length);
-      wxCloseClipboard();
-    } else
-      receivedString = NULL;
-
-    return receivedString;
-  }
+    wxTheClipboard = new wxClipboard();
+
+    return TRUE;

 }
 
 }
 

+void wxClipboardModule::OnExit()
+{
+    if (wxTheClipboard) delete wxTheClipboard;
+    wxTheClipboard = (wxClipboard*) NULL;
+}

 
 

-#endif // USE_CLIPBOARD
+#else
+    #error "Please turn wxUSE_CLIPBOARD on to compile this file."
+#endif // wxUSE_CLIPBOARD