From 9d646d31c9976a59ab05f72671f217972b2d7770 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 6 May 2008 17:08:49 +0000 Subject: [PATCH] removed wxDCWindowImpl::m_win; use wxDCImpl::m_window instead (fixes caret-related crash git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dfb/dcclient.h | 3 --- src/dfb/dcclient.cpp | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/wx/dfb/dcclient.h b/include/wx/dfb/dcclient.h index 9916742c74..17ae7ed988 100644 --- a/include/wx/dfb/dcclient.h +++ b/include/wx/dfb/dcclient.h @@ -26,15 +26,12 @@ public: wxWindowDCImpl(wxDC *owner, wxWindow *win); virtual ~wxWindowDCImpl(); - virtual wxWindow *GetWindow() const { return m_win; } - protected: // initializes the DC for painting on given window; if rect!=NULL, then // for painting only on the given region of the window void InitForWin(wxWindow *win, const wxRect *rect); private: - wxWindow *m_win; wxRect m_winRect; // rectangle of the window being painted bool m_shouldFlip; // flip the surface when done? diff --git a/src/dfb/dcclient.cpp b/src/dfb/dcclient.cpp index 47add960f3..2a13ea7e2b 100644 --- a/src/dfb/dcclient.cpp +++ b/src/dfb/dcclient.cpp @@ -107,7 +107,7 @@ void wxWindowDCImpl::InitForWin(wxWindow *win, const wxRect *rect) { wxCHECK_RET( win, "invalid window" ); - m_win = win; + m_window = win; // obtain the surface used for painting: wxPoint origin; @@ -211,7 +211,7 @@ wxWindowDCImpl::~wxWindowDCImpl() { // paint overlays on top of the surface being drawn to by this DC // before showing anything on the screen: - m_win->PaintOverlays(m_winRect); + GetWindow()->PaintOverlays(m_winRect); DFBSurfaceCapabilities caps = DSCAPS_NONE; surface->GetCapabilities(&caps); -- 2.47.2