X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1759c4913394381b22d14e78275d3a6f4a0d18e2..e7478376f1274fb462443ad911647e65e76f3bd8:/src/os2/bitmap.cpp diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 2a88e27107..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" // ---------------------------------------------------------------------------- @@ -58,44 +55,57 @@ wxBitmapRefData::wxBitmapRefData() m_pSelectedInto = NULL; m_nNumColors = 0; m_pBitmapMask = NULL; - m_hBitmap = (WXHBITMAP) NULL; + 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 ) { - wxLogLastError("GpiDeleteBitmap(hbitmap)"); + wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)")); } if (m_hBitmap) { if (!::GpiDeleteBitmap((HBITMAP)m_hBitmap)) { - wxLogLastError("GpiDeleteBitmap(hbitmap)"); + wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)")); } } - - 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() { - m_bIsMono = FALSE; + m_bIsMono = false; // // True for all bitmaps created from bits, wxImages, Xpms // - m_bFlip = TRUE; } // end of wxBitmap::Init -bool wxBitmap::CopyFromIconOrCursor( - const wxGDIImage& rIcon -) +bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& rIcon) { HPOINTER hIcon = (HPOINTER)rIcon.GetHandle(); POINTERINFO SIconInfo; @@ -103,7 +113,7 @@ bool wxBitmap::CopyFromIconOrCursor( if (!::WinQueryPointerInfo(hIcon, &SIconInfo)) { wxLogLastError(wxT("WinQueryPointerInfo")); - return FALSE; + return false; } wxBitmapRefData* pRefData = new wxBitmapRefData; @@ -123,7 +133,7 @@ bool wxBitmap::CopyFromIconOrCursor( pMask->SetMaskBitmap(GetHBITMAP()); SetMask(pMask); - return(TRUE); + return true; } // end of wxBitmap::CopyFromIconOrCursor bool wxBitmap::CopyFromCursor( @@ -133,7 +143,7 @@ bool wxBitmap::CopyFromCursor( UnRef(); if (!rCursor.Ok()) - return(FALSE); + return(false); return(CopyFromIconOrCursor(rCursor)); } // end of wxBitmap::CopyFromCursor @@ -144,7 +154,7 @@ bool wxBitmap::CopyFromIcon( UnRef(); if (!rIcon.Ok()) - return(FALSE); + return(false); return CopyFromIconOrCursor(rIcon); } // end of wxBitmap::CopyFromIcon @@ -185,7 +195,7 @@ wxBitmap::wxBitmap( hPs = ::GpiCreatePS(vHabmain, hDc, &vSize, GPIA_ASSOC | PU_PELS); if (hPs == 0) { - wxLogLastError("GpiCreatePS Failure"); + wxLogLastError(wxT("GpiCreatePS Failure")); } if (nDepth == 1) @@ -193,7 +203,7 @@ wxBitmap::wxBitmap( // // We assume that it is in XBM format which is not quite the same as // the format CreateBitmap() wants because the order of bytes in the - // line is inversed! + // line is reversed! // const size_t nBytesPerLine = (nWidth + 7) / 8; const size_t nPadding = nBytesPerLine % 2; @@ -210,14 +220,14 @@ wxBitmap::wxBitmap( { for (nCols = 0; nCols < nBytesPerLine; nCols++) { - unsigned char ucVal = *pzSrc++; - unsigned char ucReversed = 0; - int nBits; + unsigned char ucVal = *pzSrc++; + unsigned char ucReversed = 0; + int nBits; for (nBits = 0; nBits < 8; nBits++) { ucReversed <<= 1; - ucReversed |= (ucVal & 0x01); + ucReversed = (unsigned char)(ucReversed | (ucVal & 0x01)); ucVal >>= 1; } *pzDst++ = ucReversed; @@ -241,7 +251,7 @@ wxBitmap::wxBitmap( vHeader.cx = (USHORT)nWidth; vHeader.cy = (USHORT)nHeight; vHeader.cPlanes = 1L; - vHeader.cBitCount = nDepth; + vHeader.cBitCount = (USHORT)nDepth; vHeader.usReserved = 0; memset(&vInfo, '\0', 16); @@ -249,13 +259,13 @@ wxBitmap::wxBitmap( vInfo.cx = (USHORT)nWidth; vInfo.cy = (USHORT)nHeight; vInfo.cPlanes = 1L; - vInfo.cBitCount = nDepth; + vInfo.cBitCount = (USHORT)nDepth; HBITMAP hBmp = ::GpiCreateBitmap(hPs, &vHeader, CBM_INIT, (PBYTE)pzData, &vInfo); if (!hBmp) { - wxLogLastError("CreateBitmap"); + wxLogLastError(wxT("CreateBitmap")); } ::GpiDestroyPS(hPs); ::DevCloseDC(hDc); @@ -263,22 +273,8 @@ wxBitmap::wxBitmap( } // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( - int nW -, int nH -, int nD -) -{ - Init(); - m_bFlip = FALSE; - (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 @@ -295,15 +291,15 @@ wxBitmap::wxBitmap( } // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( - const wxString& rFilename -, long lType + int nId +, wxBitmapType lType ) { Init(); - m_bFlip = FALSE; - LoadFile( rFilename - ,(int)lType + LoadFile( nId + ,lType ); + SetId(nId); } // end of wxBitmap::wxBitmap bool wxBitmap::Create( @@ -326,8 +322,6 @@ bool wxBitmap::Create( // Xpms and bitmaps from other images can also be mono's, but only // mono's need help changing their colors with MemDC changes // - if (nD == 1) - m_bIsMono = TRUE; if (nD > 0) { DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; @@ -335,6 +329,8 @@ bool wxBitmap::Create( HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); + if (nD == 1) + m_bIsMono = true; memset(&vHeader, '\0', 16); vHeader.cbFix = 16; vHeader.cx = nW; @@ -369,7 +365,7 @@ bool wxBitmap::Create( vHeader.cx = nW; vHeader.cy = nH; vHeader.cPlanes = 1; - vHeader.cBitCount = lBitCount; + vHeader.cBitCount = (USHORT)lBitCount; hBmp = ::GpiCreateBitmap( hPSScreen ,&vHeader @@ -383,41 +379,42 @@ bool wxBitmap::Create( } SetHBITMAP((WXHBITMAP)hBmp); -#if WXWIN_COMPATIBILITY_2 - GetBitmapData()->m_bOk = hBmp != 0; -#endif // WXWIN_COMPATIBILITY_2 - 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); - *this = wxBitmap(vImg); - return TRUE; -#else - return FALSE; -#endif -} // end of wxBitmap::CreateFromXpm + return true; + } + } +#endif // wxUSE_IMAGE + + return false; +} bool wxBitmap::LoadFile( - const wxString& rFilename -, long lType + int nId +, wxBitmapType lType ) { - HPS hPs = NULLHANDLE; - UnRef(); wxBitmapHandler* pHandler = wxDynamicCast( FindHandler(lType) @@ -429,8 +426,7 @@ bool wxBitmap::LoadFile( m_refData = new wxBitmapRefData; return(pHandler->LoadFile( this - ,rFilename - ,hPs + ,nId ,lType , -1 , -1 @@ -438,20 +434,13 @@ bool wxBitmap::LoadFile( } else { - wxImage vImage; - - if (!vImage.LoadFile(rFilename, lType) || !vImage.Ok() ) - return(FALSE); - - *this = wxBitmap(vImage); - - return(TRUE); + return false; } } // end of wxBitmap::LoadFile bool wxBitmap::Create( - void* pData -, long lType + const void* pData +, wxBitmapType lType , int nWidth , int nHeight , int nDepth @@ -465,10 +454,9 @@ bool wxBitmap::Create( if (!pHandler) { - wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for " - "type %d defined."), lType); + wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %ld defined."), lType); - return(FALSE); + return false; } m_refData = new wxBitmapRefData; @@ -484,7 +472,7 @@ bool wxBitmap::Create( bool wxBitmap::SaveFile( const wxString& rFilename -, int lType +, wxBitmapType lType , const wxPalette* pPalette ) { @@ -506,7 +494,7 @@ bool wxBitmap::SaveFile( wxImage vImage = ConvertToImage(); if (!vImage.Ok()) - return(FALSE); + return false; return(vImage.SaveFile( rFilename ,lType @@ -516,7 +504,7 @@ bool wxBitmap::SaveFile( // ---------------------------------------------------------------------------- -// wxImage-wxBitmap convertion +// wxImage-wxBitmap conversion // ---------------------------------------------------------------------------- bool wxBitmap::CreateFromImage ( @@ -524,9 +512,8 @@ bool wxBitmap::CreateFromImage ( , int nDepth ) { - wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image")); + wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image")); m_refData = new wxBitmapRefData(); - m_bFlip = TRUE; int nSizeLimit = 1024 * 768 * 3; int nWidth = rImage.GetWidth(); @@ -562,9 +549,13 @@ bool wxBitmap::CreateFromImage ( // // Set bitmap parameters // - wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image")); + wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image")); SetWidth(nWidth); SetHeight(nBmpHeight); + if (nDepth == 1) + m_bIsMono = true; + else + m_bIsMono = false; if (nDepth == -1) nDepth = wxDisplayDepth(); SetDepth(nDepth); @@ -601,7 +592,7 @@ bool wxBitmap::CreateFromImage ( if(!pucBits) { wxFAIL_MSG(wxT("could not allocate memory for DIB")); - return FALSE; + return false; } memset(pucBits, '\0', (nBytePerLine * nHeight)); @@ -707,9 +698,9 @@ bool wxBitmap::CreateFromImage ( ,PU_PELS | GPIA_ASSOC ); - POINTL vPoint[4] = { 0, nOrigin, - nWidth, nHeight, - 0, 0, nWidth, nHeight + POINTL vPoint[4] = { {0, nOrigin}, + {nWidth, nHeight}, + {0, 0}, {nWidth, nHeight} }; @@ -770,6 +761,7 @@ bool wxBitmap::CreateFromImage ( // nHeight = nHRemain; vHeader.cy = (DWORD)(nHeight); + vHeader.cbImage = nBytePerLine * nHeight; } ptbits = pucBits; for (int j = 0; j < nHeight; j++) @@ -807,9 +799,9 @@ bool wxBitmap::CreateFromImage ( ,&vSize ,PU_PELS | GPIA_ASSOC ); - POINTL vPoint2[4] = { 0, nOrigin, - nWidth, nHeight, - 0, 0, nWidth, nHeight + POINTL vPoint2[4] = { {0, nOrigin}, + {nWidth, nHeight}, + {0, 0}, {nWidth, nHeight} }; ::GpiBitBlt( hPSScreen ,hPS @@ -840,7 +832,7 @@ bool wxBitmap::CreateFromImage ( ::DevCloseDC(hDCScreen); ::DevCloseDC(hDC); free(pucBits); - return TRUE; + return true; } // end of wxBitmap::CreateFromImage wxImage wxBitmap::ConvertToImage() const @@ -867,12 +859,11 @@ wxImage wxBitmap::ConvertToImage() const BITMAPINFOHEADER2 vDIBh; BITMAPINFO2 vDIBInfo; HPS hPSMem; - HPS hPS; HBITMAP hBitmap; HBITMAP hOldBitmap; DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; SIZEL vSizlPage = {0,0}; - HDC hDCMem; + HDC hDCMem = NULLHANDLE; vImage.Create( nWidth ,nHeight @@ -921,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 { @@ -1056,11 +1050,11 @@ wxImage wxBitmap::ConvertToImage() const ,ucGreen ,ucBlue ); - vImage.SetMask(TRUE); + vImage.SetMask(true); } else { - vImage.SetMask(FALSE); + vImage.SetMask(false); } // @@ -1100,9 +1094,9 @@ wxBitmap wxBitmap::GetSubBitmap( 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, 0, rRect.width, rRect.height, - rRect.x, rRect.y, - rRect.x + rRect.width, rRect.y + rRect.height + POINTL vPoint[4] = { {0, 0}, {rRect.width, rRect.height}, + {rRect.x, rRect.y}, + {rRect.x + rRect.width, rRect.y + rRect.height} }; ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP()); @@ -1175,17 +1169,6 @@ void wxBitmap::SetQuality( GetBitmapData()->m_nQuality = nQ; } // end of wxBitmap::SetQuality -#if WXWIN_COMPATIBILITY_2 -void wxBitmap::SetOk( - bool bOk -) -{ - EnsureHasData(); - - GetBitmapData()->m_bOk = bOk; -} // end of wxBitmap::SetOk -#endif // WXWIN_COMPATIBILITY_2 - void wxBitmap::SetPalette( const wxPalette& rPalette ) @@ -1204,9 +1187,7 @@ void wxBitmap::SetMask( GetBitmapData()->m_pBitmapMask = pMask; } // end of wxBitmap::SetMask -wxBitmap wxBitmap::GetBitmapForDC( - wxDC& rDc -) const +wxBitmap wxBitmap::GetBitmapForDC(wxDC& WXUNUSED(rDc)) const { return(*this); } // end of wxBitmap::GetBitmapForDC @@ -1220,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( @@ -1273,8 +1259,8 @@ bool wxMask::Create( 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 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(), - 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight() + POINTL vPoint[4] = { {0 ,0}, {rBitmap.GetWidth(), rBitmap.GetHeight()}, + {0, 0}, {rBitmap.GetWidth(), rBitmap.GetHeight()} }; if (m_hMaskBitmap) @@ -1284,7 +1270,7 @@ bool wxMask::Create( } if (!rBitmap.Ok() || rBitmap.GetDepth() != 1) { - return(FALSE); + return false; } memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2)); @@ -1315,7 +1301,7 @@ bool wxMask::Create( ::GpiDestroyPS(hPSDst); ::DevCloseDC(hDCSrc); ::DevCloseDC(hDCDst); - return(TRUE); + return true; } // end of wxMask::Create // Create a mask from a bitmap and a palette index indicating @@ -1352,7 +1338,7 @@ bool wxMask::Create( )); } } - return(FALSE); + return false; } // end of wxMask::Create // Create a mask from a bitmap and a colour indicating @@ -1362,7 +1348,7 @@ bool wxMask::Create( , const wxColour& rColour ) { - bool bOk = TRUE; + bool bOk = true; COLORREF vMaskColour = OS2RGB( rColour.Red() ,rColour.Green() ,rColour.Blue() @@ -1374,9 +1360,6 @@ bool wxMask::Create( 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 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(), - 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight() - }; if (m_hMaskBitmap) { @@ -1385,7 +1368,7 @@ bool wxMask::Create( } if (!rBitmap.Ok()) { - return(FALSE); + return false; } // @@ -1426,7 +1409,7 @@ bool wxMask::Create( // // Doesn't make sense to continue // - bOk = FALSE; + bOk = false; break; } @@ -1448,39 +1431,37 @@ bool wxMask::Create( ::GpiDestroyPS(hPSDst); ::DevCloseDC(hDCSrc); ::DevCloseDC(hDCDst); - return(TRUE); + return true; } // end of wxMask::Create // ---------------------------------------------------------------------------- // wxBitmapHandler // ---------------------------------------------------------------------------- -bool wxBitmapHandler::Create( - wxGDIImage* pImage -, void* pData -, long lFlags -, int nWidth -, int nHeight -, int nDepth -) +bool wxBitmapHandler::Create( wxGDIImage* pImage, + const void* pData, + wxBitmapType lType, + int nWidth, + int nHeight, + int nDepth) { - wxBitmap* pBitmap = wxDynamicCast( pImage - ,wxBitmap - ); + wxBitmap* pBitmap = wxDynamicCast( pImage + ,wxBitmap + ); return(pBitmap ? Create( pBitmap ,pData + ,lType ,nWidth ,nHeight ,nDepth - ) : FALSE); + ) : false); } bool wxBitmapHandler::Load( wxGDIImage* pImage -, const wxString& rName -, HPS hPs -, long lFlags +, int nId +, wxBitmapType lFlags , int nWidth , int nHeight ) @@ -1490,19 +1471,18 @@ bool wxBitmapHandler::Load( ); return(pBitmap ? LoadFile( pBitmap - ,rName - ,hPs + ,nId ,lFlags ,nWidth ,nHeight - ) : FALSE); + ) : false); } bool wxBitmapHandler::Save( - wxGDIImage* pImage + const wxGDIImage* pImage , const wxString& rName -, int lType -) +, wxBitmapType lType +) const { wxBitmap* pBitmap = wxDynamicCast( pImage ,wxBitmap @@ -1511,41 +1491,51 @@ bool wxBitmapHandler::Save( return(pBitmap ? SaveFile( pBitmap ,rName ,lType - ) : FALSE); + ) : false); } 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) ) { - return(FALSE); + return false; +} + +bool wxBitmapHandler::LoadFile( + wxBitmap* WXUNUSED(pBitmap) +, int WXUNUSED(nId) +, wxBitmapType WXUNUSED(lType) +, int WXUNUSED(nDesiredWidth) +, int WXUNUSED(nDesiredHeight) +) +{ + return false; } bool wxBitmapHandler::LoadFile( wxBitmap* WXUNUSED(pBitmap) , const wxString& WXUNUSED(rName) -, HPS WXUNUSED(hPs) -, long WXUNUSED(lType) +, wxBitmapType WXUNUSED(lType) , int WXUNUSED(nDesiredWidth) , int WXUNUSED(nDesiredHeight) ) { - return(FALSE); + return false; } bool wxBitmapHandler::SaveFile( wxBitmap* WXUNUSED(pBitmap) , const wxString& WXUNUSED(rName) -, int WXUNUSED(nType) +, wxBitmapType WXUNUSED(nType) , const wxPalette* WXUNUSED(pPalette) -) +) const { - return(FALSE); + return false; } // ---------------------------------------------------------------------------- @@ -1559,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 @@ -1582,8 +1572,8 @@ HBITMAP wxInvertMask( 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 ,0, nWidth, nHeight, - 0, 0, nWidth, nHeight + POINTL vPoint[4] = { {0 ,0}, {nWidth, nHeight}, + {0, 0}, {nWidth, nHeight} }; memset(&vBmih, '\0', 16); @@ -1619,3 +1609,83 @@ 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