X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6703082ef036da3e3043e25f3f439bbc6208c65f..d162a7ee7d6bab3d0c714b865806377aeb5d0d9e:/src/msw/dibutils.cpp diff --git a/src/msw/dibutils.cpp b/src/msw/dibutils.cpp index 67b1c0569a..0e10e7b029 100644 --- a/src/msw/dibutils.cpp +++ b/src/msw/dibutils.cpp @@ -32,10 +32,6 @@ #include "wx/msw/dibutils.h" -#ifdef __WXWINE__ - #include -#endif - #if defined(__WIN32__) #if !defined(__MWERKS__) && !defined(__SALFORDC__) #include // for _fmemcpy() @@ -113,11 +109,7 @@ void wxClearSystemPalette(void) } // *** Create, select, realize, deselect, and delete the palette -#ifdef __WXWINE__ - ScreenDC = GetDC((HWND)NULL); -#else ScreenDC = GetDC(NULL); -#endif ScreenPalette = CreatePalette((LOGPALETTE *)&Palette); if (ScreenPalette) @@ -128,11 +120,7 @@ void wxClearSystemPalette(void) bOK = DeleteObject(ScreenPalette); } -#ifdef __WXWINE__ - nOK = ReleaseDC((HWND)NULL, ScreenDC); -#else nOK = ReleaseDC(NULL, ScreenDC); -#endif return; } @@ -195,7 +183,7 @@ PDIB wxDibOpenFile(LPTSTR szFile) LPVOID p; OFSTRUCT of; -#if defined(WIN32) || defined(_WIN32) +#if defined(__WIN32__) #define GetCurrentInstance() GetModuleHandle(NULL) #else #define GetCurrentInstance() (HINSTANCE)SELECTOROF((LPVOID)&of)