X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c29712c64ba5d85fc5d62bd90fe60ec5ce9dadc..27c78e4552aaefac9a4db0d4453eff09cdfef2ad:/src/msw/clipbrd.cpp?ds=sidebyside

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 1ee4cd14ce..044ef30db2 100644
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "clipbrd.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,10 +24,6 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/setup.h"
-#endif
-
 #if wxUSE_CLIPBOARD
 
 #ifndef WX_PRECOMP
@@ -54,9 +46,10 @@
 #include <string.h>
 
 #include "wx/msw/private.h"
+#include "wx/msw/ole/oleutils.h"
 
 #if wxUSE_WXDIB
-#include "wx/msw/dib.h"
+    #include "wx/msw/dib.h"
 #endif
 
 // wxDataObject is tied to OLE/drag and drop implementation, therefore so are
@@ -87,11 +80,11 @@
 // old-style clipboard functions using Windows API
 // ---------------------------------------------------------------------------
 
-static bool gs_wxClipboardIsOpen = FALSE;
+static bool gs_wxClipboardIsOpen = false;
 
 bool wxOpenClipboard()
 {
-    wxCHECK_MSG( !gs_wxClipboardIsOpen, TRUE, wxT("clipboard already opened.") );
+    wxCHECK_MSG( !gs_wxClipboardIsOpen, true, wxT("clipboard already opened.") );
 
     wxWindow *win = wxTheApp->GetTopWindow();
     if ( win )
@@ -107,24 +100,24 @@ bool wxOpenClipboard()
     {
         wxLogDebug(wxT("Can not open clipboard without a main window."));
 
-        return FALSE;
+        return false;
     }
 }
 
 bool wxCloseClipboard()
 {
-    wxCHECK_MSG( gs_wxClipboardIsOpen, FALSE, wxT("clipboard is not opened") );
+    wxCHECK_MSG( gs_wxClipboardIsOpen, false, wxT("clipboard is not opened") );
 
-    gs_wxClipboardIsOpen = FALSE;
+    gs_wxClipboardIsOpen = false;
 
     if ( ::CloseClipboard() == 0 )
     {
         wxLogSysError(_("Failed to close the clipboard."));
 
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxEmptyClipboard()
@@ -133,10 +126,10 @@ bool wxEmptyClipboard()
     {
         wxLogSysError(_("Failed to empty the clipboard."));
 
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxIsClipboardOpened()
@@ -146,12 +139,12 @@ bool wxIsClipboardOpened()
 
 bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 {
-    CLIPFORMAT cf = dataFormat.GetFormatId();
+   wxDataFormat::NativeFormat cf = dataFormat.GetFormatId();
 
     if ( ::IsClipboardFormatAvailable(cf) )
     {
         // ok from the first try
-        return TRUE;
+        return true;
     }
 
     // for several standard formats, we can convert from some other ones too
@@ -161,13 +154,13 @@ bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
         case CF_BITMAP:
             return ::IsClipboardFormatAvailable(CF_DIB) != 0;
 
-#if wxUSE_ENH_METAFILE && !defined(__WIN16__) && !defined(__WXWINCE__)
+#if wxUSE_ENH_METAFILE && !defined(__WXWINCE__)
         case CF_METAFILEPICT:
             return ::IsClipboardFormatAvailable(CF_ENHMETAFILE) != 0;
 #endif // wxUSE_ENH_METAFILE
 
         default:
-            return FALSE;
+            return false;
     }
 }
 
@@ -196,7 +189,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                     SelectObject(hdcSrc, old);
                     DeleteDC(hdcMem);
                     DeleteDC(hdcSrc);
-                    return FALSE;
+                    return false;
                 }
 
                 HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);
@@ -221,10 +214,13 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
             {
                 wxBitmap *bitmap = (wxBitmap *)data;
 
-                HGLOBAL hDIB = wxDIB::ConvertFromBitmap(GetHbitmapOf(*bitmap));
-                if ( hDIB )
+                if ( bitmap && bitmap->Ok() )
                 {
-                    handle = ::SetClipboardData(CF_DIB, hDIB);
+                    wxDIB dib(*bitmap);
+                    if ( dib.IsOk() )
+                    {
+                        handle = ::SetClipboardData(CF_DIB, dib.Detach());
+                    }
                 }
                 break;
             }
