no message

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

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 75fe09b4c1694049f1dcfe569b40070e11583325..ca1caadb274323696f5e0b35c198f225656feb17 100644 (file)
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -62,11 +62,9 @@ WX_DEFINE_OBJARRAY(wxArrayDCInfo);
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
     IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
     IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
     IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
     IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
     IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)

-#endif

 
 // ----------------------------------------------------------------------------
 // global variables
 
 // ----------------------------------------------------------------------------
 // global variables


@@ -79,7 +77,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.

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

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


@@ -110,7 +108,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;
   }
 


@@ -131,6 +133,11 @@ wxClientDC::wxClientDC(wxWindow *the_canvas)
   m_canvas = the_canvas;
   m_hDC = (WXHDC) ::GetDC(GetWinHwnd(the_canvas));
 
   m_canvas = the_canvas;
   m_hDC = (WXHDC) ::GetDC(GetWinHwnd(the_canvas));
 

+  // the background mode is only used for text background
+  // and is set in DrawText() to OPAQUE as required, other-
+  // wise always TRANSPARENT, RR
+  ::SetBkMode( GetHdc(), TRANSPARENT );
+

   SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));
 }
 
   SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));
 }
 


@@ -175,12 +182,12 @@ wxPaintDC::wxPaintDC()
 
 wxPaintDC::wxPaintDC(wxWindow *canvas)
 {
 
 wxPaintDC::wxPaintDC(wxWindow *canvas)
 {

-    wxCHECK_RET( canvas, "NULL canvas in wxPaintDC ctor" );
+    wxCHECK_RET( canvas, wxT("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( wxT("wxPaintDC may be created only in EVT_PAINT handler!") );

 
         return;
     }
 
         return;
     }


@@ -201,6 +208,11 @@ wxPaintDC::wxPaintDC(wxWindow *canvas)
         ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
     }
 
         ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
     }
 

+    // the background mode is only used for text background
+    // and is set in DrawText() to OPAQUE as required, other-
+    // wise always TRANSPARENT, RR
+    ::SetBkMode( GetHdc(), TRANSPARENT );
+

     SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));
 }
 
     SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));
 }
 


@@ -208,18 +220,28 @@ 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);
 

-        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);
 
         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
         }
         //else: cached DC entry is still in use

+
+        // prevent the base class dtor from ReleaseDC()ing it again
+        m_hDC = 0;

     }
 }
 
     }
 }