X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3dece6c4bc6b3952cf2e3c77ca52081a443677be..f46ad98f0df1e1b073a484cb34a91e2e1278fdb7:/src/msw/statbmp.cpp diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index f1f3fcee47..26a32bf03b 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.cpp +// Name: src/msw/statbmp.cpp // Purpose: wxStaticBitmap // Author: Julian Smart // Modified by: @@ -26,14 +26,15 @@ #if wxUSE_STATBMP -#include "wx/window.h" -#include "wx/msw/private.h" +#include "wx/statbmp.h" #ifndef WX_PRECOMP + #include "wx/window.h" #include "wx/icon.h" - #include "wx/statbmp.h" #endif +#include "wx/msw/private.h" + #include "wx/sysopt.h" #include @@ -273,12 +274,12 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image) m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle); // detect if this is still the handle we passed before or // if the static-control made a copy of the bitmap! - if (m_currentHandle != 0 && oldHandle != m_currentHandle) + if (m_currentHandle != 0 && oldHandle != (HGDIOBJ) m_currentHandle) { // the static control made a copy and we are responsible for deleting it - DeleteObject(oldHandle); + DeleteObject((HGDIOBJ) oldHandle); } - m_currentHandle = (HGDIOBJ)handle; + m_currentHandle = (WXHANDLE)handle; #endif // Win32 if ( ImageIsOk() ) @@ -303,4 +304,3 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image) } #endif // wxUSE_STATBMP -