wxUniversal fix.

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

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 1cee9d8212d28daef8553011f74bbb334effaed4..0f8ac848766b478deecf34b787ac25a534217c16 100644 (file)
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dcclient.h"
 #endif
 
     #pragma implementation "dcclient.h"
 #endif
 


@@ -64,7 +64,8 @@ WX_DEFINE_OBJARRAY(wxArrayDCInfo);
 
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)

-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
+IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
+IMPLEMENT_CLASS(wxPaintDCEx, wxPaintDC)

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


@@ -74,8 +75,8 @@ static PAINTSTRUCT g_paintStruct;
 
 #ifdef __WXDEBUG__
     // a global variable which we check to verify that wxPaintDC are only
 
 #ifdef __WXDEBUG__
     // a global variable which we check to verify that wxPaintDC are only

-    // created in resopnse to WM_PAINT message - doing this from elsewhere is a
-    // common programming error among wxWindows programmers and might lead to
+    // created in response to WM_PAINT message - doing this from elsewhere is a
+    // common programming error among wxWidgets programmers and might lead to

     // very subtle and difficult to debug refresh/repaint bugs.
     int g_isPainting = 0;
 #endif // __WXDEBUG__
     // very subtle and difficult to debug refresh/repaint bugs.
     int g_isPainting = 0;
 #endif // __WXDEBUG__


@@ -102,7 +103,6 @@ wxWindowDC::wxWindowDC(wxWindow *canvas)
 
     // m_bOwnsDC was already set to false in the base class ctor, so the DC
     // will be released (and not deleted) in ~wxDC
 
     // m_bOwnsDC was already set to false in the base class ctor, so the DC
     // will be released (and not deleted) in ~wxDC

-

     InitDC();
 }
 
     InitDC();
 }
 


@@ -114,6 +114,18 @@ void wxWindowDC::InitDC()
 
     // default bg colour is pne of the window
     SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));
 
     // default bg colour is pne of the window
     SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));

+
+    // since we are a window dc we need to grab the palette from the window
+#if wxUSE_PALETTE
+    InitializePalette();
+#endif
+}
+
+void wxWindowDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_canvas, _T("wxWindowDC without a window?") );
+
+    m_canvas->GetSize(width, height);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -138,6 +150,40 @@ wxClientDC::wxClientDC(wxWindow *canvas)
     InitDC();
 }
 
     InitDC();
 }
 

+void wxClientDC::InitDC()
+{
+    wxWindowDC::InitDC();
+
+    // in wxUniv build we must manually do some DC adjustments usually
+    // performed by Windows for us
+    //
+    // we also need to take the menu/toolbar manually into account under
+    // Windows CE because they're just another control there, not anything
+    // special as usually under Windows
+#if defined(__WXUNIVERSAL__) || defined(__WXWINCE__)
+    wxPoint ptOrigin = m_canvas->GetClientAreaOrigin();
+    if ( ptOrigin.x || ptOrigin.y )
+    {
+        // no need to shift DC origin if shift is null
+        SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
+    }
+
+    // clip the DC to avoid overwriting the non client area
+    SetClippingRegion(wxPoint(0, 0), m_canvas->GetClientSize());
+#endif // __WXUNIVERSAL__ || __WXWINCE__
+}
+
+wxClientDC::~wxClientDC()
+{
+}
+
+void wxClientDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_canvas, _T("wxClientDC without a window?") );
+
+    m_canvas->GetClientSize(width, height);
+}
+

 // ----------------------------------------------------------------------------
 // wxPaintDC
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPaintDC
 // ----------------------------------------------------------------------------


@@ -190,10 +236,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));

     }
 
     }
 

-    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()


@@ -211,7 +261,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


@@ -231,9 +281,10 @@ wxPaintDCInfo *wxPaintDC::FindInCache(size_t *index) const
     size_t nCache = ms_cache.GetCount();
     for ( size_t n = 0; n < nCache; n++ )
     {
     size_t nCache = ms_cache.GetCount();
     for ( size_t n = 0; n < nCache; n++ )
     {

-        info = &ms_cache[n];
-        if ( info->hwnd == m_canvas->GetHWND() )
+        wxPaintDCInfo *info1 = &ms_cache[n];
+        if ( info1->hwnd == m_canvas->GetHWND() )

         {
         {

+            info = info1;

             if ( index )
                 *index = n;
             break;
             if ( index )
                 *index = n;
             break;


@@ -246,11 +297,10 @@ wxPaintDCInfo *wxPaintDC::FindInCache(size_t *index) const
 // find the entry for this DC in the cache (keyed by the window)
 WXHDC wxPaintDC::FindDCInCache(wxWindow* win)
 {
 // 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++ )
     {
     size_t nCache = ms_cache.GetCount();
     for ( size_t n = 0; n < nCache; n++ )
     {

-        info = &ms_cache[n];
+        wxPaintDCInfo *info = &ms_cache[n];

         if ( info->hwnd == win->GetHWND() )
         {
             return info->hdc;
         if ( info->hwnd == win->GetHWND() )
         {
             return info->hdc;


@@ -259,3 +309,52 @@ WXHDC wxPaintDC::FindDCInCache(wxWindow* win)
     return 0;
 }
 
     return 0;
 }
 

+/*
+ * wxPaintDCEx
+ */
+
+// TODO: don't duplicate wxPaintDC code here!!
+
+wxPaintDCEx::wxPaintDCEx(wxWindow *canvas, WXHDC dc) : saveState(0)
+{
+    wxCHECK_RET( dc, wxT("wxPaintDCEx requires an existing device context") );
+
+    m_canvas = canvas;
+
+    wxPaintDCInfo *info = FindInCache();
+    if ( info )
+    {
+        m_hDC = info->hdc;
+        info->count++;
+    }
+    else // not in cache, create a new one
+    {
+        m_hDC = dc;
+        ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
+        saveState = SaveDC((HDC) dc);
+    }
+}
+
+wxPaintDCEx::~wxPaintDCEx()
+{
+    size_t index;
+    wxPaintDCInfo *info = FindInCache(&index);
+
+    wxCHECK_RET( info, wxT("existing DC should have a cache entry") );
+
+    if ( !--info->count )
+    {
+        RestoreDC((HDC) m_hDC, saveState);
+        ms_cache.RemoveAt(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
+
+    // prevent the base class dtor from ReleaseDC()ing it again
+    m_hDC = 0;
+}
+