X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bc1aa1174ee3ddd68615827c3531549cf204918..c4053ed35abe597597c4b843529be38ca3c3c7f2:/src/msw/dcclient.cpp diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp index c675ce039f..0bfd4b112f 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 ///////////////////////////////////////////////////////////////////////////// @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dcclient.h" #endif @@ -62,11 +62,10 @@ WX_DEFINE_OBJARRAY(wxArrayDCInfo); // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) - IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) - IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) +IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) +IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC) +IMPLEMENT_CLASS(wxPaintDCEx, wxPaintDC) // ---------------------------------------------------------------------------- // global variables @@ -92,33 +91,41 @@ static PAINTSTRUCT g_paintStruct; wxWindowDC::wxWindowDC() { - m_canvas = NULL; + m_canvas = NULL; } -wxWindowDC::wxWindowDC(wxWindow *the_canvas) +wxWindowDC::wxWindowDC(wxWindow *canvas) { - m_canvas = the_canvas; - m_hDC = (WXHDC) ::GetWindowDC(GetWinHwnd(the_canvas) ); - m_hDCCount++; + wxCHECK_RET( canvas, _T("invalid window in wxWindowDC") ); - SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID)); + m_canvas = canvas; + m_hDC = (WXHDC) ::GetWindowDC(GetHwndOf(m_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(); } -wxWindowDC::~wxWindowDC() +void wxWindowDC::InitDC() { - if (m_canvas && m_hDC) - { - SelectOldObjects(m_hDC); + // the background mode is only used for text background and is set in + // DrawText() to OPAQUE as required, otherwise always TRANSPARENT, + ::SetBkMode(GetHdc(), TRANSPARENT); - if ( !::ReleaseDC(GetWinHwnd(m_canvas), GetHdc()) ) - { - wxLogLastError("ReleaseDC"); - } + // default bg colour is pne of the window + SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID)); - m_hDC = 0; - } + // 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_hDCCount--; + m_canvas->GetSize(width, height); } // ---------------------------------------------------------------------------- @@ -127,31 +134,50 @@ wxWindowDC::~wxWindowDC() wxClientDC::wxClientDC() { - m_canvas = NULL; + m_canvas = NULL; +} + +wxClientDC::wxClientDC(wxWindow *canvas) +{ + wxCHECK_RET( canvas, _T("invalid window in wxClientDC") ); + + m_canvas = canvas; + m_hDC = (WXHDC)::GetDC(GetHwndOf(m_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(); } -wxClientDC::wxClientDC(wxWindow *the_canvas) +void wxClientDC::InitDC() { - m_canvas = the_canvas; - m_hDC = (WXHDC) ::GetDC(GetWinHwnd(the_canvas)); + wxWindowDC::InitDC(); - // the background mode is only used for text background - // and is set in DrawText() to OPAQUE as required, other- - // wise always TRANSPARENT, RR - ::SetBkMode( GetHdc(), TRANSPARENT ); + // 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); + } - SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID)); + // clip the DC to avoid overwriting the non client area + SetClippingRegion(wxPoint(0, 0), m_canvas->GetClientSize()); +#endif // __WXUNIVERSAL__ } wxClientDC::~wxClientDC() { - if ( m_canvas && GetHdc() ) - { - SelectOldObjects(m_hDC); +} - ::ReleaseDC(GetWinHwnd(m_canvas), GetHdc()); - m_hDC = 0; - } +void wxClientDC::DoGetSize(int *width, int *height) const +{ + wxCHECK_RET( m_canvas, _T("wxClientDC without a window?") ); + + m_canvas->GetClientSize(width, height); } // ---------------------------------------------------------------------------- @@ -159,7 +185,7 @@ wxClientDC::~wxClientDC() // ---------------------------------------------------------------------------- // VZ: initial implementation (by JACS) only remembered the last wxPaintDC -// created and tried to reuse - this was supposed to take care of a +// created and tried to reuse it - this was supposed to take care of a // situation when a derived class OnPaint() calls base class OnPaint() // because in this case ::BeginPaint() shouldn't be called second time. // @@ -179,7 +205,6 @@ wxArrayDCInfo wxPaintDC::ms_cache; wxPaintDC::wxPaintDC() { m_canvas = NULL; - m_hDC = 0; } wxPaintDC::wxPaintDC(wxWindow *canvas) @@ -206,16 +231,15 @@ wxPaintDC::wxPaintDC(wxWindow *canvas) } else // not in cache, create a new one { - m_hDC = (WXHDC)::BeginPaint(GetWinHwnd(m_canvas), &g_paintStruct); - ms_cache.Add(new wxPaintDCInfo(m_canvas, this)); + m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct); + if (m_hDC) + ms_cache.Add(new wxPaintDCInfo(m_canvas, this)); } - // the background mode is only used for text background - // and is set in DrawText() to OPAQUE as required, other- - // wise always TRANSPARENT, RR - ::SetBkMode( GetHdc(), TRANSPARENT ); - - SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID)); + // (re)set the DC parameters. + // Note: at this point m_hDC can be NULL under MicroWindows, when dragging. + if (GetHDC()) + InitDC(); } wxPaintDC::~wxPaintDC() @@ -231,9 +255,9 @@ wxPaintDC::~wxPaintDC() if ( !--info->count ) { - ::EndPaint(GetWinHwnd(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 @@ -253,9 +277,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; @@ -264,3 +289,68 @@ wxPaintDCInfo *wxPaintDC::FindInCache(size_t *index) const return info; } + +// find the entry for this DC in the cache (keyed by the window) +WXHDC wxPaintDC::FindDCInCache(wxWindow* win) +{ + size_t nCache = ms_cache.GetCount(); + for ( size_t n = 0; n < nCache; n++ ) + { + wxPaintDCInfo *info = &ms_cache[n]; + if ( info->hwnd == win->GetHWND() ) + { + return info->hdc; + } + } + 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; +} +