X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85833f5c6c5c136d16ccd01c90cc243d5d025e0a..4b5d9823ec8c849bcd51e3b15ba78f656e54493e:/src/msw/dcclient.cpp

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 75fe09b4c1..b6b44efe1b 100644
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -79,7 +79,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__
 
 // ===========================================================================
@@ -110,7 +110,11 @@ wxWindowDC::~wxWindowDC()
   {
     SelectOldObjects(m_hDC);
 
-    ::ReleaseDC(GetWinHwnd(m_canvas), GetHdc());
+    if ( !::ReleaseDC(GetWinHwnd(m_canvas), GetHdc()) )
+    {
+        wxLogLastError("ReleaseDC");
+    }
+
     m_hDC = 0;
   }
 
@@ -175,10 +179,10 @@ wxPaintDC::wxPaintDC()
 
 wxPaintDC::wxPaintDC(wxWindow *canvas)
 {
-    wxCHECK_RET( canvas, "NULL canvas in wxPaintDC ctor" );
+    wxCHECK_RET( canvas, _T("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!") );
 
@@ -208,6 +212,8 @@ wxPaintDC::~wxPaintDC()
 {
     if ( m_hDC )
     {
+        SelectOldObjects(m_hDC);
+
         size_t index;
         wxPaintDCInfo *info = FindInCache(&index);
 
@@ -220,6 +226,9 @@ wxPaintDC::~wxPaintDC()
             ms_cache.Remove(index);
         }
         //else: cached DC entry is still in use
+
+        // prevent the base class dtor from ReleaseDC()ing it again
+        m_hDC = 0;
     }
 }