X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b9e3455225b670d30ee0fb67f8821ada9640f6d..1a787c5dc89b1cb6a9ddb4ebef3ad2fb24b49c8c:/src/os2/icon.cpp diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp index ffece6b1f3..d3d3f49313 100644 --- a/src/os2/icon.cpp +++ b/src/os2/icon.cpp @@ -29,9 +29,7 @@ #include "wx/icon.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase) -#endif // ============================================================================ // implementation @@ -43,8 +41,8 @@ void wxIconRefData::Free() { - if ( m_hIcon ) - ::DestroyIcon((HICON) m_hIcon); + if (m_hIcon) + ::WinFreeFileIcon((HPOINTER)m_hIcon); } // ---------------------------------------------------------------------------- @@ -88,7 +86,8 @@ bool wxIcon::LoadFile( , int nDesiredHeight ) { - wxGDIImageHandler* pHandler = FindHandler(type); + wxGDIImageHandler* pHandler = FindHandler(lType); + HPS hPs = NULLHANDLE; UnRef(); m_refData = new wxIconRefData; @@ -96,6 +95,7 @@ bool wxIcon::LoadFile( if (pHandler) return(pHandler->Load( this ,rFilename + ,hPs ,lType ,nDesiredWidth ,nDesiredHeight