X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/837e57436a89516a5fa9f478f401e06bd872c17c..a111f2b216a90bacb254644d3cae526eddc9f9f1:/src/msw/dcclient.cpp diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp index 3f6a4be196..d853cf580e 100644 --- a/src/msw/dcclient.cpp +++ b/src/msw/dcclient.cpp @@ -62,11 +62,9 @@ WX_DEFINE_OBJARRAY(wxArrayDCInfo); // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) - IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) - IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) +IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) +IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC) // ---------------------------------------------------------------------------- // global variables @@ -79,7 +77,7 @@ static PAINTSTRUCT g_paintStruct; // created in resopnse to WM_PAINT message - doing this from elsewhere is a // common programming error among wxWindows programmers and might lead to // very subtle and difficult to debug refresh/repaint bugs. - bool g_isPainting = FALSE; + int g_isPainting = 0; #endif // __WXDEBUG__ // =========================================================================== @@ -92,29 +90,29 @@ static PAINTSTRUCT g_paintStruct; wxWindowDC::wxWindowDC() { - m_canvas = NULL; + m_canvas = NULL; } -wxWindowDC::wxWindowDC(wxWindow *the_canvas) +wxWindowDC::wxWindowDC(wxWindow *canvas) { - m_canvas = the_canvas; - m_hDC = (WXHDC) ::GetWindowDC(GetWinHwnd(the_canvas) ); - m_hDCCount++; + wxCHECK_RET( canvas, _T("invalid window in wxWindowDC") ); - SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID)); + m_canvas = canvas; + m_hDC = (WXHDC) ::GetWindowDC(GetHwndOf(m_canvas)); + + // m_bOwnsDC was already set to false in the base class ctor, so the DC + // will be released (and not deleted) in ~wxDC + InitDC(); } -wxWindowDC::~wxWindowDC() +void wxWindowDC::InitDC() { - if (m_canvas && m_hDC) - { - SelectOldObjects(m_hDC); - - ::ReleaseDC(GetWinHwnd(m_canvas), GetHdc()); - m_hDC = 0; - } + // the background mode is only used for text background and is set in + // DrawText() to OPAQUE as required, otherwise always TRANSPARENT, + ::SetBkMode(GetHdc(), TRANSPARENT); - m_hDCCount--; + // default bg colour is pne of the window + SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID)); } // ---------------------------------------------------------------------------- @@ -123,26 +121,43 @@ wxWindowDC::~wxWindowDC() wxClientDC::wxClientDC() { - m_canvas = NULL; + m_canvas = NULL; } -wxClientDC::wxClientDC(wxWindow *the_canvas) +wxClientDC::wxClientDC(wxWindow *canvas) { - m_canvas = the_canvas; - m_hDC = (WXHDC) ::GetDC(GetWinHwnd(the_canvas)); + wxCHECK_RET( canvas, _T("invalid window in wxClientDC") ); + + m_canvas = canvas; + m_hDC = (WXHDC)::GetDC(GetHwndOf(m_canvas)); - SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID)); + // m_bOwnsDC was already set to false in the base class ctor, so the DC + // will be released (and not deleted) in ~wxDC + + InitDC(); } -wxClientDC::~wxClientDC() +void wxClientDC::InitDC() { - if ( m_canvas && GetHdc() ) - { - SelectOldObjects(m_hDC); + wxWindowDC::InitDC(); + + // in wxUniv build we must manually do some DC adjustments usually + // performed by Windows for us +#ifdef __WXUNIVERSAL__ + wxPoint ptOrigin = m_canvas->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_canvas->GetClientSize()); +#endif // __WXUNIVERSAL__ +} - ::ReleaseDC(GetWinHwnd(m_canvas), GetHdc()); - m_hDC = 0; - } +wxClientDC::~wxClientDC() +{ } // ---------------------------------------------------------------------------- @@ -150,7 +165,7 @@ wxClientDC::~wxClientDC() // ---------------------------------------------------------------------------- // VZ: initial implementation (by JACS) only remembered the last wxPaintDC -// created and tried to reuse - this was supposed to take care of a +// created and tried to reuse it - 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. // @@ -170,17 +185,16 @@ wxArrayDCInfo wxPaintDC::ms_cache; wxPaintDC::wxPaintDC() { m_canvas = NULL; - m_hDC = 0; } wxPaintDC::wxPaintDC(wxWindow *canvas) { - wxCHECK_RET( canvas, _T("NULL canvas in wxPaintDC ctor") ); + wxCHECK_RET( canvas, wxT("NULL canvas in wxPaintDC ctor") ); #ifdef __WXDEBUG__ - if ( !g_isPainting ) + if ( g_isPainting <= 0 ) { - wxFAIL_MSG( _T("wxPaintDC may be created only in EVT_PAINT handler!") ); + wxFAIL_MSG( wxT("wxPaintDC may be created only in EVT_PAINT handler!") ); return; } @@ -197,29 +211,43 @@ wxPaintDC::wxPaintDC(wxWindow *canvas) } else // not in cache, create a new one { - m_hDC = (WXHDC)::BeginPaint(GetWinHwnd(m_canvas), &g_paintStruct); - ms_cache.Add(new wxPaintDCInfo(m_canvas, this)); + m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct); + if (m_hDC) + ms_cache.Add(new wxPaintDCInfo(m_canvas, this)); } - SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID)); + // (re)set the DC parameters. + // Note: at this point m_hDC can be NULL under MicroWindows, when dragging. + if (GetHDC()) + InitDC(); } wxPaintDC::~wxPaintDC() { if ( m_hDC ) { + SelectOldObjects(m_hDC); + size_t index; wxPaintDCInfo *info = FindInCache(&index); - wxCHECK_RET( info, _T("existing DC should have a cache entry") ); + wxCHECK_RET( info, wxT("existing DC should have a cache entry") ); if ( !--info->count ) { - ::EndPaint(GetWinHwnd(m_canvas), &g_paintStruct); + ::EndPaint(GetHwndOf(m_canvas), &g_paintStruct); - ms_cache.Remove(index); + ms_cache.RemoveAt(index); + + // Reduce the number of bogus reports of non-freed memory + // at app exit + if (ms_cache.IsEmpty()) + ms_cache.Clear(); } //else: cached DC entry is still in use + + // prevent the base class dtor from ReleaseDC()ing it again + m_hDC = 0; } } @@ -240,3 +268,20 @@ wxPaintDCInfo *wxPaintDC::FindInCache(size_t *index) const return info; } + +// find the entry for this DC in the cache (keyed by the window) +WXHDC wxPaintDC::FindDCInCache(wxWindow* win) +{ + wxPaintDCInfo *info = NULL; + size_t nCache = ms_cache.GetCount(); + for ( size_t n = 0; n < nCache; n++ ) + { + info = &ms_cache[n]; + if ( info->hwnd == win->GetHWND() ) + { + return info->hdc; + } + } + return 0; +} +