Fixed VC6 compilation - wxAny(const wxVariant&) ctor required a specific 'template<>')

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 2369d769fb015b47c5ced071a2ac781c701010dc..fa65cd2a21c08fc59136a528236f2762b719cad1 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -90,7 +90,9 @@ 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;
     }
 
         return gs_wxClipboardIsOpen;
     }


@@ -770,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);


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