set device origin when drawing on a frame in order to not overwrite the menu/toolbar under Windows CE (doesn't really help however...)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-04-04 22:50:37 +00:00
parent 8f4d9fcd9a
commit 1fa6ebf706

View File

@ -156,7 +156,11 @@ void wxClientDC::InitDC()
// in wxUniv build we must manually do some DC adjustments usually // in wxUniv build we must manually do some DC adjustments usually
// performed by Windows for us // 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(); wxPoint ptOrigin = m_canvas->GetClientAreaOrigin();
if ( ptOrigin.x || ptOrigin.y ) if ( ptOrigin.x || ptOrigin.y )
{ {
@ -166,7 +170,7 @@ void wxClientDC::InitDC()
// clip the DC to avoid overwriting the non client area // clip the DC to avoid overwriting the non client area
SetClippingRegion(wxPoint(0, 0), m_canvas->GetClientSize()); SetClippingRegion(wxPoint(0, 0), m_canvas->GetClientSize());
#endif // __WXUNIVERSAL__ #endif // __WXUNIVERSAL__ || __WXWINCE__
} }
wxClientDC::~wxClientDC() wxClientDC::~wxClientDC()
@ -232,7 +236,7 @@ wxPaintDC::wxPaintDC(wxWindow *canvas)
else // not in cache, create a new one else // not in cache, create a new one
{ {
m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct); m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct);
if (m_hDC) if (m_hDC)
ms_cache.Add(new wxPaintDCInfo(m_canvas, this)); ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
} }