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

Cured DC/GDI object leak; listbox window proc restored from debugging

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-06-25 21:30:23 +00:00
parent ad95e0f64e
commit dabeb02181
6 changed files with 33 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/icon.cpp
View File

@@ -154,13 +154,8 @@ bool wxICOResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, cons
}
#ifdef __WIN32__
/***
DWORD vers = GetVersion() ;
WORD high = HIWORD(vers) ; // high bit=0 for NT, 1 for Win32s
// Win32s doesn't have GetIconInfo function...
if (M_ICONHANDLERDATA->m_hIcon && (high&0x8000)==0 )
***/
if (M_ICONHANDLERDATA->m_hIcon && wxGetOsVersion()==wxWINDOWS_NT)
if (M_ICONHANDLERDATA->m_hIcon && wxGetOsVersion()!=wxWIN32S)
{
ICONINFO info ;
if (::GetIconInfo((HICON) M_ICONHANDLERDATA->m_hIcon, &info))