X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd7ff8087b7c08f0cbece41a5a23d114d2c69eb6..6a3f00bd6660d0326904d774d6e7a48a13af1f6f:/src/os2/bitmap.cpp?ds=sidebyside diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 899777b119..16373e6f32 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -27,6 +27,7 @@ #include "wx/image.h" #endif +#include "wx/os2/dc.h" #include "wx/os2/private.h" #include "wx/xpmdecod.h" @@ -67,8 +68,7 @@ wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy) if (tocopy.m_pBitmapMask) m_pBitmapMask = new wxMask(*tocopy.m_pBitmapMask); - // TODO: how to copy an HBITMAP? - m_hBitmap = tocopy.m_hBitmap; + m_hBitmap = wxCopyBmp(tocopy.m_hBitmap); } void wxBitmapRefData::Free() @@ -84,25 +84,16 @@ void wxBitmapRefData::Free() wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)")); } } - if (m_pBitmapMask) - { - delete m_pBitmapMask; - m_pBitmapMask = NULL; - } + wxDELETE(m_pBitmapMask); } // end of wxBitmapRefData::Free // ---------------------------------------------------------------------------- // wxBitmap creation // ---------------------------------------------------------------------------- -wxObjectRefData* wxBitmap::CreateRefData() const -{ - return new wxBitmapRefData; -} - -wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const +wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const { - return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data)); + return new wxBitmapRefData(*static_cast(data)); } // this function should be called from all wxBitmap ctors @@ -151,7 +142,7 @@ bool wxBitmap::CopyFromCursor( { UnRef(); - if (!rCursor.Ok()) + if (!rCursor.IsOk()) return(false); return(CopyFromIconOrCursor(rCursor)); } // end of wxBitmap::CopyFromCursor @@ -162,7 +153,7 @@ bool wxBitmap::CopyFromIcon( { UnRef(); - if (!rIcon.Ok()) + if (!rIcon.IsOk()) return(false); return CopyFromIconOrCursor(rIcon); @@ -281,22 +272,9 @@ wxBitmap::wxBitmap( SetHBITMAP((WXHBITMAP)hBmp); } // end of wxBitmap::wxBitmap -wxBitmap::wxBitmap( - int nW -, int nH -, int nD -) -{ - Init(); - (void)Create( nW - ,nH - ,nD - ); -} // end of wxBitmap::wxBitmap - wxBitmap::wxBitmap( const void* pData -, long lType +, wxBitmapType lType , int nWidth , int nHeight , int nDepth @@ -314,12 +292,12 @@ wxBitmap::wxBitmap( wxBitmap::wxBitmap( int nId -, long lType +, wxBitmapType lType ) { Init(); LoadFile( nId - ,(int)lType + ,lType ); SetId(nId); } // end of wxBitmap::wxBitmap @@ -401,10 +379,10 @@ bool wxBitmap::Create( } SetHBITMAP((WXHBITMAP)hBmp); - return Ok(); + return IsOk(); } // end of wxBitmap::Create -bool wxBitmap::LoadFile(const wxString& filename, long type) +bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) { UnRef(); @@ -420,7 +398,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type) else // no bitmap handler found { wxImage image; - if ( image.LoadFile( filename, type ) && image.Ok() ) + if ( image.LoadFile( filename, type ) && image.IsOk() ) { *this = wxBitmap(image); @@ -434,7 +412,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type) bool wxBitmap::LoadFile( int nId -, long lType +, wxBitmapType lType ) { UnRef(); @@ -462,7 +440,7 @@ bool wxBitmap::LoadFile( bool wxBitmap::Create( const void* pData -, long lType +, wxBitmapType lType , int nWidth , int nHeight , int nDepth @@ -494,7 +472,7 @@ bool wxBitmap::Create( bool wxBitmap::SaveFile( const wxString& rFilename -, int lType +, wxBitmapType lType , const wxPalette* pPalette ) { @@ -515,7 +493,7 @@ bool wxBitmap::SaveFile( // FIXME what about palette? shouldn't we use it? wxImage vImage = ConvertToImage(); - if (!vImage.Ok()) + if (!vImage.IsOk()) return false; return(vImage.SaveFile( rFilename @@ -534,7 +512,7 @@ bool wxBitmap::CreateFromImage ( , int nDepth ) { - wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image")); + wxCHECK_MSG(rImage.IsOk(), false, wxT("invalid image")); m_refData = new wxBitmapRefData(); int nSizeLimit = 1024 * 768 * 3; @@ -571,7 +549,7 @@ bool wxBitmap::CreateFromImage ( // // Set bitmap parameters // - wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image")); + wxCHECK_MSG(rImage.IsOk(), false, wxT("invalid image")); SetWidth(nWidth); SetHeight(nBmpHeight); if (nDepth == 1) @@ -646,7 +624,7 @@ bool wxBitmap::CreateFromImage ( ); #if wxUSE_PALETTE HPAL hOldPalette = NULLHANDLE; - if (rImage.GetPalette().Ok()) + if (rImage.GetPalette().IsOk()) { hOldPalette = ::GpiSelectPalette(hPS, (HPAL)rImage.GetPalette().GetHPALETTE()); } @@ -862,7 +840,7 @@ wxImage wxBitmap::ConvertToImage() const wxImage vImage; wxDC* pDC; - wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); // // Create an wxImage object @@ -934,9 +912,12 @@ wxImage wxBitmap::ConvertToImage() const // // May already be selected into a PS // - if ((pDC = GetSelectedInto()) != NULL) + pDC = GetSelectedInto(); + const wxPMDCImpl *impl; + if (pDC != NULL && + (impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL) { - hPSMem = pDC->GetHPS(); + hPSMem = impl->GetHPS(); } else { @@ -1091,7 +1072,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rRect ) const { - wxCHECK_MSG( Ok() && + wxCHECK_MSG( IsOk() && (rRect.x >= 0) && (rRect.y >= 0) && (rRect.x + rRect.width <= GetWidth()) && (rRect.y + rRect.height <= GetHeight()), @@ -1101,7 +1082,7 @@ wxBitmap wxBitmap::GetSubBitmap( ,rRect.height ,GetDepth() ); - wxASSERT_MSG( vRet.Ok(), wxT("GetSubBitmap error") ); + wxASSERT_MSG( vRet.IsOk(), wxT("GetSubBitmap error") ); // @@ -1222,8 +1203,7 @@ wxMask::wxMask() wxMask::wxMask(const wxMask& tocopy) { - // TODO: how to copy a WXHBITMAP? - m_hMaskBitmap = tocopy.m_hMaskBitmap; + m_hMaskBitmap = wxCopyBmp(tocopy.m_hMaskBitmap); } // end of wxMask::wxMask // Construct a mask from a bitmap and a colour indicating @@ -1288,7 +1268,7 @@ bool wxMask::Create( ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap); m_hMaskBitmap = 0; } - if (!rBitmap.Ok() || rBitmap.GetDepth() != 1) + if (!rBitmap.IsOk() || rBitmap.GetDepth() != 1) { return false; } @@ -1336,7 +1316,7 @@ bool wxMask::Create( ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap); m_hMaskBitmap = 0; } - if (rBitmap.Ok() && rBitmap.GetPalette()->Ok()) + if (rBitmap.IsOk() && rBitmap.GetPalette()->IsOk()) { unsigned char cRed; unsigned char cGreen; @@ -1386,7 +1366,7 @@ bool wxMask::Create( ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap); m_hMaskBitmap = 0; } - if (!rBitmap.Ok()) + if (!rBitmap.IsOk()) { return false; } @@ -1460,7 +1440,7 @@ bool wxMask::Create( bool wxBitmapHandler::Create( wxGDIImage* pImage, const void* pData, - long WXUNUSED(lFlags), + wxBitmapType lType, int nWidth, int nHeight, int nDepth) @@ -1471,6 +1451,7 @@ bool wxBitmapHandler::Create( wxGDIImage* pImage, return(pBitmap ? Create( pBitmap ,pData + ,lType ,nWidth ,nHeight ,nDepth @@ -1480,7 +1461,7 @@ bool wxBitmapHandler::Create( wxGDIImage* pImage, bool wxBitmapHandler::Load( wxGDIImage* pImage , int nId -, long lFlags +, wxBitmapType lFlags , int nWidth , int nHeight ) @@ -1498,10 +1479,10 @@ bool wxBitmapHandler::Load( } bool wxBitmapHandler::Save( - wxGDIImage* pImage + const wxGDIImage* pImage , const wxString& rName -, int lType -) +, wxBitmapType lType +) const { wxBitmap* pBitmap = wxDynamicCast( pImage ,wxBitmap @@ -1516,7 +1497,7 @@ bool wxBitmapHandler::Save( bool wxBitmapHandler::Create( wxBitmap* WXUNUSED(pBitmap) , const void* WXUNUSED(pData) -, long WXUNUSED(lType) +, wxBitmapType WXUNUSED(lType) , int WXUNUSED(nWidth) , int WXUNUSED(nHeight) , int WXUNUSED(nDepth) @@ -1528,7 +1509,7 @@ bool wxBitmapHandler::Create( bool wxBitmapHandler::LoadFile( wxBitmap* WXUNUSED(pBitmap) , int WXUNUSED(nId) -, long WXUNUSED(lType) +, wxBitmapType WXUNUSED(lType) , int WXUNUSED(nDesiredWidth) , int WXUNUSED(nDesiredHeight) ) @@ -1539,7 +1520,7 @@ bool wxBitmapHandler::LoadFile( bool wxBitmapHandler::LoadFile( wxBitmap* WXUNUSED(pBitmap) , const wxString& WXUNUSED(rName) -, long WXUNUSED(lType) +, wxBitmapType WXUNUSED(lType) , int WXUNUSED(nDesiredWidth) , int WXUNUSED(nDesiredHeight) ) @@ -1550,9 +1531,9 @@ bool wxBitmapHandler::LoadFile( bool wxBitmapHandler::SaveFile( wxBitmap* WXUNUSED(pBitmap) , const wxString& WXUNUSED(rName) -, int WXUNUSED(nType) +, wxBitmapType WXUNUSED(nType) , const wxPalette* WXUNUSED(pPalette) -) +) const { return false; } @@ -1568,7 +1549,7 @@ HBITMAP wxInvertMask( { HBITMAP hBmpInvMask = 0; - wxCHECK_MSG( hBmpMask, 0, _T("invalid bitmap in wxInvertMask") ); + wxCHECK_MSG( hBmpMask, 0, wxT("invalid bitmap in wxInvertMask") ); // // Get width/height from the bitmap if not given @@ -1628,9 +1609,9 @@ HBITMAP wxInvertMask( return hBmpInvMask; } // end of WxWinGdi_InvertMask -HBITMAP wxFlipBmp( HBITMAP hBmp, int nWidth, int nHeight ) +HBITMAP wxCopyBmp( HBITMAP hBmp, bool flip, int nWidth, int nHeight ) { - wxCHECK_MSG( hBmp, 0, _T("invalid bitmap in wxFlipBmp") ); + wxCHECK_MSG( hBmp, 0, wxT("invalid bitmap in wxCopyBmp") ); // // Get width/height from the bitmap if not given @@ -1673,7 +1654,11 @@ HBITMAP wxFlipBmp( HBITMAP hBmp, int nWidth, int nHeight ) {nWidth, 0}, {0, 0}, {nWidth, nHeight} }; - + if (!flip) + { + vPoint[0].y = 0; + vPoint[1].y = nHeight; + } memset(&vBmih, '\0', 16); vBmih.cbFix = 16; vBmih.cx = nWidth;