X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ba4fbebbc40bdf9c140f4c9ba9977fbf810527d..b5435dccd098ae153c3b7b3b8fca8dd0d763986c:/src/msw/dcclient.cpp diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp index 1cee9d8212..c03897cf2a 100644 --- a/src/msw/dcclient.cpp +++ b/src/msw/dcclient.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -64,7 +64,7 @@ WX_DEFINE_OBJARRAY(wxArrayDCInfo); IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) -IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) +IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC) // ---------------------------------------------------------------------------- // global variables @@ -102,7 +102,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 - InitDC(); } @@ -114,6 +113,18 @@ void wxWindowDC::InitDC() // 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 +149,36 @@ wxClientDC::wxClientDC(wxWindow *canvas) InitDC(); } +void wxClientDC::InitDC() +{ + wxWindowDC::InitDC(); + + // in wxUniv build we must manually do some DC adjustments usually + // performed by Windows for us +#ifdef __WXUNIVERSAL__ + 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__ +} + +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 // ---------------------------------------------------------------------------- @@ -190,10 +231,14 @@ wxPaintDC::wxPaintDC(wxWindow *canvas) 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() @@ -211,7 +256,7 @@ wxPaintDC::~wxPaintDC() { ::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 @@ -231,9 +276,10 @@ wxPaintDCInfo *wxPaintDC::FindInCache(size_t *index) const 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;