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
This commit is contained in:
@@ -71,8 +71,9 @@ protected:
|
|||||||
// we can have either an icon or a bitmap
|
// we can have either an icon or a bitmap
|
||||||
bool m_isIcon;
|
bool m_isIcon;
|
||||||
wxGDIImage *m_image;
|
wxGDIImage *m_image;
|
||||||
|
|
||||||
// handle used in last call to STM_SETIMAGE
|
// handle used in last call to STM_SETIMAGE
|
||||||
HGDIOBJ m_currentHandle;
|
WXHANDLE m_currentHandle;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
|
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
|
||||||
|
@@ -273,12 +273,12 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
|
|||||||
m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle);
|
m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle);
|
||||||
// detect if this is still the handle we passed before or
|
// detect if this is still the handle we passed before or
|
||||||
// if the static-control made a copy of the bitmap!
|
// 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
|
// 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
|
#endif // Win32
|
||||||
|
|
||||||
if ( ImageIsOk() )
|
if ( ImageIsOk() )
|
||||||
|
Reference in New Issue
Block a user