@@ -252,7 +248,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
             }
 #endif // wxUSE_METAFILE
 
-#if wxUSE_ENH_METAFILE && !defined(__WIN16__) && !defined(__WXWINCE__)
+#if wxUSE_ENH_METAFILE && !defined(__WXWINCE__)
         case wxDF_ENHMETAFILE:
             {
                 wxEnhMetaFile *emf = (wxEnhMetaFile *)data;
@@ -271,7 +267,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
         default:
             {
                 wxLogError(_("Unsupported clipboard format."));
-                return FALSE;
+                return false;
             }
 
         case wxDF_OEMTEXT:
@@ -298,20 +294,20 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                 handle = SetClipboardData(dataFormat, hGlobalMemory);
                 break;
             }
-            // Only tested with non-Unicode, Visual C++ 6.0 so far
-#if defined(__VISUALC__) && !defined(UNICODE)
+            // Only tested with Visual C++ 6.0 so far
+#if defined(__VISUALC__)
         case wxDF_HTML:
             {
                 char* html = (char *)data;
-                
+
                 // Create temporary buffer for HTML header...
                 char *buf = new char [400 + strlen(html)];
-                if(!buf) return FALSE;
-                
+                if(!buf) return false;
+
                 // Get clipboard id for HTML format...
                 static int cfid = 0;
                 if(!cfid) cfid = RegisterClipboardFormat(wxT("HTML Format"));
-                
+
                 // Create a template string for the HTML header...
                 strcpy(buf,
                     "Version:0.9\r\n"
@@ -321,7 +317,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                     "EndFragment:00000000\r\n"
                     "<html><body>\r\n"
                     "<!--StartFragment -->\r\n");
-                
+
                 // Append the HTML...
                 strcat(buf, html);
                 strcat(buf, "\r\n");
@@ -330,43 +326,43 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                     "<!--EndFragment-->\r\n"
                     "</body>\r\n"
                     "</html>");
-                
+
                 // Now go back, calculate all the lengths, and write out the
                 // necessary header information. Note, wsprintf() truncates the
                 // string when you overwrite it so you follow up with code to replace
                 // the 0 appended at the end with a '\r'...
                 char *ptr = strstr(buf, "StartHTML");
-                wsprintf(ptr+10, "%08u", strstr(buf, "<html>") - buf);
+                sprintf(ptr+10, "%08u", strstr(buf, "<html>") - buf);
                 *(ptr+10+8) = '\r';
-                
+
                 ptr = strstr(buf, "EndHTML");
-                wsprintf(ptr+8, "%08u", strlen(buf));
+                sprintf(ptr+8, "%08u", strlen(buf));
                 *(ptr+8+8) = '\r';
-                
+
                 ptr = strstr(buf, "StartFragment");
-                wsprintf(ptr+14, "%08u", strstr(buf, "<!--StartFrag") - buf);
+                sprintf(ptr+14, "%08u", strstr(buf, "<!--StartFrag") - buf);
                 *(ptr+14+8) = '\r';
-                
+
                 ptr = strstr(buf, "EndFragment");
-                wsprintf(ptr+12, "%08u", strstr(buf, "<!--EndFrag") - buf);
+                sprintf(ptr+12, "%08u", strstr(buf, "<!--EndFrag") - buf);
                 *(ptr+12+8) = '\r';
-                
+
                 // Now you have everything in place ready to put on the
                 // clipboard.
-                
+
                 // Allocate global memory for transfer...
                 HGLOBAL hText = GlobalAlloc(GMEM_MOVEABLE |GMEM_DDESHARE, strlen(buf)+4);
-                
+
                 // Put your string in the global memory...
                 ptr = (char *)GlobalLock(hText);
                 strcpy(ptr, buf);
                 GlobalUnlock(hText);
-                
+
                 handle = ::SetClipboardData(cfid, hText);
-                
+
                 // Free memory...
                 GlobalFree(hText);
