From 4fe41ce6250fd9ba3632f532574e671839afb595 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 19 Jan 2006 07:37:18 +0000 Subject: [PATCH] Don't use Windows handles directly in headers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/statbmp.h | 3 ++- src/msw/statbmp.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index a1fadbbf60..db39bbb7bc 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -71,8 +71,9 @@ protected: // we can have either an icon or a bitmap bool m_isIcon; wxGDIImage *m_image; + // handle used in last call to STM_SETIMAGE - HGDIOBJ m_currentHandle; + WXHANDLE m_currentHandle; private: DECLARE_DYNAMIC_CLASS(wxStaticBitmap) diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index f1f3fcee47..c321fe5f73 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -273,12 +273,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() ) -- 2.45.2