adjust the rectangle before calling DrawThemeBackground() (patch 1158282)

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

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 748fe83850e88f6db51901b0f21ec5b8d7fcfc22..ad83a7b49f30bebbbe258440281eda608d8ba339 100644 (file)
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "dcclient.h"
 #endif
 
@@ -75,8 +75,8 @@ static PAINTSTRUCT g_paintStruct;
 
 #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__
@@ -156,7 +156,11 @@ void wxClientDC::InitDC()
 
     // in wxUniv build we must manually do some DC adjustments usually
     // performed by Windows for us
-#ifdef __WXUNIVERSAL__
+    //
+    // 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 )
     {
@@ -165,8 +169,8 @@ void wxClientDC::InitDC()
     }
 
     // clip the DC to avoid overwriting the non client area
-    SetClippingRegion(wxPoint(0, 0), m_canvas->GetClientSize());
-#endif // __WXUNIVERSAL__
+    SetClippingRegion(wxPoint(0,0), m_canvas->GetClientSize());
+#endif // __WXUNIVERSAL__ || __WXWINCE__
 }
 
 wxClientDC::~wxClientDC()
@@ -232,7 +236,7 @@ wxPaintDC::wxPaintDC(wxWindow *canvas)
     else // not in cache, create a new one
     {
         m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct);
-       if (m_hDC)
+        if (m_hDC)
             ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
     }
 
@@ -293,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)
 {
-    wxPaintDCInfo *info = NULL;
     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;
@@ -309,16 +312,12 @@ WXHDC wxPaintDC::FindDCInCache(wxWindow* win)
 /*
  * wxPaintDCEx
  */
- 
+
+// TODO: don't duplicate wxPaintDC code here!!
+
 wxPaintDCEx::wxPaintDCEx(wxWindow *canvas, WXHDC dc) : saveState(0)
 {
-#ifdef __WXDEBUG__
-    if ( !dc )
-    {
-        wxFAIL_MSG( wxT("wxPaintDCEx requires an existing device context") );
-        return;
-    }
-#endif // __WXDEBUG__
+    wxCHECK_RET( dc, wxT("wxPaintDCEx requires an existing device context") );
 
     m_canvas = canvas;