Add some version checks to help compiling on OSX.

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 23cd2cce07fc0e570f52d25c809b94d64a23f6ff..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:


@@ -26,6 +26,8 @@
 
 #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"


@@ -34,14 +36,14 @@
     #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 <string.h>
 


@@ -56,10 +58,6 @@
 // the functions using wxDataObject in wxClipboard
 //#define wxUSE_DATAOBJ wxUSE_DRAG_AND_DROP
 
 // 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


@@ -92,13 +90,15 @@ 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;
     }


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

-                if ( bitmap && bitmap->Ok() )
+                if ( bitmap && bitmap->IsOk() )

                 {
                     wxDIB dib(*bitmap);
                     if ( dib.IsOk() )
                 {
                     wxDIB dib(*bitmap);
                     if ( dib.IsOk() )


@@ -549,6 +549,9 @@ wxClipboard::~wxClipboard()
 
 void wxClipboard::Clear()
 {
 
 void wxClipboard::Clear()
 {

+    if ( IsUsingPrimarySelection() )
+        return;
+

 #if wxUSE_OLE_CLIPBOARD
     if (m_lastDataObject)
     {
 #if wxUSE_OLE_CLIPBOARD
     if (m_lastDataObject)
     {


@@ -557,10 +560,10 @@ void wxClipboard::Clear()
         if (S_OK == hr)
         {
             hr = OleSetClipboard(NULL);
         if (S_OK == hr)
         {
             hr = OleSetClipboard(NULL);

-    if ( FAILED(hr) )
-    {
-        wxLogApiError(wxT("OleSetClipboard(NULL)"), hr);
-    }
+            if ( FAILED(hr) )
+            {
+                wxLogApiError(wxT("OleSetClipboard(NULL)"), hr);
+            }

         }
         m_lastDataObject = NULL;
     }
         }
         m_lastDataObject = NULL;
     }


@@ -578,14 +581,14 @@ bool wxClipboard::Flush()
         if (S_OK == hr)
         {
             hr = OleFlushClipboard();
         if (S_OK == hr)
         {
             hr = OleFlushClipboard();

-    if ( FAILED(hr) )
-    {
-        wxLogApiError(wxT("OleFlushClipboard"), hr);
+            if ( FAILED(hr) )
+            {
+                wxLogApiError(wxT("OleFlushClipboard"), hr);

 
 

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

     }
     return false;
 #else // !wxUSE_OLE_CLIPBOARD
     }
     return false;
 #else // !wxUSE_OLE_CLIPBOARD


@@ -615,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


@@ -627,6 +633,9 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
 
 bool wxClipboard::AddData( wxDataObject *data )
 {

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

     wxCHECK_MSG( data, false, wxT("data is invalid") );
 
 #if wxUSE_OLE_CLIPBOARD
     wxCHECK_MSG( data, false, wxT("data is invalid") );
 
 #if wxUSE_OLE_CLIPBOARD


@@ -720,11 +729,14 @@ void wxClipboard::Close()
 
 bool wxClipboard::IsSupported( const 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);


@@ -760,7 +772,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     // 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);


@@ -793,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


@@ -931,4 +943,3 @@ bool wxClipboard::GetData( wxDataObject& data )
 }
 
 #endif // wxUSE_CLIPBOARD
 }
 
 #endif // wxUSE_CLIPBOARD

-