/////////////////////////////////////////////////////////////////////////////
-// Name: dcclient.cpp
+// Name: src/msw/dcclient.cpp
// Purpose: wxClientDC class
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "dcclient.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#include "wx/string.h"
-#include "wx/log.h"
-#include "wx/window.h"
+#include "wx/dcclient.h"
-#include "wx/msw/private.h"
+#ifndef WX_PRECOMP
+ #include "wx/string.h"
+ #include "wx/log.h"
+ #include "wx/window.h"
+#endif
-#include "wx/dcclient.h"
+#include "wx/msw/private.h"
// ----------------------------------------------------------------------------
// array/list types
#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxArrayDCInfo);
+WX_DEFINE_OBJARRAY(wxArrayDCInfo)
// ----------------------------------------------------------------------------
// macros
#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__
// 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 )
{
}
// 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()
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));
}
wxCHECK_RET( info, wxT("existing DC should have a cache entry") );
- if ( !--info->count )
+ if ( --info->count == 0 )
{
::EndPaint(GetHwndOf(m_canvas), &g_paintStruct);
// 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;
/*
* 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;
wxCHECK_RET( info, wxT("existing DC should have a cache entry") );
- if ( !--info->count )
+ if ( --info->count == 0 )
{
RestoreDC((HDC) m_hDC, saveState);
ms_cache.RemoveAt(index);
// prevent the base class dtor from ReleaseDC()ing it again
m_hDC = 0;
}
-