X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab3a145407008f07e065f0b72bae9b8f88aeaf65..c0bf294f24c6d5a48249b2e1986dd707133c447f:/src/common/overlaycmn.cpp diff --git a/src/common/overlaycmn.cpp b/src/common/overlaycmn.cpp index b3e0304101..35b222e49d 100644 --- a/src/common/overlaycmn.cpp +++ b/src/common/overlaycmn.cpp @@ -116,7 +116,7 @@ void wxDCOverlay::Init(wxWindowDC *dc, int x , int y , int width , int height ) m_overlay.BeginDrawing(dc); } -void wxDCOverlay::Clear() +void wxDCOverlay::Clear() { m_overlay.Clear(m_dc); } @@ -129,9 +129,7 @@ void wxDCOverlay::Clear() wxOverlayImpl::wxOverlayImpl() { -#if defined(__WXGTK__) || defined(__WXMSW__) m_window = NULL ; -#endif m_x = m_y = m_width = m_height = 0 ; } @@ -139,28 +137,14 @@ wxOverlayImpl::~wxOverlayImpl() { } -bool wxOverlayImpl::IsOk() +bool wxOverlayImpl::IsOk() { return m_bmpSaved.Ok() ; } void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height ) { -#if defined(__WXGTK__) -#if wxUSE_NEW_DC - wxImplDC *impl = dc->GetImpl(); - wxGTKWindowImplDC *gtk_impl = wxDynamicCast( impl, wxGTKWindowImplDC ); - if (gtk_impl) - m_window = gtk_impl->m_owningWindow; -#else - m_window = dc->m_owningWindow; -#endif -#else - #if defined (__WXMSW__) m_window = dc->GetWindow(); - #endif // __WXMSW__ - -#endif wxMemoryDC dcMem ; m_bmpSaved.Create( width, height ); dcMem.SelectObject( m_bmpSaved ); @@ -178,7 +162,7 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height dcMem.SelectObject( wxNullBitmap ); } -void wxOverlayImpl::Clear(wxWindowDC* dc) +void wxOverlayImpl::Clear(wxWindowDC* dc) { wxMemoryDC dcMem ; dcMem.SelectObject( m_bmpSaved );