bogus assert removed, optimized (and removed a bug in process of doing it)

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 0c92cfc8e20b4916abaa968e0b85dbadf6c3e5f4..5701f61ff80b7b5bedfd0d16795308c9cff8218f 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -25,7 +25,7 @@
 #include "wx/setup.h"
 #endif
 
-#if USE_CLIPBOARD
+#if wxUSE_CLIPBOARD
 
 #ifndef WX_PRECOMP
 #include "wx/app.h"
@@ -121,7 +121,7 @@ bool wxSetClipboardData(int dataFormat, wxObject *obj, int width, int height)
     }
     case wxDF_DIB:
     {
-#if USE_IMAGE_LOADING_IN_MSW
+#if wxUSE_IMAGE_LOADING_IN_MSW
       HBITMAP hBitmap=(HBITMAP) ((wxBitmap *)obj)->GetHBITMAP();
       HANDLE hDIB=BitmapToDIB(hBitmap,NULL); // NULL==uses system palette
       bool success = (::SetClipboardData(CF_DIB,hDIB) != 0);
@@ -131,7 +131,7 @@ bool wxSetClipboardData(int dataFormat, wxObject *obj, int width, int height)
       return success;
       break;
     }
-#if USE_METAFILE
+#if wxUSE_METAFILE
     case wxDF_METAFILE:
     {
       wxMetaFile *wxMF = (wxMetaFile *)obj;
@@ -461,5 +461,5 @@ char *wxClipboard::GetClipboardData(char *format, long *length, long time)
 }
 
 
-#endif // USE_CLIPBOARD
+#endif // wxUSE_CLIPBOARD