X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23122f8c57a180513a1f750a255ecdac2f61b1a3..08a15c0d899daad0ff8cc2ed4c06ff78b8ec3cc3:/src/os2/dcmemory.cpp diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp index d9d6a2201f..71f06468ae 100644 --- a/src/os2/dcmemory.cpp +++ b/src/os2/dcmemory.cpp @@ -14,6 +14,8 @@ #ifndef WX_PRECOMP #include "wx/utils.h" +#include "wx/app.h" +#include "wx/log.h" #endif #include "wx/os2/private.h" @@ -28,59 +30,47 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC) wxMemoryDC::wxMemoryDC(void) { - HDC hDC; - HPS hPS; - DEVOPENSTRUC vDOP = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - SIZEL vSize = {0, 0}; - - // - // Create a memory device context - // - hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, NULLHANDLE); - if (hDC != DEV_ERROR) - { - hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - if (hPS != GPI_ERROR) - { - m_hPS = hPS; - m_hDC = hDC; - m_ok = TRUE; - m_bOwnsDC = TRUE; - SetBrush(*wxWHITE_BRUSH); - SetPen(*wxBLACK_PEN); - } - else - { - m_hPS = NULLHANDLE; - m_hDC = NULLHANDLE; - m_ok = FALSE; - m_bOwnsDC = FALSE; - } - } - else - { - m_hPS = NULLHANDLE; - m_hDC = NULLHANDLE; - m_ok = FALSE; - m_bOwnsDC = FALSE; - } + CreateCompatible(NULL); + Init(); } // end of wxMemoryDC::wxMemoryDC wxMemoryDC::wxMemoryDC( wxDC* pOldDC ) +{ + pOldDC->BeginDrawing(); + CreateCompatible(pOldDC); + pOldDC->EndDrawing(); + Init(); +} // end of wxMemoryDC::wxMemoryDC + +void wxMemoryDC::Init() +{ + if (m_ok) + { + SetBrush(*wxWHITE_BRUSH); + SetPen(*wxBLACK_PEN); + + // the background mode is only used for text background and is set in + // DrawText() to OPAQUE as required, otherwise always TRANSPARENT + ::GpiSetBackMix( GetHPS(), BM_LEAVEALONE ); + } + memset(&m_vRclPaint, 0, sizeof(m_vRclPaint)); +} // end of wxMemoryDC::Init + +bool wxMemoryDC::CreateCompatible( + wxDC* pDC +) { HDC hDC; HPS hPS; DEVOPENSTRUC vDOP = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; SIZEL vSize = {0, 0}; - pOldDC->BeginDrawing(); - // // Create a memory device context // - hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, GetHdcOf(*pOldDC)); + hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, NULLHANDLE); if (hDC != DEV_ERROR) { hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); @@ -90,13 +80,26 @@ wxMemoryDC::wxMemoryDC( m_hDC = hDC; m_ok = TRUE; m_bOwnsDC = TRUE; - pOldDC->EndDrawing(); - SetBrush(*wxWHITE_BRUSH); - SetPen(*wxBLACK_PEN); + // + // Set the wxWindows color table + // + ::GpiCreateLogColorTable( m_hPS + ,0L + ,LCOLF_CONSECRGB + ,0L + ,(LONG)wxTheColourDatabase->m_nSize + ,(PLONG)wxTheColourDatabase->m_palTable + ); + ::GpiCreateLogColorTable( m_hPS + ,0L + ,LCOLF_RGB + ,0L + ,0L + ,NULL + ); } else { - pOldDC->EndDrawing(); m_hPS = NULLHANDLE; m_hDC = NULLHANDLE; m_ok = FALSE; @@ -105,21 +108,19 @@ wxMemoryDC::wxMemoryDC( } else { - pOldDC->EndDrawing(); m_hPS = NULLHANDLE; m_hDC = NULLHANDLE; m_ok = FALSE; m_bOwnsDC = FALSE; } -} // end of wxMemoryDC::wxMemoryDC -wxMemoryDC::~wxMemoryDC() -{ - if (m_hPS != NULLHANDLE) - ::GpiDestroyPS(m_hPS); - if (m_hDC != NULLHANDLE) - ::DevCloseDC(m_hDC); -} // end of wxMemoryDC::~wxMemoryDC + // + // As we created the DC, we must delete it in the dtor + // + m_bOwnsDC = TRUE; + m_ok = m_hDC != 0; + return m_ok; +} // end of wxMemoryDC::CreateCompatible void wxMemoryDC::SelectObject( const wxBitmap& rBitmap @@ -147,7 +148,7 @@ void wxMemoryDC::SelectObject( m_vSelectedBitmap = rBitmap; - WXHBITMAP hBmp = m_vSelectedBitmap.GetHBITMAP(); + WXHBITMAP hBmp = rBitmap.GetHBITMAP(); if (!hBmp) return; @@ -155,7 +156,7 @@ void wxMemoryDC::SelectObject( m_vSelectedBitmap.SetSelectedInto(this); hBmp = (WXHBITMAP)::GpiSetBitmap(m_hPS, (HBITMAP)hBmp); - if (hBmp != HBM_ERROR) + if (hBmp == HBM_ERROR) { wxLogLastError(wxT("SelectObject(memDC, bitmap)")); wxFAIL_MSG(wxT("Couldn't select a bitmap into wxMemoryDC")); @@ -181,4 +182,168 @@ void wxMemoryDC::DoGetSize( *pHeight = m_vSelectedBitmap.GetHeight(); } // end of wxMemoryDC::DoGetSize +void wxMemoryDC::DoDrawRectangle( + wxCoord vX +, wxCoord vY +, wxCoord vWidth +, wxCoord vHeight +) +{ + wxDC::DoDrawRectangle(vX, vY, vWidth, vHeight); + + // + // Debug testing: + // + if (m_vSelectedBitmap.GetHBITMAP() != NULLHANDLE) + { + BITMAPINFOHEADER2 vHeader; + BITMAPINFO2 vInfo; + + vHeader.cbFix = 16L; + if (::GpiQueryBitmapInfoHeader(m_vSelectedBitmap.GetHBITMAP(), &vHeader)) + { + unsigned char* pucData = NULL; + unsigned char* pucBits; + int nBytesPerLine = m_vSelectedBitmap.GetWidth() * 3; + LONG lScans = 0L; + POINTL vPoint; + LONG lColor; + LONG alFormats[24]; // Max formats OS/2 PM supports + ULONG ulBitcount; + + ::GpiQueryDeviceBitmapFormats(m_hPS, 24, alFormats); + ulBitcount = alFormats[1]; // the best one for the device + if (ulBitcount > 24) + ulBitcount = 24; // MAX bits supported by PM + vInfo.cbFix = 16; + vInfo.cx = vHeader.cx; + vInfo.cy = vHeader.cy; + vInfo.cPlanes = vHeader.cPlanes; + vInfo.cBitCount = ulBitcount; + pucData = (unsigned char*)malloc(nBytesPerLine * m_vSelectedBitmap.GetHeight()); + if ((lScans = ::GpiQueryBitmapBits( m_hPS + ,0L + ,(LONG)m_vSelectedBitmap.GetHeight() + ,(PBYTE)pucData + ,&vInfo + )) == GPI_ALTERROR) + { + ERRORID vError; + wxString sError; + + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + pucBits = pucData; + for (int i = 0; i < m_vSelectedBitmap.GetHeight(); i++) + { + for (int j = 0; j < m_vSelectedBitmap.GetWidth(); j++) + { + vPoint.x = j; vPoint.y = i; + lColor = ::GpiQueryPel(m_hPS, &vPoint); + *(pucBits++) = (unsigned char)lColor; + *(pucBits++) = (unsigned char)(lColor >> 8); + *(pucBits++) = (unsigned char)(lColor >> 16); + } + } + if ((lScans = ::GpiSetBitmapBits( m_hPS + ,0 + ,(LONG)m_vSelectedBitmap.GetHeight() + ,(PBYTE)pucData + ,&vInfo + )) == GPI_ALTERROR) + { + ERRORID vError; + wxString sError; + + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + free(pucData); + } + } +} // end of wxMemoryDC::DoDrawRectangle + +void wxMemoryDC::DoDrawRoundedRectangle( + wxCoord vX +, wxCoord vY +, wxCoord vWidth +, wxCoord vHeight +, double dRadius +) +{ + wxDC::DoDrawRoundedRectangle(vX, vY, vWidth, vHeight, dRadius); + + // + // Debug testing: + // + if (m_vSelectedBitmap.GetHBITMAP() != NULLHANDLE) + { + BITMAPINFOHEADER2 vHeader; + BITMAPINFO2 vInfo; + + vHeader.cbFix = 16L; + if (::GpiQueryBitmapInfoHeader(m_vSelectedBitmap.GetHBITMAP(), &vHeader)) + { + unsigned char* pucData = NULL; + unsigned char* pucBits; + int nBytesPerLine = m_vSelectedBitmap.GetWidth() * 3; + LONG lScans = 0L; + POINTL vPoint; + LONG lColor; + LONG alFormats[24]; // Max formats OS/2 PM supports + ULONG ulBitcount; + + ::GpiQueryDeviceBitmapFormats(m_hPS, 24, alFormats); + ulBitcount = alFormats[1]; // the best one for the device + if (ulBitcount > 24) + ulBitcount = 24; // MAX bits supported by PM + vInfo.cbFix = 16; + vInfo.cx = vHeader.cx; + vInfo.cy = vHeader.cy; + vInfo.cPlanes = vHeader.cPlanes; + vInfo.cBitCount = ulBitcount; + pucData = (unsigned char*)malloc(nBytesPerLine * m_vSelectedBitmap.GetHeight()); + if ((lScans = ::GpiQueryBitmapBits( m_hPS + ,0L + ,(LONG)m_vSelectedBitmap.GetHeight() + ,(PBYTE)pucData + ,&vInfo + )) == GPI_ALTERROR) + { + ERRORID vError; + wxString sError; + + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + pucBits = pucData; + for (int i = 0; i < m_vSelectedBitmap.GetHeight(); i++) + { + for (int j = 0; j < m_vSelectedBitmap.GetWidth(); j++) + { + vPoint.x = j; vPoint.y = i; + lColor = ::GpiQueryPel(m_hPS, &vPoint); + *(pucBits++) = (unsigned char)lColor; + *(pucBits++) = (unsigned char)(lColor >> 8); + *(pucBits++) = (unsigned char)(lColor >> 16); + } + } + if ((lScans = ::GpiSetBitmapBits( m_hPS + ,0 + ,(LONG)m_vSelectedBitmap.GetHeight() + ,(PBYTE)pucData + ,&vInfo + )) == GPI_ALTERROR) + { + ERRORID vError; + wxString sError; + + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + free(pucData); + } + } +} // end of wxMemoryDC::DoDrawRectangle