X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f60d0f944a6ce86bce59901e7ea3811f0992bce7..891ad68ff5ac338d81ea0c4ff176601761e73517:/src/msw/icon.cpp diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp index 08c91789d0..36ce690043 100644 --- a/src/msw/icon.cpp +++ b/src/msw/icon.cpp @@ -32,11 +32,6 @@ #include "wx/msw/private.h" #include "assert.h" -#if wxUSE_XPM_IN_MSW -#define FOR_MSW 1 -#include "../src/xpm/xpm34.h" -#endif - #if wxUSE_RESOURCE_LOADING_IN_MSW #include "wx/msw/curico.h" #include "wx/msw/curicop.h" @@ -142,7 +137,7 @@ bool wxICOResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long { if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) ) { -#if defined(__WIN32__) +#if defined(__WIN32__) && !defined(__SC__) if (desiredWidth > -1 && desiredHeight > -1) { M_ICONHANDLERDATA->m_hIcon = (WXHICON) ::LoadImage(wxGetInstance(), name, IMAGE_ICON, desiredWidth, desiredHeight, LR_DEFAULTCOLOR);