X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b66c26ae7463a84a62de96f6e1dda1bebd42301..ff5802f3996f32207b3325e96af7decaae18971b:/src/generic/scrlwing.cpp

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 2e0fff3751..b36eace80e 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -342,6 +342,8 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
 
     m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
 
+    AdjustScrollbars();
+
     if (do_refresh && !noRefresh)
         m_targetWindow->Refresh(TRUE, GetRect());
 
@@ -865,11 +867,13 @@ void wxScrollHelper::DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) co
 // Default OnSize resets scrollbars, if any
 void wxScrollHelper::HandleOnSize(wxSizeEvent& WXUNUSED(event))
 {
-    if( m_targetWindow != m_win )
+    if ( m_targetWindow != m_win )
         m_targetWindow->SetVirtualSize( m_targetWindow->GetClientSize() );
 
     m_win->SetVirtualSize( m_win->GetClientSize() );
 
+    AdjustScrollbars();
+
 #if wxUSE_CONSTRAINTS
     if (m_win->GetAutoLayout())
         m_win->Layout();
@@ -1159,12 +1163,6 @@ bool wxGenericScrolledWindow::Layout()
     return wxPanel::Layout();
 }
 
-void wxGenericScrolledWindow::DoSetVirtualSize( int x, int y )
-{
-    wxPanel::DoSetVirtualSize( x, y );
-    AdjustScrollbars();
-}
-
 void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
 {
     // the user code didn't really draw the window if we got here, so set this