better wxGetUserId/Name

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

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 9a347c6911a99355cc9b3ae8506ebe998f95c988..b6b44efe1bbaed62fe0820e143e97a3e66f8ba09 100644 (file)
--- 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.
     // 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.

-    extern bool g_isPainting = FALSE;
+    int g_isPainting = 0;

 #endif // __WXDEBUG__
 
 // ===========================================================================
 #endif // __WXDEBUG__
 
 // ===========================================================================


@@ -110,7 +110,11 @@ wxWindowDC::~wxWindowDC()
   {
     SelectOldObjects(m_hDC);
 
   {
     SelectOldObjects(m_hDC);
 

-    ::ReleaseDC(GetWinHwnd(m_canvas), GetHdc());
+    if ( !::ReleaseDC(GetWinHwnd(m_canvas), GetHdc()) )
+    {
+        wxLogLastError("ReleaseDC");
+    }
+

     m_hDC = 0;
   }
 
     m_hDC = 0;
   }
 


@@ -161,7 +165,7 @@ wxClientDC::~wxClientDC()
 //     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
 //     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 *" parameter to wxPaintEvent which should be used if it's
 //     !NULL instead of creating a new DC.
 


@@ -175,10 +179,10 @@ wxPaintDC::wxPaintDC()
 
 wxPaintDC::wxPaintDC(wxWindow *canvas)
 {
 
 wxPaintDC::wxPaintDC(wxWindow *canvas)
 {

-    wxCHECK_RET( canvas, "NULL canvas in wxPaintDC ctor" );
+    wxCHECK_RET( canvas, _T("NULL canvas in wxPaintDC ctor") );

 
 #ifdef __WXDEBUG__
 
 #ifdef __WXDEBUG__

-    if ( !g_isPainting )
+    if ( g_isPainting <= 0 )

     {
         wxFAIL_MSG( _T("wxPaintDC may be created only in EVT_PAINT handler!") );
 
     {
         wxFAIL_MSG( _T("wxPaintDC may be created only in EVT_PAINT handler!") );
 


@@ -208,6 +212,8 @@ wxPaintDC::~wxPaintDC()
 {
     if ( m_hDC )
     {
 {
     if ( m_hDC )
     {

+        SelectOldObjects(m_hDC);
+

         size_t index;
         wxPaintDCInfo *info = FindInCache(&index);
 
         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
             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;

     }
 }
 
     }
 }