X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6670f56440ae9209b3e2e51e06acf3bc5aaf1905..bbd55ff9564dcaf1a5d2ee93d789c4d656baabef:/src/os2/bitmap.cpp diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 51b5cfdc4c..74c400fccc 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: @@ -9,13 +9,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "bitmap.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/bitmap.h" + #ifndef WX_PRECOMP #include @@ -24,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" // ---------------------------------------------------------------------------- @@ -61,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 ) @@ -74,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() { @@ -94,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; @@ -264,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 @@ -296,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 @@ -386,30 +382,37 @@ bool wxBitmap::Create( return Ok(); } // end of wxBitmap::Create -bool wxBitmap::CreateFromXpm( - const char** ppData -) +bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) { -#if wxUSE_IMAGE && wxUSE_XPM - Init(); + UnRef(); - wxCHECK_MSG(ppData != NULL, false, wxT("invalid bitmap data")) + wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler); - wxXPMDecoder vDecoder; - wxImage vImg = vDecoder.ReadData(ppData); + if ( handler ) + { + m_refData = new wxBitmapRefData; - wxCHECK_MSG(vImg.Ok(), false, wxT("invalid bitmap data")) + return handler->LoadFile(this, filename, type, -1, -1); + } +#if wxUSE_IMAGE + else // no bitmap handler found + { + wxImage image; + if ( image.LoadFile( filename, type ) && image.Ok() ) + { + *this = wxBitmap(image); + + return true; + } + } +#endif // wxUSE_IMAGE - *this = wxBitmap(vImg); - return true; -#else return false; -#endif -} // end of wxBitmap::CreateFromXpm +} bool wxBitmap::LoadFile( int nId -, long lType +, wxBitmapType lType ) { UnRef(); @@ -436,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 @@ -469,7 +472,7 @@ bool wxBitmap::Create( bool wxBitmap::SaveFile( const wxString& rFilename -, int lType +, wxBitmapType lType , const wxPalette* pPalette ) { @@ -909,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 { @@ -1195,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( @@ -1428,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) @@ -1440,6 +1451,7 @@ bool wxBitmapHandler::Create( wxGDIImage* pImage, return(pBitmap ? Create( pBitmap ,pData + ,lType ,nWidth ,nHeight ,nDepth @@ -1449,7 +1461,7 @@ bool wxBitmapHandler::Create( wxGDIImage* pImage, bool wxBitmapHandler::Load( wxGDIImage* pImage , int nId -, long lFlags +, wxBitmapType lFlags , int nWidth , int nHeight ) @@ -1467,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 @@ -1484,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) @@ -1497,7 +1509,18 @@ bool wxBitmapHandler::Create( bool wxBitmapHandler::LoadFile( wxBitmap* WXUNUSED(pBitmap) , int WXUNUSED(nId) -, long WXUNUSED(lType) +, wxBitmapType WXUNUSED(lType) +, int WXUNUSED(nDesiredWidth) +, int WXUNUSED(nDesiredHeight) +) +{ + return false; +} + +bool wxBitmapHandler::LoadFile( + wxBitmap* WXUNUSED(pBitmap) +, const wxString& WXUNUSED(rName) +, wxBitmapType WXUNUSED(lType) , int WXUNUSED(nDesiredWidth) , int WXUNUSED(nDesiredHeight) ) @@ -1508,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; } @@ -1526,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 @@ -1585,3 +1608,84 @@ HBITMAP wxInvertMask( return hBmpInvMask; } // end of WxWinGdi_InvertMask + +HBITMAP wxCopyBmp( HBITMAP hBmp, bool flip, int nWidth, int nHeight ) +{ + wxCHECK_MSG( hBmp, 0, wxT("invalid bitmap in wxCopyBmp") ); + + // + // Get width/height from the bitmap if not given + // + if (!nWidth || !nHeight) + { + BITMAPINFOHEADER2 vBmhdr; + + vBmhdr.cbFix = 16; + ::GpiQueryBitmapInfoHeader( hBmp, + &vBmhdr ); + nWidth = (int)vBmhdr.cx; + nHeight = (int)vBmhdr.cy; + } + + BITMAPINFOHEADER2 vBmih; + SIZEL vSize = {0, 0}; + DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; + HDC hDCSrc = ::DevOpenDC( vHabmain, + OD_MEMORY, + "*", + 5L, + (PDEVOPENDATA)&vDop, + NULLHANDLE ); + HDC hDCDst = ::DevOpenDC( vHabmain, + OD_MEMORY, + "*", + 5L, + (PDEVOPENDATA)&vDop, + NULLHANDLE ); + HPS hPSSrc = ::GpiCreatePS( vHabmain, + hDCSrc, + &vSize, + PU_PELS | GPIA_ASSOC ); + HPS hPSDst = ::GpiCreatePS( vHabmain, + hDCDst, + &vSize, + PU_PELS | GPIA_ASSOC ); + POINTL vPoint[4] = { {0, 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; + vBmih.cy = nHeight; + vBmih.cPlanes = 1; + vBmih.cBitCount = 24; + + HBITMAP hInvBmp = ::GpiCreateBitmap( hPSDst, + &vBmih, + 0L, + NULL, + NULL ); + + ::GpiSetBitmap(hPSSrc, (HBITMAP) hBmp); + ::GpiSetBitmap(hPSDst, (HBITMAP) hInvBmp); + + ::GpiBitBlt( hPSDst, + hPSSrc, + 4L, + vPoint, + ROP_SRCCOPY, + BBO_IGNORE ); + + ::GpiDestroyPS(hPSSrc); + ::GpiDestroyPS(hPSDst); + ::DevCloseDC(hDCSrc); + ::DevCloseDC(hDCDst); + + return hInvBmp; +} // end of wxFlipBmp