X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59fb774d924754f60063924a01b73989908dc45e..b7d3a622aa58729f92941c2b6710c5481b16f19e:/src/os2/bitmap.cpp?ds=sidebyside diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 9139803c49..16373e6f32 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bitmap.cpp +// Name: src/os2/bitmap.cpp // Purpose: wxBitmap // Author: David Webster // Modified by: @@ -12,6 +12,8 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/bitmap.h" + #ifndef WX_PRECOMP #include @@ -20,15 +22,14 @@ #include "wx/app.h" #include "wx/palette.h" #include "wx/dcmemory.h" - #include "wx/bitmap.h" #include "wx/icon.h" + #include "wx/log.h" + #include "wx/image.h" #endif +#include "wx/os2/dc.h" #include "wx/os2/private.h" -#include "wx/log.h" -//#include "wx/msw/dib.h" -#include "wx/image.h" #include "wx/xpmdecod.h" // ---------------------------------------------------------------------------- @@ -57,6 +58,19 @@ wxBitmapRefData::wxBitmapRefData() m_hBitmap = (WXHBITMAP) NULL; } // end of wxBitmapRefData::wxBitmapRefData +wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy) +{ + m_nQuality = tocopy.m_nQuality; + m_pSelectedInto = NULL; // don't copy this + m_nNumColors = tocopy.m_nNumColors; + + // copy the mask + if (tocopy.m_pBitmapMask) + m_pBitmapMask = new wxMask(*tocopy.m_pBitmapMask); + + m_hBitmap = wxCopyBmp(tocopy.m_hBitmap); +} + void wxBitmapRefData::Free() { if ( m_pSelectedInto ) @@ -70,17 +84,18 @@ 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 // ---------------------------------------------------------------------------- +wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const +{ + return new wxBitmapRefData(*static_cast(data)); +} + // this function should be called from all wxBitmap ctors void wxBitmap::Init() { @@ -90,9 +105,7 @@ void wxBitmap::Init() // } // end of wxBitmap::Init -bool wxBitmap::CopyFromIconOrCursor( - const wxGDIImage& rIcon -) +bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& rIcon) { HPOINTER hIcon = (HPOINTER)rIcon.GetHandle(); POINTERINFO SIconInfo; @@ -129,7 +142,7 @@ bool wxBitmap::CopyFromCursor( { UnRef(); - if (!rCursor.Ok()) + if (!rCursor.IsOk()) return(false); return(CopyFromIconOrCursor(rCursor)); } // end of wxBitmap::CopyFromCursor @@ -140,7 +153,7 @@ bool wxBitmap::CopyFromIcon( { UnRef(); - if (!rIcon.Ok()) + if (!rIcon.IsOk()) return(false); return CopyFromIconOrCursor(rIcon); @@ -260,21 +273,8 @@ wxBitmap::wxBitmap( } // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( - int nW -, int nH -, int nD -) -{ - Init(); - (void)Create( nW - ,nH - ,nD - ); -} // end of wxBitmap::wxBitmap - -wxBitmap::wxBitmap( - void* pData -, long lType + const void* pData +, wxBitmapType lType , int nWidth , int nHeight , int nDepth @@ -292,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 @@ -379,31 +379,10 @@ bool wxBitmap::Create( } SetHBITMAP((WXHBITMAP)hBmp); - return Ok(); + return IsOk(); } // end of wxBitmap::Create -bool wxBitmap::CreateFromXpm( - const char** ppData -) -{ -#if wxUSE_IMAGE && wxUSE_XPM - Init(); - - wxCHECK_MSG(ppData != NULL, false, wxT("invalid bitmap data")) - - wxXPMDecoder vDecoder; - wxImage vImg = vDecoder.ReadData(ppData); - - wxCHECK_MSG(vImg.Ok(), false, wxT("invalid bitmap data")) - - *this = wxBitmap(vImg); - return true; -#else - return false; -#endif -} // end of wxBitmap::CreateFromXpm - -bool wxBitmap::LoadFile(const wxString& filename, long type) +bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) { UnRef(); @@ -419,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); @@ -433,7 +412,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type) bool wxBitmap::LoadFile( int nId -, long lType +, wxBitmapType lType ) { UnRef(); @@ -460,8 +439,8 @@ bool wxBitmap::LoadFile( } // end of wxBitmap::LoadFile bool wxBitmap::Create( - void* pData -, long lType + const void* pData +, wxBitmapType lType , int nWidth , int nHeight , int nDepth @@ -493,7 +472,7 @@ bool wxBitmap::Create( bool wxBitmap::SaveFile( const wxString& rFilename -, int lType +, wxBitmapType lType , const wxPalette* pPalette ) { @@ -514,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 @@ -533,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; @@ -570,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) @@ -645,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()); } @@ -861,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 @@ -933,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 { @@ -1090,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()), @@ -1100,7 +1082,7 @@ wxBitmap wxBitmap::GetSubBitmap( ,rRect.height ,GetDepth() ); - wxASSERT_MSG( vRet.Ok(), wxT("GetSubBitmap error") ); + wxASSERT_MSG( vRet.IsOk(), wxT("GetSubBitmap error") ); // @@ -1219,6 +1201,11 @@ wxMask::wxMask() m_hMaskBitmap = 0; } // end of wxMask::wxMask +wxMask::wxMask(const wxMask& tocopy) +{ + m_hMaskBitmap = wxCopyBmp(tocopy.m_hMaskBitmap); +} // end of wxMask::wxMask + // Construct a mask from a bitmap and a colour indicating // the transparent area wxMask::wxMask( @@ -1281,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; } @@ -1329,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; @@ -1379,7 +1366,7 @@ bool wxMask::Create( ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap); m_hMaskBitmap = 0; } - if (!rBitmap.Ok()) + if (!rBitmap.IsOk()) { return false; } @@ -1452,8 +1439,8 @@ bool wxMask::Create( // ---------------------------------------------------------------------------- bool wxBitmapHandler::Create( wxGDIImage* pImage, - void* pData, - long WXUNUSED(lFlags), + const void* pData, + wxBitmapType lType, int nWidth, int nHeight, int nDepth) @@ -1464,6 +1451,7 @@ bool wxBitmapHandler::Create( wxGDIImage* pImage, return(pBitmap ? Create( pBitmap ,pData + ,lType ,nWidth ,nHeight ,nDepth @@ -1473,7 +1461,7 @@ bool wxBitmapHandler::Create( wxGDIImage* pImage, bool wxBitmapHandler::Load( wxGDIImage* pImage , int nId -, long lFlags +, wxBitmapType lFlags , int nWidth , int nHeight ) @@ -1491,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 @@ -1508,8 +1496,8 @@ bool wxBitmapHandler::Save( bool wxBitmapHandler::Create( wxBitmap* WXUNUSED(pBitmap) -, void* WXUNUSED(pData) -, long WXUNUSED(lType) +, const void* WXUNUSED(pData) +, wxBitmapType WXUNUSED(lType) , int WXUNUSED(nWidth) , int WXUNUSED(nHeight) , int WXUNUSED(nDepth) @@ -1521,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) ) @@ -1532,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) ) @@ -1543,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; } @@ -1561,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 @@ -1621,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 @@ -1666,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;