// 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, wxWindowDC)
// ----------------------------------------------------------------------------
// global variables
// 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__
// ===========================================================================
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") );
+
+ m_canvas = canvas;
+ m_hDC = (WXHDC) ::GetWindowDC(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();
}
-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));
}
// ----------------------------------------------------------------------------
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") );
- SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));
-}
+ m_canvas = canvas;
+ m_hDC = (WXHDC)::GetDC(GetHwndOf(m_canvas));
-wxClientDC::~wxClientDC()
-{
- if ( m_canvas && GetHdc() )
- {
- SelectOldObjects(m_hDC);
+ // m_bOwnsDC was already set to false in the base class ctor, so the DC
+ // will be released (and not deleted) in ~wxDC
- ::ReleaseDC(GetWinHwnd(m_canvas), GetHdc());
- m_hDC = 0;
- }
+ InitDC();
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// 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.
//
// 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 realyl want to allow it, add a
+// 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.
wxPaintDC::wxPaintDC()
{
m_canvas = NULL;
- m_hDC = 0;
}
wxPaintDC::wxPaintDC(wxWindow *canvas)
{
- wxCHECK_RET( canvas, "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;
}
}
else // not in cache, create a new one
{
- m_hDC = (WXHDC)::BeginPaint(GetWinHwnd(m_canvas), &g_paintStruct);
+ m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct);
ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
}
- SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));
+ 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);
+
+ // 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;
}
}
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;
+}
+
projects / wxWidgets.git / blobdiff