X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5afb945835abd3e3e37213e108e79423407213dd..e8508ea8a890c90e6e72b2579780ca2ccbf40270:/src/os2/dcclient.cpp?ds=sidebyside diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp index 1875e60cfb..083b902b3d 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" @@ -96,21 +97,24 @@ wxWindowDC::wxWindowDC( m_pCanvas = pTheCanvas; m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas) ); - 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 - ); + 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 @@ -130,33 +134,56 @@ wxWindowDC::wxWindowDC( ,0L ,NULL ); - SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID)); ::WinQueryWindowRect( GetWinHwnd(m_pCanvas) ,&m_vRclPaint ); -} + InitDC(); +} // end of wxWindowDC::wxWindowDC -wxWindowDC::~wxWindowDC() +void wxWindowDC::InitDC() { - if (m_pCanvas && m_hDC) - { - SelectOldObjects(m_hDC); + wxColour vColor; - // - // 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 - // - if(m_hPS) - { - ::GpiAssociate(m_hPS, NULLHANDLE); - ::GpiDestroyPS(m_hPS); - } - m_hPS = NULLHANDLE; - m_hDC = NULLHANDLE; - } - m_nDCCount--; -} + // + // 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)); + + vColor.InitFromName("BLACK"); + m_pen.SetColour(vColor); + vColor.Set("WHITE"); + m_brush.SetColour(vColor); + InitializePalette(); + wxFont* pFont = new wxFont( 12 + ,wxNORMAL + ,wxNORMAL + ,wxBOLD + ); + SetFont(*pFont); + delete pFont; + // + // OS/2 default vertical character allignment needs to match the other OS's + // + ::GpiSetTextAlignment((HPS)GetHPS(), TA_NORMAL_HORIZ, TA_BOTTOM); + +} // end of wxWindowDC::InitDC + +void wxWindowDC::DoGetSize( + int* pnWidth +, int* pnHeight +) const +{ + wxCHECK_RET( m_pCanvas, _T("wxWindowDC without a window?") ); + m_pCanvas->GetSize( pnWidth + ,pnHeight + ); +} // end of wxWindowDC::DoGetSize // ---------------------------------------------------------------------------- // wxClientDC @@ -208,54 +235,52 @@ wxClientDC::wxClientDC( ,NULL ); // - // Default mode is BM_LEAVEALONE so we make no call Set the mix - // - SetBackground(wxBrush( m_pCanvas->GetBackgroundColour() - ,wxSOLID - ) - ); - // // Set the DC/PS rectangle // ::WinQueryWindowRect( GetWinHwnd(m_pCanvas) ,&m_vRclPaint ); + InitDC(); } // end of wxClientDC::wxClientDC -wxClientDC::~wxClientDC() +void wxClientDC::InitDC() { - if ( m_pCanvas && GetHdc() ) - { - SelectOldObjects(m_hDC); + wxWindowDC::InitDC(); - // - // We don't explicitly release Device contexts in PM and - // the cached micro PS is already gone - // - m_hDC = 0; + // in wxUniv build we must manually do some DC adjustments usually + // performed by Windows for us +#ifdef __WXUNIVERSAL__ + wxPoint ptOrigin = m_pCanvas->GetClientAreaOrigin(); + if ( ptOrigin.x || ptOrigin.y ) + { + // no need to shift DC origin if shift is null + SetDeviceOrigin(ptOrigin.x, ptOrigin.y); } + + // clip the DC to avoid overwriting the non client area + SetClippingRegion(wxPoint(0, 0), m_pCanvas->GetClientSize()); +#endif // __WXUNIVERSAL__ +} // end of wxClientDC::InitDC + +wxClientDC::~wxClientDC() +{ } // end of wxClientDC::~wxClientDC +void wxClientDC::DoGetSize( + int* pnWidth +, int* pnHeight +) const +{ + wxCHECK_RET( m_pCanvas, _T("wxWindowDC without a window?") ); + m_pCanvas->GetClientSize( pnWidth + ,pnHeight + ); +} // end of wxClientDC::DoGetSize + // ---------------------------------------------------------------------------- // 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() @@ -269,7 +294,6 @@ wxPaintDC::wxPaintDC( ) { wxCHECK_RET(pCanvas, wxT("NULL canvas in wxPaintDC ctor")); - RECTL vRect; #ifdef __WXDEBUG__ if (g_isPainting <= 0) @@ -295,16 +319,14 @@ wxPaintDC::wxPaintDC( { HPS hPS; + m_hDC = ::WinOpenWindowDC(GetWinHwnd(m_pCanvas)); hPS = ::WinBeginPaint( GetWinHwnd(m_pCanvas) ,NULLHANDLE ,&g_paintStruct ); if(hPS) { - POINTL vPoint[2]; - LONG lControl; - LONG lColor; - + ::GpiAssociate(hPS, m_hDC); m_hOldPS = m_hPS; m_hPS = hPS; ::GpiCreateLogColorTable( m_hPS @@ -329,11 +351,10 @@ wxPaintDC::wxPaintDC( } m_bIsPaintTime = TRUE; - m_hDC = (WXHDC) -1; // to satisfy those anonizmous efforts ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this)); } - SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID)); -} + InitDC(); +} // end of wxPaintDC::wxPaintDC wxPaintDC::~wxPaintDC() { @@ -351,7 +372,7 @@ wxPaintDC::~wxPaintDC() ::WinEndPaint(m_hPS); m_hPS = m_hOldPS; m_bIsPaintTime = FALSE; - ms_cache.Remove(nIndex); + ms_cache.RemoveAt(nIndex); } //else: cached DC entry is still in use @@ -380,3 +401,22 @@ wxPaintDCInfo* wxPaintDC::FindInCache( 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 +