X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f44fdfb032152a62cc0e3a4c0f09330cfab76710..29149a64916d6fdc53e445adca9ef83bc58fb6c3:/src/os2/dcclient.cpp diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp index af77090fd1..cdb7003da7 100644 --- a/src/os2/dcclient.cpp +++ b/src/os2/dcclient.cpp @@ -23,6 +23,7 @@ #include "wx/string.h" #include "wx/log.h" #include "wx/window.h" +#include "wx/app.h" #include "wx/os2/private.h" @@ -34,17 +35,19 @@ struct WXDLLEXPORT wxPaintDCInfo { - wxPaintDCInfo(wxWindow *win, wxDC *dc) + wxPaintDCInfo( wxWindow* pWin + ,wxDC* pDC + ) { - hwnd = win->GetHWND(); - hdc = dc->GetHDC(); - count = 1; + m_hWnd = pWin->GetHWND(); + m_hDC = pDC->GetHDC(); + m_nCount = 1; } - WXHWND hwnd; // window for this DC - WXHDC hdc; // the DC handle - size_t count; // usage count -}; + WXHWND m_hWnd; // window for this DC + WXHDC m_hDC; // the DC handle + size_t m_nCount; // usage count +}; // end of wxPaintDCInfot #include "wx/arrimpl.cpp" @@ -82,52 +85,80 @@ static RECT g_paintStruct; wxWindowDC::wxWindowDC() { - m_pCanvas = NULL; + m_pCanvas = NULL; } -wxWindowDC::wxWindowDC(wxWindow *the_canvas) +wxWindowDC::wxWindowDC( + wxWindow* pTheCanvas +) { - m_pCanvas = the_canvas; - m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(the_canvas) ); - m_nDCCount++; - // - // default under PM is that Window and Client DC's are the same - // so we offer a separate Presentation Space to use for the - // entire window. Otherwise, calling BeginPaint will just create - // chached-micro client presentation space - // - m_hPS = GpiCreatePS( m_hab - ,m_hDC - ,&m_PageSize - ,PU_PELS | GPIF_LONG | GPIA_ASSOC - ); - ::GpiAssociate(m_hPS, NULLHANDLE); - ::GpiAssociate(m_hPS, m_hDC); - SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID)); -} + ERRORID vError; + wxString sError; -wxWindowDC::~wxWindowDC() -{ - if (m_pCanvas && m_hDC) - { - SelectOldObjects(m_hDC); + m_pCanvas = pTheCanvas; + m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas) ); // - // In PM one does not explicitly close or release an open WindowDC - // They automatically close with the window, unless explicitly detached - // but we need to destroy our PS + // default under PM is that Window and Client DC's are the same + // so we offer a separate Presentation Space to use for the + // entire window. Otherwise, calling BeginPaint will just create + // chached-micro client presentation space // - if(m_hPS) + m_hPS = ::GpiCreatePS( vHabmain + ,m_hDC + ,&m_PageSize + ,PU_PELS | GPIF_LONG | GPIA_ASSOC + ); + ::GpiAssociate(m_hPS, NULLHANDLE); + ::GpiAssociate(m_hPS, m_hDC); + + // + // Set the wxWindows color table + // + if (!::GpiCreateLogColorTable( m_hPS + ,0L + ,LCOLF_CONSECRGB + ,0L + ,(LONG)wxTheColourDatabase->m_nSize + ,(PLONG)wxTheColourDatabase->m_palTable + )) { - ::GpiAssociate(m_hPS, NULLHANDLE); - ::GpiDestroyPS(m_hPS); + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Unable to set current color table. Error: %s\n", sError); } - m_hPS = NULLHANDLE; - m_hDC = NULLHANDLE; - } + ::GpiCreateLogColorTable( m_hPS + ,0L + ,LCOLF_RGB + ,0L + ,0L + ,NULL + ); + ::WinQueryWindowRect( GetWinHwnd(m_pCanvas) + ,&m_vRclPaint + ); + InitDC(); +} // end of wxWindowDC::wxWindowDC + +void wxWindowDC::InitDC() +{ + wxColour vColor; - m_nDCCount--; -} + vColor.InitFromName("BLACK"); + m_pen.SetColour(vColor); + vColor.Set("WHITE"); + m_brush.SetColour(vColor); + // + // 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); + + // + // Default bg colour is pne of the window + // + SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID)); +} // end of wxWindowDC::InitDC // ---------------------------------------------------------------------------- // wxClientDC @@ -135,67 +166,62 @@ wxWindowDC::~wxWindowDC() wxClientDC::wxClientDC() { - m_pCanvas = NULL; + m_pCanvas = NULL; } -wxClientDC::wxClientDC(wxWindow *the_canvas) +wxClientDC::wxClientDC( + wxWindow* pTheCanvas +) { SIZEL vSizl = { 0,0}; + ERRORID vError; + wxString sError; - m_pCanvas = the_canvas; + m_pCanvas = pTheCanvas; // // default under PM is that Window and Client DC's are the same // - m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(the_canvas)); + m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas)); m_hPS = ::GpiCreatePS( wxGetInstance() ,m_hDC ,&vSizl ,PU_PELS | GPIF_LONG | GPIA_ASSOC ); + // Set the wxWindows color table + 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); + } + ::GpiCreateLogColorTable( m_hPS + ,0L + ,LCOLF_RGB + ,0L + ,0L + ,NULL + ); // - // Default mode is BM_LEAVEALONE so we make no call Set the mix + // Set the DC/PS rectangle // - SetBackground(wxBrush( m_pCanvas->GetBackgroundColour() - ,wxSOLID - ) - ); -} - -wxClientDC::~wxClientDC() -{ - if ( m_pCanvas && GetHdc() ) - { - SelectOldObjects(m_hDC); - - // We don't explicitly release Device contexts in PM and - // the cached micro PS is already gone - - m_hDC = 0; - } -} + ::WinQueryWindowRect( GetWinHwnd(m_pCanvas) + ,&m_vRclPaint + ); + InitDC(); +} // end of wxClientDC::wxClientDC // ---------------------------------------------------------------------------- // wxPaintDC // ---------------------------------------------------------------------------- -// VZ: initial implementation (by JACS) only remembered the last wxPaintDC -// created and tried to reuse - this was supposed to take care of a -// situation when a derived class OnPaint() calls base class OnPaint() -// because in this case ::BeginPaint() shouldn't be called second time. -// -// I'm not sure how useful this is, however we must remember the HWND -// associated with the last HDC as well - otherwise we may (and will!) try -// to reuse the HDC for another HWND which is a nice recipe for disaster. -// -// So we store a list of windows for which we already have the DC and not -// just one single hDC. This seems to work, but I'm really not sure about -// the usefullness of the whole idea - IMHO it's much better to not call -// base class OnPaint() at all, or, if we really want to allow it, add a -// "wxPaintDC *" parameter to wxPaintEvent which should be used if it's -// !NULL instead of creating a new DC. - wxArrayDCInfo wxPaintDC::ms_cache; wxPaintDC::wxPaintDC() @@ -227,8 +253,8 @@ wxPaintDC::wxPaintDC( if (pInfo) { - m_hDC = pInfo->hdc; - pInfo->count++; + m_hDC = pInfo->m_hDC; + pInfo->m_nCount++; } else // not in cache, create a new one { @@ -242,14 +268,33 @@ wxPaintDC::wxPaintDC( { m_hOldPS = m_hPS; m_hPS = hPS; + ::GpiCreateLogColorTable( m_hPS + ,0L + ,LCOLF_CONSECRGB + ,0L + ,(LONG)wxTheColourDatabase->m_nSize + ,(PLONG)wxTheColourDatabase->m_palTable + ); + ::GpiCreateLogColorTable( m_hPS + ,0L + ,LCOLF_RGB + ,0L + ,0L + ,NULL + ); + + ::WinFillRect(hPS, &g_paintStruct, m_pCanvas->GetBackgroundColour().GetPixel()); + ::WinQueryWindowRect( GetWinHwnd(m_pCanvas) + ,&m_vRclPaint + ); } + m_bIsPaintTime = TRUE; m_hDC = (WXHDC) -1; // to satisfy those anonizmous efforts - m_vRclPaint = g_paintStruct; ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this)); } - SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID)); -} + InitDC(); +} // end of wxPaintDC::wxPaintDC wxPaintDC::~wxPaintDC() { @@ -257,17 +302,17 @@ wxPaintDC::~wxPaintDC() { SelectOldObjects(m_hDC); - size_t index; - wxPaintDCInfo *info = FindInCache(&index); + size_t nIndex; + wxPaintDCInfo* pInfo = FindInCache(&nIndex); - wxCHECK_RET( info, wxT("existing DC should have a cache entry") ); + wxCHECK_RET( pInfo, wxT("existing DC should have a cache entry") ); - if ( !--info->count ) + if ( !--pInfo->m_nCount ) { ::WinEndPaint(m_hPS); m_hPS = m_hOldPS; m_bIsPaintTime = FALSE; - ms_cache.Remove(index); + ms_cache.Remove(nIndex); } //else: cached DC entry is still in use @@ -276,20 +321,42 @@ wxPaintDC::~wxPaintDC() } } -wxPaintDCInfo *wxPaintDC::FindInCache(size_t *index) const +wxPaintDCInfo* wxPaintDC::FindInCache( + size_t* pIndex +) const { - wxPaintDCInfo *info = NULL; - size_t nCache = ms_cache.GetCount(); - for ( size_t n = 0; n < nCache; n++ ) + wxPaintDCInfo* pInfo = NULL; + size_t nCache = ms_cache.GetCount(); + + for (size_t n = 0; n < nCache; n++) { - info = &ms_cache[n]; - if ( info->hwnd == m_pCanvas->GetHWND() ) + pInfo = &ms_cache[n]; + if (pInfo->m_hWnd == m_pCanvas->GetHWND()) { - if ( index ) - *index = n; + if (pIndex) + *pIndex = n; break; } } + return pInfo; +} // end of wxPaintDC::FindInCache + +// find the entry for this DC in the cache (keyed by the window) +WXHDC wxPaintDC::FindDCInCache( + wxWindow* pWin +) +{ + wxPaintDCInfo* pInfo = NULL; + size_t nCache = ms_cache.GetCount(); + + for (size_t n = 0; n < nCache; n++) + { + pInfo = &ms_cache[n]; + if (pInfo->m_hWnd == pWin->GetHWND()) + { + return pInfo->m_hDC; + } + } + return 0; +} // end of wxPaintDC::FindInCache - return info; -}