added common notebookbase source file

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index ea427f7e8b84ece8ff7e77c3531e7f0f53b5b879..3cbe217392774f9da5505f951757eade7f7d6433 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -55,17 +55,23 @@
 #include <windows.h>
 
 #include "wx/msw/private.h"
 #include <windows.h>
 
 #include "wx/msw/private.h"

+
+#ifndef __WXMICROWIN__

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

+#endif

 
 // wxDataObject is tied to OLE/drag and drop implementation, therefore so are
 // the functions using wxDataObject in wxClipboard
 
 // wxDataObject is tied to OLE/drag and drop implementation, therefore so are
 // the functions using wxDataObject in wxClipboard

-#define wxUSE_DATAOBJ wxUSE_DRAG_AND_DROP
+//#define wxUSE_DATAOBJ wxUSE_DRAG_AND_DROP

 
 #if wxUSE_DATAOBJ
     #include "wx/dataobj.h"
 
 
 #if wxUSE_DATAOBJ
     #include "wx/dataobj.h"
 

-    // use OLE clipboard
-    #define wxUSE_OLE_CLIPBOARD 1
+// No: don't necessarily use OLE clipboard with data object
+#if 0
+   // use OLE clipboard
+   #define wxUSE_OLE_CLIPBOARD 1
+#endif

 #else // !wxUSE_DATAOBJ
     // use Win clipboard API
     #define wxUSE_OLE_CLIPBOARD 0
 #else // !wxUSE_DATAOBJ
     // use Win clipboard API
     #define wxUSE_OLE_CLIPBOARD 0


@@ -219,7 +225,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                 wxBitmap *bitmap = (wxBitmap *)data;
                 HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP();
                 // NULL palette means to use the system one
                 wxBitmap *bitmap = (wxBitmap *)data;
                 HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP();
                 // NULL palette means to use the system one

-                HANDLE hDIB = wxBitmapToDIB(hBitmap, (HPALETTE)NULL); 
+                HANDLE hDIB = wxBitmapToDIB(hBitmap, (HPALETTE)NULL);

                 handle = SetClipboardData(CF_DIB, hDIB);
 #endif // wxUSE_IMAGE_LOADING_IN_MSW
                 break;
                 handle = SetClipboardData(CF_DIB, hDIB);
 #endif // wxUSE_IMAGE_LOADING_IN_MSW
                 break;


@@ -433,7 +439,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 
 wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat)
 {
 
 wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat)
 {

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

 }
 
 int wxRegisterClipboardFormat(wxChar *formatName)
 }
 
 int wxRegisterClipboardFormat(wxChar *formatName)


@@ -583,7 +589,7 @@ bool wxClipboard::AddData( wxDataObject *data )
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {

-            wxMetafileDataObject* metaFileDataObject = 
+            wxMetafileDataObject* metaFileDataObject =

                 (wxMetafileDataObject*) data;
             wxMetafile metaFile = metaFileDataObject->GetMetafile();
             return wxSetClipboardData(wxDF_METAFILE, &metaFile,
                 (wxMetafileDataObject*) data;
             wxMetafile metaFile = metaFileDataObject->GetMetafile();
             return wxSetClipboardData(wxDF_METAFILE, &metaFile,


@@ -627,7 +633,8 @@ bool wxClipboard::GetData( wxDataObject& data )
 
     // build the list of supported formats
     size_t nFormats = data.GetFormatCount(wxDataObject::Set);
 
     // build the list of supported formats
     size_t nFormats = data.GetFormatCount(wxDataObject::Set);

-    wxDataFormat format, *formats;
+    wxDataFormat format;
+       wxDataFormat *formats;

     if ( nFormats == 1 )
     {
         // the most common case
     if ( nFormats == 1 )
     {
         // the most common case