Applied Blit system options optimization to StretchBlit

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 842a9c94aa0b5a6ad7808d470e4d7d2432af5404..da105ae2542d2a8f6eed9766732ab06f1c69d1b1 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        clipbrd.cpp
+// Name:        src/msw/clipbrd.cpp

 // Purpose:     Clipboard functionality
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Clipboard functionality
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,12 +24,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/setup.h"
-#endif
-

 #if wxUSE_CLIPBOARD
 
 #if wxUSE_CLIPBOARD
 

+#include "wx/clipbrd.h"
+

 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/event.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/event.h"


@@ -42,31 +36,28 @@
     #include "wx/bitmap.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
     #include "wx/utils.h"
     #include "wx/intl.h"

+    #include "wx/log.h"
+    #include "wx/dataobj.h"

 #endif
 
 #if wxUSE_METAFILE
     #include "wx/metafile.h"
 #endif
 
 #endif
 
 #if wxUSE_METAFILE
     #include "wx/metafile.h"
 #endif
 

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

 
 #include <string.h>
 
 #include "wx/msw/private.h"
 
 #include <string.h>
 
 #include "wx/msw/private.h"

+#include "wx/msw/ole/oleutils.h"

 
 #if wxUSE_WXDIB
 
 #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
 // the functions using wxDataObject in wxClipboard
 //#define wxUSE_DATAOBJ wxUSE_DRAG_AND_DROP
 
 #endif
 
 // 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
 

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

 #if wxUSE_OLE && !defined(__WXWINCE__)
     // use OLE clipboard
     #define wxUSE_OLE_CLIPBOARD 1
 #if wxUSE_OLE && !defined(__WXWINCE__)
     // use OLE clipboard
     #define wxUSE_OLE_CLIPBOARD 1


@@ -87,11 +78,11 @@
 // old-style clipboard functions using Windows API
 // ---------------------------------------------------------------------------
 
 // old-style clipboard functions using Windows API
 // ---------------------------------------------------------------------------
 

-static bool gs_wxClipboardIsOpen = FALSE;
+static bool gs_wxClipboardIsOpen = false;

 
 bool wxOpenClipboard()
 {
 
 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 )
 
     wxWindow *win = wxTheApp->GetTopWindow();
     if ( win )


@@ -99,32 +90,34 @@ bool wxOpenClipboard()
         gs_wxClipboardIsOpen = ::OpenClipboard((HWND)win->GetHWND()) != 0;
 
         if ( !gs_wxClipboardIsOpen )
         gs_wxClipboardIsOpen = ::OpenClipboard((HWND)win->GetHWND()) != 0;
 
         if ( !gs_wxClipboardIsOpen )

+        {

             wxLogSysError(_("Failed to open the clipboard."));
             wxLogSysError(_("Failed to open the clipboard."));

+        }

 
         return gs_wxClipboardIsOpen;
     }
     else
     {
 
         return gs_wxClipboardIsOpen;
     }
     else
     {

-        wxLogDebug(wxT("Can not open clipboard without a main window."));
+        wxLogDebug(wxT("Cannot open clipboard without a main window."));

 
 

-        return FALSE;
+        return false;

     }
 }
 
 bool wxCloseClipboard()
 {
     }
 }
 
 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."));
 
 
     if ( ::CloseClipboard() == 0 )
     {
         wxLogSysError(_("Failed to close the clipboard."));
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxEmptyClipboard()
 }
 
 bool wxEmptyClipboard()


@@ -133,10 +126,10 @@ bool wxEmptyClipboard()
     {
         wxLogSysError(_("Failed to empty the clipboard."));
 
     {
         wxLogSysError(_("Failed to empty the clipboard."));
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxIsClipboardOpened()
 }
 
 bool wxIsClipboardOpened()


@@ -151,7 +144,7 @@ bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
     if ( ::IsClipboardFormatAvailable(cf) )
     {
         // ok from the first try
     if ( ::IsClipboardFormatAvailable(cf) )
     {
         // ok from the first try

-        return TRUE;
+        return true;

     }
 
     // for several standard formats, we can convert from some other ones too
     }
 
     // for several standard formats, we can convert from some other ones too


@@ -167,7 +160,7 @@ bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 #endif // wxUSE_ENH_METAFILE
 
         default:
 #endif // wxUSE_ENH_METAFILE
 
         default:

-            return FALSE;
+            return false;

     }
 }
 
     }
 }
 


