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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dfb/dcclient.h b/include/wx/dfb/dcclient.h
index 9916742c741ed08251f2aa24db2bc7077588b7a0..17ae7ed988595137d7868074c005893b38a56baa 100644 (file)
--- a/include/wx/dfb/dcclient.h
+++ b/include/wx/dfb/dcclient.h
@@ -26,15 +26,12 @@ public:
     wxWindowDCImpl(wxDC *owner, wxWindow *win);
     virtual ~wxWindowDCImpl();
 
     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:
 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?
     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 47add960f36227e516bcb70e529abe2102a871ca..2a13ea7e2b1f07f51b9a297d4ea89106bd237eaa 100644 (file)
--- 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" );
 
 {
     wxCHECK_RET( win, "invalid window" );
 

-    m_win = win;
+    m_window = win;

 
     // obtain the surface used for painting:
     wxPoint origin;
 
     // 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:
     {
         // 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);
 
         DFBSurfaceCapabilities caps = DSCAPS_NONE;
         surface->GetCapabilities(&caps);