Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 1382552 ] Fixes GDI-ressource leak in wxStaticBitmap

Browse Source 
Robert N.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-01-17 16:08:59 +00:00
parent 0975a8a065
commit 3dece6c4bc
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/statbmp.h
View File

@@ -59,7 +59,7 @@ protected:
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
// ctor/dtor helpers // ctor/dtor helpers
void Init() { m_isIcon = true; m_image = NULL; } void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; }
void Free(); void Free();
// true if icon/bitmap is valid // true if icon/bitmap is valid
@@ -71,6 +71,8 @@ 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
HGDIOBJ m_currentHandle;
private: private:
DECLARE_DYNAMIC_CLASS(wxStaticBitmap) DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

10
src/msw/statbmp.cpp
View File

@@ -269,8 +269,16 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
LONG style = ::GetWindowLong( (HWND)GetHWND(), GWL_STYLE ) ; LONG style = ::GetWindowLong( (HWND)GetHWND(), GWL_STYLE ) ;
::SetWindowLong( (HWND)GetHWND(), GWL_STYLE, ( style & ~( SS_BITMAP|SS_ICON ) ) | ::SetWindowLong( (HWND)GetHWND(), GWL_STYLE, ( style & ~( SS_BITMAP|SS_ICON ) ) |
( m_isIcon ? SS_ICON : SS_BITMAP ) ); ( m_isIcon ? SS_ICON : SS_BITMAP ) );
::SendMessage(GetHwnd(), STM_SETIMAGE, HGDIOBJ oldHandle = (HGDIOBJ)::SendMessage(GetHwnd(), STM_SETIMAGE,
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
// if the static-control made a copy of the bitmap!
if (m_currentHandle != 0 && oldHandle != m_currentHandle)
{
// the static control made a copy and we are responsible for deleting it
DeleteObject(oldHandle);
}
m_currentHandle = (HGDIOBJ)handle;
#endif // Win32 #endif // Win32
if ( ImageIsOk() ) if ( ImageIsOk() )