@@ -196,7 +189,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                     SelectObject(hdcSrc, old);
                     DeleteDC(hdcMem);
                     DeleteDC(hdcSrc);
                     SelectObject(hdcSrc, old);
                     DeleteDC(hdcMem);
                     DeleteDC(hdcSrc);

-                    return FALSE;
+                    return false;

                 }
 
                 HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);
                 }
 
                 HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);


@@ -221,10 +214,13 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
             {
                 wxBitmap *bitmap = (wxBitmap *)data;
 
             {
                 wxBitmap *bitmap = (wxBitmap *)data;
 

-                HGLOBAL hDIB = wxDIB::ConvertFromBitmap(GetHbitmapOf(*bitmap));
-                if ( hDIB )
+                if ( bitmap && bitmap->IsOk() )

                 {
                 {

-                    handle = ::SetClipboardData(CF_DIB, hDIB);
+                    wxDIB dib(*bitmap);
+                    if ( dib.IsOk() )
+                    {
+                        handle = ::SetClipboardData(CF_DIB, dib.Detach());
+                    }

                 }
                 break;
             }
                 }
                 break;
             }


@@ -271,7 +267,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
         default:
             {
                 wxLogError(_("Unsupported clipboard format."));
         default:
             {
                 wxLogError(_("Unsupported clipboard format."));

-                return FALSE;
+                return false;

             }
 
         case wxDF_OEMTEXT:
             }
 
         case wxDF_OEMTEXT:


@@ -298,20 +294,20 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                 handle = SetClipboardData(dataFormat, hGlobalMemory);
                 break;
             }
                 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;
         case wxDF_HTML:
             {
                 char* html = (char *)data;

-                
+

                 // Create temporary buffer for HTML header...
                 char *buf = new char [400 + strlen(html)];
                 // 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"));
                 // 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"
                 // 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");
                     "EndFragment:00000000\r\n"
                     "<html><body>\r\n"
                     "<!--StartFragment -->\r\n");

-                
+

                 // Append the HTML...
                 strcat(buf, html);
                 strcat(buf, "\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>");
                     "<!--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");
                 // 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+10+8) = '\r';

-                
+

                 ptr = strstr(buf, "EndHTML");
                 ptr = strstr(buf, "EndHTML");

-                wsprintf(ptr+8, "%08u", strlen(buf));
+                sprintf(ptr+8, "%08u", strlen(buf));

                 *(ptr+8+8) = '\r';
                 *(ptr+8+8) = '\r';

-                
+

                 ptr = strstr(buf, "StartFragment");
                 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+14+8) = '\r';

-                
+

                 ptr = strstr(buf, "EndFragment");
                 ptr = strstr(buf, "EndFragment");

-                wsprintf(ptr+12, "%08u", strstr(buf, "<!--EndFrag") - buf);
+                sprintf(ptr+12, "%08u", strstr(buf, "<!--EndFrag") - buf);

                 *(ptr+12+8) = '\r';
                 *(ptr+12+8) = '\r';

-                
+

                 // Now you have everything in place ready to put on the
                 // clipboard.
                 // 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);
                 // 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);
                 // Put your string in the global memory...
                 ptr = (char *)GlobalLock(hText);
                 strcpy(ptr, buf);
                 GlobalUnlock(hText);

-                
+

                 handle = ::SetClipboardData(cfid, hText);
                 handle = ::SetClipboardData(cfid, hText);

-                
+

                 // Free memory...
                 GlobalFree(hText);
                 // Free memory...
                 GlobalFree(hText);

-                
+

                 // Clean up...
                 delete [] buf;
                 break;
                 // Clean up...
                 delete [] buf;
                 break;


@@ -378,10 +374,10 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
     {
         wxLogSysError(_("Failed to set clipboard data."));
 
     {
         wxLogSysError(_("Failed to set clipboard data."));
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 }
 
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)


