X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/259c43f679ca655362b5a439e11c87fc0666d663..f46ad98f0df1e1b073a484cb34a91e2e1278fdb7:/src/msw/gdiimage.cpp diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index a8355e703a..53b15e9dd7 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/gdiimage.cpp +// Name: src/msw/gdiimage.cpp // Purpose: wxGDIImage implementation // Author: Vadim Zeitlin // Modified by: @@ -27,13 +27,12 @@ #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/log.h" + #include "wx/app.h" + #include "wx/bitmap.h" #endif // WX_PRECOMP #include "wx/msw/private.h" -#include "wx/app.h" - -#include "wx/bitmap.h" #include "wx/msw/gdiimage.h" #if wxUSE_WXDIB @@ -573,7 +572,7 @@ wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon)) wxSize size(::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON)); #ifndef __WXWINCE__ - if ( hicon && wxGetOsVersion() != wxWIN32S ) + if (hicon) { ICONINFO info; if ( !::GetIconInfo(hicon, &info) ) @@ -603,4 +602,3 @@ wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon)) } #endif // __WXMICROWIN__ -