correction to maintain data array in synch with string array

[wxWidgets.git] / src / msw / dcclient.cpp

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index d76f002aba464285509b2720a347707e0a854200..46642e078fc4fc2421bd5e08d049f2409669e7f0 100644 (file)
--- 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
 
 // ----------------------------------------------------------------------------
 // global variables
@@ -112,7 +110,7 @@ wxWindowDC::~wxWindowDC()
 
     if ( !::ReleaseDC(GetWinHwnd(m_canvas), GetHdc()) )
     {
-        wxLogLastError("ReleaseDC");
+        wxLogLastError(wxT("ReleaseDC"));
     }
 
     m_hDC = 0;
@@ -184,12 +182,12 @@ wxPaintDC::wxPaintDC()
 
 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 <= 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;
     }
@@ -227,13 +225,18 @@ wxPaintDC::~wxPaintDC()
         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);
 
             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
 
@@ -259,3 +262,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;
+}
+