Fix scrolling bug where client size was reported wrong

    when the scrollbar size was not subtracted when
    using a targetwindow != this.

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

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 3c52471d57ebfc1904b4f35d6744d32234326fe6..72e831f69d17d57d65277488ee10259d70cd2303 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -118,7 +118,8 @@ void wxScrollHelperNative::AdjustScrollbars()
     int w, h;
     int vw, vh;
 
     int w, h;
     int vw, vh;
 

-    m_targetWindow->m_hasScrolling = m_xScrollPixelsPerLine != 0 || m_yScrollPixelsPerLine != 0;
+    // this flag indicates which window has the scrollbars
+    m_win->m_hasScrolling = m_xScrollPixelsPerLine != 0 || m_yScrollPixelsPerLine != 0;

 
     m_targetWindow->GetVirtualSize( &vw, &vh );
 
 
     m_targetWindow->GetVirtualSize( &vw, &vh );
 

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index a83c1c551ef0230e0d44489470b1e6edc4cf050e..2db80f389625c91d45986d3d5f78bdd9d3c4f1c3 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3019,9 +3019,7 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
         int dh = 0;
 
         if (m_hasScrolling)
         int dh = 0;
 
         if (m_hasScrolling)

-        {

             GetScrollbarWidth(m_widget, dw, dh);
             GetScrollbarWidth(m_widget, dw, dh);

-        }

 
 #ifndef __WXUNIVERSAL__
         if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
 
 #ifndef __WXUNIVERSAL__
         if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))