@@ -531,54 +527,81 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 wxClipboard::wxClipboard()
 {
 
 wxClipboard::wxClipboard()
 {

-    m_clearOnExit = FALSE;
-    m_isOpened = FALSE;
+#if wxUSE_OLE_CLIPBOARD
+    wxOleInitialize();
+#endif
+
+    m_lastDataObject = NULL;
+    m_isOpened = false;

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

-    if ( m_clearOnExit )
+    if ( m_lastDataObject )

     {
         Clear();
     }
     {
         Clear();
     }

+
+#if wxUSE_OLE_CLIPBOARD
+    wxOleUninitialize();
+#endif

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

+    if ( IsUsingPrimarySelection() )
+        return;
+

 #if wxUSE_OLE_CLIPBOARD
 #if wxUSE_OLE_CLIPBOARD

-    if ( FAILED(OleSetClipboard(NULL)) )
+    if (m_lastDataObject)

     {
     {

-        wxLogLastError(wxT("OleSetClipboard(NULL)"));
+        // don't touch data set by other applications
+        HRESULT hr = OleIsCurrentClipboard(m_lastDataObject);
+        if (S_OK == hr)
+        {
+            hr = OleSetClipboard(NULL);
+            if ( FAILED(hr) )
+            {
+                wxLogApiError(wxT("OleSetClipboard(NULL)"), hr);
+            }
+        }
+        m_lastDataObject = NULL;

     }
     }

-#endif
+#endif // wxUSE_OLE_CLIPBOARD

 }
 
 bool wxClipboard::Flush()
 {
 #if wxUSE_OLE_CLIPBOARD
 }
 
 bool wxClipboard::Flush()
 {
 #if wxUSE_OLE_CLIPBOARD

-    if ( FAILED(OleFlushClipboard()) )
-    {
-        wxLogLastError(wxT("OleFlushClipboard"));
-
-        return FALSE;
-    }
-    else
+    if (m_lastDataObject)

     {
     {

-        m_clearOnExit = FALSE;
+        // don't touch data set by other applications
+        HRESULT hr = OleIsCurrentClipboard(m_lastDataObject);
+        m_lastDataObject = NULL;
+        if (S_OK == hr)
+        {
+            hr = OleFlushClipboard();
+            if ( FAILED(hr) )
+            {
+                wxLogApiError(wxT("OleFlushClipboard"), hr);

 
 

-        return TRUE;
+                return false;
+            }
+            return true;
+        }

     }
     }

+    return false;

 #else // !wxUSE_OLE_CLIPBOARD
 #else // !wxUSE_OLE_CLIPBOARD

-    return FALSE;
+    return false;

 #endif // wxUSE_OLE_CLIPBOARD/!wxUSE_OLE_CLIPBOARD
 }
 
 bool wxClipboard::Open()
 {
     // OLE opens clipboard for us
 #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
 #if wxUSE_OLE_CLIPBOARD

-    return TRUE;
+    return true;

 #else
     return wxOpenClipboard();
 #endif
 #else
     return wxOpenClipboard();
 #endif


@@ -595,6 +618,9 @@ bool wxClipboard::IsOpened() const
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
 
 bool wxClipboard::SetData( wxDataObject *data )
 {

+    if ( IsUsingPrimarySelection() )
+        return false;
+

 #if !wxUSE_OLE_CLIPBOARD
     (void)wxEmptyClipboard();
 #endif // wxUSE_OLE_CLIPBOARD
 #if !wxUSE_OLE_CLIPBOARD
     (void)wxEmptyClipboard();
 #endif // wxUSE_OLE_CLIPBOARD


@@ -602,12 +628,15 @@ bool wxClipboard::SetData( wxDataObject *data )
     if ( data )
         return AddData(data);
     else
     if ( data )
         return AddData(data);
     else

-        return TRUE;
+        return true;

 }
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
 }
 
 bool wxClipboard::AddData( wxDataObject *data )
 {

-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    if ( IsUsingPrimarySelection() )
+        return false;
+
+    wxCHECK_MSG( data, false, wxT("data is invalid") );

 
 #if wxUSE_OLE_CLIPBOARD
     HRESULT hr = OleSetClipboard(data->GetInterface());
 
 #if wxUSE_OLE_CLIPBOARD
     HRESULT hr = OleSetClipboard(data->GetInterface());


@@ -617,9 +646,15 @@ bool wxClipboard::AddData( wxDataObject *data )
 
         // don't free anything in this case
 
 
         // don't free anything in this case
 

-        return FALSE;
+        return false;

     }
 
     }
 

