X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1159a76f9c57ad1254d887722689ed9d0d01d6c4..622be94c78deeae8490d9783c11a24c599ae1464:/src/os2/dcmemory.cpp diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp index d303b5aa02..a6af12eb90 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,88 +30,46 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC) wxMemoryDC::wxMemoryDC(void) { - ERRORID vError; - wxString sError; - 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); - if (!::GpiCreateLogColorTable( m_hPS - ,0L - ,LCOLF_CONSECRGB - ,0L - ,(LONG)wxTheColourDatabase->m_nSize - ,(PLONG)wxTheColourDatabase->m_palTable - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError("Unable to set current color table. Error: %s\n", sError); - } - // - // Set the color table to RGB mode - // - if (!::GpiCreateLogColorTable( m_hPS - ,0L - ,LCOLF_RGB - ,0L - ,0L - ,NULL - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError("Unable to set current color table. Error: %s\n", sError); - } - } - 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 ); + } +} // 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); @@ -119,13 +79,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; @@ -134,22 +107,19 @@ wxMemoryDC::wxMemoryDC( } else { - pOldDC->EndDrawing(); m_hPS = NULLHANDLE; m_hDC = NULLHANDLE; m_ok = FALSE; m_bOwnsDC = FALSE; } -} // end of wxMemoryDC::wxMemoryDC -wxMemoryDC::~wxMemoryDC() -{ - m_vSelectedBitmap.SetSelectedInto(NULL); - 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 @@ -211,4 +181,12 @@ 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); +} // end of wxMemoryDC::DoDrawRectangle