Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed wxDCWindowImpl::m_win; use wxDCImpl::m_window instead (fixes caret-related crash

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-05-06 17:08:49 +00:00
parent 579de297d0
commit 9d646d31c9
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/dfb/dcclient.h
View File

@@ -26,15 +26,12 @@ public:
wxWindowDCImpl(wxDC *owner, wxWindow *win); wxWindowDCImpl(wxDC *owner, wxWindow *win);
virtual ~wxWindowDCImpl(); virtual ~wxWindowDCImpl();
virtual wxWindow *GetWindow() const { return m_win; }
protected: protected:
// initializes the DC for painting on given window; if rect!=NULL, then // initializes the DC for painting on given window; if rect!=NULL, then
// for painting only on the given region of the window // for painting only on the given region of the window
void InitForWin(wxWindow *win, const wxRect *rect); void InitForWin(wxWindow *win, const wxRect *rect);
private: private:
wxWindow *m_win;
wxRect m_winRect; // rectangle of the window being painted wxRect m_winRect; // rectangle of the window being painted
bool m_shouldFlip; // flip the surface when done? bool m_shouldFlip; // flip the surface when done?

4
src/dfb/dcclient.cpp
View File

@@ -107,7 +107,7 @@ void wxWindowDCImpl::InitForWin(wxWindow *win, const wxRect *rect)
{ {
wxCHECK_RET( win, "invalid window" ); wxCHECK_RET( win, "invalid window" );
m_win = win; m_window = win;
// obtain the surface used for painting: // obtain the surface used for painting:
wxPoint origin; wxPoint origin;
@@ -211,7 +211,7 @@ wxWindowDCImpl::~wxWindowDCImpl()
{ {
// paint overlays on top of the surface being drawn to by this DC // paint overlays on top of the surface being drawn to by this DC
// before showing anything on the screen: // before showing anything on the screen:
m_win->PaintOverlays(m_winRect); GetWindow()->PaintOverlays(m_winRect);
DFBSurfaceCapabilities caps = DSCAPS_NONE; DFBSurfaceCapabilities caps = DSCAPS_NONE;
surface->GetCapabilities(&caps); surface->GetCapabilities(&caps);