+    // we have to call either OleSetClipboard(NULL) or OleFlushClipboard() when
+    // 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 change this
+    m_lastDataObject = data->GetInterface();
+

     // we have a problem here because we should delete wxDataObject, but we
     // can't do it because IDataObject which we just gave to the clipboard
     // would try to use it when it will need the data. IDataObject is ref
     // we have a problem here because we should delete wxDataObject, but we
     // can't do it because IDataObject which we just gave to the clipboard
     // would try to use it when it will need the data. IDataObject is ref


@@ -627,15 +662,9 @@ bool wxClipboard::AddData( wxDataObject *data )
     // and tell it to delete wxDataObject when it is deleted itself.
     data->SetAutoDelete();
 
     // and tell it to delete wxDataObject when it is deleted itself.
     data->SetAutoDelete();
 

-    // we have to call either OleSetClipboard(NULL) or OleFlushClipboard() when
-    // 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;
-
-    return TRUE;
+    return true;

 #elif wxUSE_DATAOBJ
 #elif wxUSE_DATAOBJ

-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( wxIsClipboardOpened(), false, wxT("clipboard not open") );

 
     wxDataFormat format = data->GetPreferredFormat();
 
 
     wxDataFormat format = data->GetPreferredFormat();
 


@@ -662,8 +691,8 @@ bool wxClipboard::AddData( wxDataObject *data )
         {
 #if 1
             // TODO
         {
 #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;
 #else
             wxMetafileDataObject* metaFileDataObject =
                 (wxMetafileDataObject*) data;


@@ -681,30 +710,33 @@ bool wxClipboard::AddData( wxDataObject *data )
 //            return wxSetClipboardData(data);
             // TODO
             wxLogError(wxT("Not implemented."));
 //            return wxSetClipboardData(data);
             // TODO
             wxLogError(wxT("Not implemented."));

-            return FALSE;
+            return false;

         }
     }
 #else // !wxUSE_DATAOBJ
         }
     }
 #else // !wxUSE_DATAOBJ

-    return FALSE;
+    return false;

 #endif // wxUSE_DATAOBJ/!wxUSE_DATAOBJ
 }
 
 void wxClipboard::Close()
 {
 #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
 }
 
     // 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);
+    return !IsUsingPrimarySelection() && wxIsClipboardFormatAvailable(format);

 }
 
 bool wxClipboard::GetData( wxDataObject& data )
 {
 }
 
 bool wxClipboard::GetData( wxDataObject& data )
 {

+    if ( IsUsingPrimarySelection() )
+        return false;
+

 #if wxUSE_OLE_CLIPBOARD
     IDataObject *pDataObject = NULL;
     HRESULT hr = OleGetClipboard(&pDataObject);
 #if wxUSE_OLE_CLIPBOARD
     IDataObject *pDataObject = NULL;
     HRESULT hr = OleGetClipboard(&pDataObject);


@@ -712,7 +744,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     {
         wxLogSysError(hr, _("Failed to get data from the clipboard"));
 
     {
         wxLogSysError(hr, _("Failed to get data from the clipboard"));
 

-        return FALSE;
+        return false;

     }
 
     // build the list of supported formats
     }
 
     // build the list of supported formats


@@ -735,12 +767,12 @@ bool wxClipboard::GetData( wxDataObject& data )
     // get the data for the given formats
     FORMATETC formatEtc;
     CLIPFORMAT cf;
     // 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
     // converted) formats.
 
     // enumerate all explicit formats on the clipboard.
     // note that this does not include implicit / synthetic (automatically
     // converted) formats.

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL >= 2

     // get the format enumerator
     IEnumFORMATETC *pEnumFormatEtc = NULL;
     hr = pDataObject->EnumFormatEtc(DATADIR_GET, &pEnumFormatEtc);
     // get the format enumerator
     IEnumFORMATETC *pEnumFormatEtc = NULL;
     hr = pDataObject->EnumFormatEtc(DATADIR_GET, &pEnumFormatEtc);


@@ -773,7 +805,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 
         pEnumFormatEtc->Release();
     }
 
         pEnumFormatEtc->Release();
     }

