]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/clipbrd.cpp
xti additions / changes, trying to reduce dependencies
[wxWidgets.git] / src / msw / clipbrd.cpp
index fd07c1ffa63e6b36abc2791c2844e0b1a98f7c81..b857b77427cfc7d412ba1400684d48173f0a4aea 100644 (file)
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "clipbrd.h"
 #endif
 
@@ -52,7 +52,6 @@
 #include "wx/clipbrd.h"
 
 #include <string.h>
-#include <windows.h>
 
 #include "wx/msw/private.h"
 
@@ -431,9 +430,6 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
                 wxBM->SetWidth(bm.bmWidth);
                 wxBM->SetHeight(bm.bmHeight);
                 wxBM->SetDepth(bm.bmPlanes);
-#if WXWIN_COMPATIBILITY_2
-                wxBM->SetOk(TRUE);
-#endif // WXWIN_COMPATIBILITY_2
                 retval = wxBM;
                 break;
             }