X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97507ccea7da6ca3765aa3c56bc74b1db47ca557..f8c5636c42238296eb67bf73d1da3c5acb010fee:/src/os2/bitmap.cpp diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 64fe2519d0..2d7a3fc799 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -9,6 +9,10 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifdef __GNUG__ + #pragma implementation "bitmap.h" +#endif + // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -127,10 +131,6 @@ bool wxBitmap::CopyFromIcon( if (!rIcon.Ok()) return(FALSE); -#if WXWIN_COMPATIBILITY_2 - refData->m_ok = TRUE; -#endif // WXWIN_COMPATIBILITY_2 - return CopyFromIconOrCursor(rIcon); } @@ -340,6 +340,8 @@ bool wxBitmap::LoadFile( , long lType ) { + HPS hPs = NULLHANDLE; + UnRef(); wxBitmapHandler* pHandler = wxDynamicCast( FindHandler(lType) @@ -352,6 +354,7 @@ bool wxBitmap::LoadFile( return(pHandler->LoadFile( this ,rFilename + ,hPs ,lType , -1 , -1 @@ -739,6 +742,7 @@ bool wxBitmapHandler::Create( bool wxBitmapHandler::Load( wxGDIImage* pImage , const wxString& rName +, HPS hPs , long lFlags , int nWidth , int nHeight @@ -750,6 +754,7 @@ bool wxBitmapHandler::Load( return(pBitmap ? LoadFile( pBitmap ,rName + ,hPs ,lFlags ,nWidth ,nHeight @@ -787,6 +792,7 @@ bool wxBitmapHandler::Create( bool wxBitmapHandler::LoadFile( wxBitmap* WXUNUSED(pBitmap) , const wxString& WXUNUSED(rName) +, HPS WXUNUSED(hPs) , long WXUNUSED(lType) , int WXUNUSED(nDesiredWidth) , int WXUNUSED(nDesiredHeight)