-#endif // Debug
+#endif // wxDEBUG_LEVEL >= 2

 
     STGMEDIUM medium;
     // stop at the first valid format found on the clipboard
 
     STGMEDIUM medium;
     // stop at the first valid format found on the clipboard


@@ -781,12 +813,12 @@ bool wxClipboard::GetData( wxDataObject& data )
     {
         // convert to NativeFormat Id
         cf = formats[n].GetFormatId();
     {
         // 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;
         // 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;
         formatEtc.cfFormat = cf;
         formatEtc.ptd      = NULL;
         formatEtc.dwAspect = DVASPECT_CONTENT;


@@ -828,7 +860,7 @@ bool wxClipboard::GetData( wxDataObject& data )
         if ( SUCCEEDED(hr) )
         {
             // pass the data to the data object
         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"));
             if ( FAILED(hr) )
             {
                 wxLogDebug(wxT("Failed to set data in wxIDataObject"));


@@ -839,7 +871,7 @@ bool wxClipboard::GetData( wxDataObject& data )
             }
             else
             {
             }
             else
             {

-                result = TRUE;
+                result = true;

             }
         }
         //else: unsupported tymed?
             }
         }
         //else: unsupported tymed?


@@ -856,7 +888,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 
     return result;
 #elif wxUSE_DATAOBJ
 
     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 )
 
     wxDataFormat format = data.GetPreferredFormat();
     switch ( format )


@@ -867,12 +899,12 @@ bool wxClipboard::GetData( wxDataObject& data )
             wxTextDataObject& textDataObject = (wxTextDataObject &)data;
             char* s = (char*)wxGetClipboardData(format);
             if ( !s )
             wxTextDataObject& textDataObject = (wxTextDataObject &)data;
             char* s = (char*)wxGetClipboardData(format);
             if ( !s )

-                return FALSE;
+                return false;

 
             textDataObject.SetText(wxString::FromAscii(s));
             delete [] s;
 
 
             textDataObject.SetText(wxString::FromAscii(s));
             delete [] s;
 

-            return TRUE;
+            return true;

         }
 
         case wxDF_BITMAP:
         }
 
         case wxDF_BITMAP:


@@ -881,12 +913,12 @@ bool wxClipboard::GetData( wxDataObject& data )
             wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;
             wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data.GetPreferredFormat());
             if ( !bitmap )
             wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;
             wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data.GetPreferredFormat());
             if ( !bitmap )

-                return FALSE;
+                return false;

 
             bitmapDataObject.SetBitmap(*bitmap);
             delete bitmap;
 
 
             bitmapDataObject.SetBitmap(*bitmap);
             delete bitmap;
 

-            return TRUE;
+            return true;

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


@@ -894,21 +926,20 @@ bool wxClipboard::GetData( wxDataObject& data )
             wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data;
             wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
             if ( !metaFile )
             wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data;
             wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
             if ( !metaFile )

-                return FALSE;
+                return false;

 
             metaFileDataObject.SetMetafile(*metaFile);
             delete metaFile;
 
 
             metaFileDataObject.SetMetafile(*metaFile);
             delete metaFile;
 

-            return TRUE;
+            return true;

         }
 #endif // wxUSE_METAFILE
     }
         }
 #endif // wxUSE_METAFILE
     }

-    return FALSE;
+    return false;

 #else // !wxUSE_DATAOBJ
     wxFAIL_MSG( wxT("no clipboard implementation") );
 #else // !wxUSE_DATAOBJ
     wxFAIL_MSG( wxT("no clipboard implementation") );

-    return FALSE;
+    return false;

 #endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 }
 
 #endif // wxUSE_CLIPBOARD
 #endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 }
 
 #endif // wxUSE_CLIPBOARD

-