X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..479647105b2ad7d4016b04aefcf2021daed922a1:/src/os2/gdiimage.cpp diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp index d19adb7e8b..4c2fee5425 100644 --- a/src/os2/gdiimage.cpp +++ b/src/os2/gdiimage.cpp @@ -113,7 +113,7 @@ public: // creating and saving icons is not supported virtual bool Create( wxGDIImage* WXUNUSED(pImage) - ,void* WXUNUSED(pData) + ,const void* WXUNUSED(pData) ,long WXUNUSED(lFlags) ,int WXUNUSED(nWidth) ,int WXUNUSED(nHeight) @@ -241,7 +241,7 @@ bool wxGDIImage::FreeResource( bool WXUNUSED(bForce) ) return true; } -WXHANDLE wxGDIImage::GetResourceHandle() +WXHANDLE wxGDIImage::GetResourceHandle() const { return GetHandle(); } @@ -300,7 +300,7 @@ wxGDIImageHandler* wxGDIImage::FindHandler( { wxGDIImageHandler* pHandler = pNode->GetData(); - if ( (pHandler->GetExtension() = rExtension) && + if ( (pHandler->GetExtension() == rExtension) && (lType == -1 || pHandler->GetType() == lType) ) { return pHandler; @@ -469,7 +469,7 @@ bool wxICOResourceHandler::LoadIcon( wxIcon* pIcon, { HPOINTER hIcon; - hIcon = ::WinLoadFileIcon( (PSZ)rName.c_str() + hIcon = ::WinLoadFileIcon( rName.c_str() ,TRUE // load for private use );