-                
+
                 // Clean up...
                 delete [] buf;
                 break;
@@ -378,10 +374,10 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
     {
         wxLogSysError(_("Failed to set clipboard data."));
 
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
@@ -531,8 +527,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 wxClipboard::wxClipboard()
 {
-    m_clearOnExit = FALSE;
-    m_isOpened = FALSE;
+#if wxUSE_OLE_CLIPBOARD
+    wxOleInitialize();
+#endif
+
+    m_clearOnExit = false;
+    m_isOpened = false;
 }
 
 wxClipboard::~wxClipboard()
@@ -541,44 +541,50 @@ wxClipboard::~wxClipboard()
     {
         Clear();
     }
+
+#if wxUSE_OLE_CLIPBOARD
+    wxOleUninitialize();
+#endif
 }
 
 void wxClipboard::Clear()
 {
 #if wxUSE_OLE_CLIPBOARD
-    if ( FAILED(OleSetClipboard(NULL)) )
+    HRESULT hr = OleSetClipboard(NULL);
+    if ( FAILED(hr) )
     {
-        wxLogLastError(wxT("OleSetClipboard(NULL)"));
+        wxLogApiError(wxT("OleSetClipboard(NULL)"), hr);
     }
-#endif
+#endif // wxUSE_OLE_CLIPBOARD
 }
 
 bool wxClipboard::Flush()
 {
 #if wxUSE_OLE_CLIPBOARD
-    if ( FAILED(OleFlushClipboard()) )
+    HRESULT hr = OleFlushClipboard();
+    if ( FAILED(hr) )
     {
-        wxLogLastError(wxT("OleFlushClipboard"));
+        wxLogApiError(wxT("OleFlushClipboard"), hr);
 
-        return FALSE;
+        return false;
     }
     else
     {
-        m_clearOnExit = FALSE;
+        m_clearOnExit = false;
 
-        return TRUE;
+        return true;
     }
 #else // !wxUSE_OLE_CLIPBOARD
-    return FALSE;
+    return false;
 #endif // wxUSE_OLE_CLIPBOARD/!wxUSE_OLE_CLIPBOARD
 }
 
 bool wxClipboard::Open()
 {
     // OLE opens clipboard for us
-    m_isOpened = TRUE;
+    m_isOpened = true;
 #if wxUSE_OLE_CLIPBOARD
-    return TRUE;
+    return true;
 #else
     return wxOpenClipboard();
 #endif
@@ -602,12 +608,12 @@ bool wxClipboard::SetData( wxDataObject *data )
     if ( data )
         return AddData(data);
     else
-        return TRUE;
+        return true;
 }
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );
 
 #if wxUSE_OLE_CLIPBOARD
     HRESULT hr = OleSetClipboard(data->GetInterface());
@@ -617,7 +623,7 @@ bool wxClipboard::AddData( wxDataObject *data )
 
         // don't free anything in this case
 
-        return FALSE;
+        return false;
     }
 
     // we have a problem here because we should delete wxDataObject, but we
@@ -631,11 +637,11 @@ bool wxClipboard::AddData( wxDataObject *data )
     // using OLE clipboard when the app terminates - by default, we call
     // OleSetClipboard(NULL) which won't waste RAM, but the app can call
     // wxClipboard::Flush() to chaneg this
-    m_clearOnExit = TRUE;
+    m_clearOnExit = true;
 
-    return TRUE;
+    return true;
 #elif wxUSE_DATAOBJ
-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( wxIsClipboardOpened(), false, wxT("clipboard not open") );
 
     wxDataFormat format = data->GetPreferredFormat();
 
@@ -662,8 +668,8 @@ bool wxClipboard::AddData( wxDataObject *data )
         {
 #if 1
             // TODO
-            wxLogError("Not implemented because wxMetafileDataObject does not contain width and height values.");
-            return FALSE;
+            wxLogError(wxT("Not implemented because wxMetafileDataObject does not contain width and height values."));
+            return false;
 #else
             wxMetafileDataObject* metaFileDataObject =
                 (wxMetafileDataObject*) data;
@@ -681,24 +687,24 @@ bool wxClipboard::AddData( wxDataObject *data )
 //            return wxSetClipboardData(data);
             // TODO
             wxLogError(wxT("Not implemented."));
-            return FALSE;
+            return false;
         }
     }
 #else // !wxUSE_DATAOBJ
