Replaced /'s with \'s as BCC requires \'s for path names

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

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 440e8290b98ada724daf4d6f3360b909370fcdae..d853cf580eafd5a10763882121c4b132161c9818 100644 (file)
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -212,11 +212,14 @@ wxPaintDC::wxPaintDC(wxWindow *canvas)
     else // not in cache, create a new one
     {
         m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct);
     else // not in cache, create a new one
     {
         m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct);

-        ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
+       if (m_hDC)
+            ms_cache.Add(new wxPaintDCInfo(m_canvas, this));

     }
 
     }
 

-    // (re)set the DC parameters
-    InitDC();
+    // (re)set the DC parameters.
+    // Note: at this point m_hDC can be NULL under MicroWindows, when dragging.
+    if (GetHDC())
+        InitDC();

 }
 
 wxPaintDC::~wxPaintDC()
 }
 
 wxPaintDC::~wxPaintDC()


@@ -234,7 +237,7 @@ wxPaintDC::~wxPaintDC()
         {
             ::EndPaint(GetHwndOf(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
 
             // Reduce the number of bogus reports of non-freed memory
             // at app exit