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
This commit is contained in:
@@ -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?
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user