-    return FALSE;
+    return false;
 #endif // wxUSE_DATAOBJ/!wxUSE_DATAOBJ
 }
 
 void wxClipboard::Close()
 {
-    m_isOpened = FALSE;
+    m_isOpened = false;
     // OLE closes clipboard for us
 #if !wxUSE_OLE_CLIPBOARD
     wxCloseClipboard();
 #endif
 }
 
-bool wxClipboard::IsSupported( wxDataFormat format )
+bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
     return wxIsClipboardFormatAvailable(format);
 }
@@ -712,7 +718,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     {
         wxLogSysError(hr, _("Failed to get data from the clipboard"));
 
-        return FALSE;
+        return false;
     }
 
     // build the list of supported formats
@@ -735,7 +741,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     // get the data for the given formats
     FORMATETC formatEtc;
     CLIPFORMAT cf;
-    bool result = FALSE;
+    bool result = false;
 
     // enumerate all explicit formats on the clipboard.
     // note that this does not include implicit / synthetic (automatically
@@ -781,12 +787,12 @@ bool wxClipboard::GetData( wxDataObject& data )
     {
         // convert to NativeFormat Id
         cf = formats[n].GetFormatId();
-        
+
         // if the format is not available, try the next one
         // this test includes implicit / sythetic formats
         if ( !::IsClipboardFormatAvailable(cf) )
             continue;
-            
+
         formatEtc.cfFormat = cf;
         formatEtc.ptd      = NULL;
         formatEtc.dwAspect = DVASPECT_CONTENT;
@@ -828,7 +834,7 @@ bool wxClipboard::GetData( wxDataObject& data )
         if ( SUCCEEDED(hr) )
         {
             // pass the data to the data object
-            hr = data.GetInterface()->SetData(&formatEtc, &medium, TRUE);
+            hr = data.GetInterface()->SetData(&formatEtc, &medium, true);
             if ( FAILED(hr) )
             {
                 wxLogDebug(wxT("Failed to set data in wxIDataObject"));
@@ -839,7 +845,7 @@ bool wxClipboard::GetData( wxDataObject& data )
             }
             else
             {
-                result = TRUE;
+                result = true;
             }
         }
         //else: unsupported tymed?
@@ -856,7 +862,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 
     return result;
 #elif wxUSE_DATAOBJ
-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( wxIsClipboardOpened(), false, wxT("clipboard not open") );
 
     wxDataFormat format = data.GetPreferredFormat();
     switch ( format )
@@ -867,12 +873,12 @@ bool wxClipboard::GetData( wxDataObject& data )
             wxTextDataObject& textDataObject = (wxTextDataObject &)data;
             char* s = (char*)wxGetClipboardData(format);
             if ( !s )
-                return FALSE;
+                return false;
 
             textDataObject.SetText(wxString::FromAscii(s));
             delete [] s;
 
-            return TRUE;
+            return true;
         }
 
         case wxDF_BITMAP:
@@ -881,12 +887,12 @@ bool wxClipboard::GetData( wxDataObject& data )
             wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;
             wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data.GetPreferredFormat());
             if ( !bitmap )
-                return FALSE;
+                return false;
 
             bitmapDataObject.SetBitmap(*bitmap);
             delete bitmap;
 
-            return TRUE;
+            return true;
         }
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
@@ -894,19 +900,19 @@ bool wxClipboard::GetData( wxDataObject& data )
             wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data;
             wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
             if ( !metaFile )
-                return FALSE;
+                return false;
 
             metaFileDataObject.SetMetafile(*metaFile);
             delete metaFile;
 
-            return TRUE;
+            return true;
         }
 #endif // wxUSE_METAFILE
     }
-    return FALSE;
+    return false;
 #else // !wxUSE_DATAOBJ
     wxFAIL_MSG( wxT("no clipboard implementation") );
-    return FALSE;
+    return false;
 #endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 }