X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f07dc2e2a71f2c9dc9886a67e834a1b12a14df47..cb73e6001f891ae46b12a1e4ca39b93649cb6099:/src/msw/clipbrd.cpp diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index fd07c1ffa6..b857b77427 100644 --- a/src/msw/clipbrd.cpp +++ b/src/msw/clipbrd.cpp @@ -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 -#include #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; }