fixed wxScrolledWindow::SetScrollbars() which was broken by the virtual size changes

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

include/wx/generic/scrolwin.h

@@ -69,8 +69,6 @@ public:
     // lay out the window and its children
     virtual bool Layout();
 
-    virtual void DoSetVirtualSize( int x, int y );
-
 protected:
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()
@@ -94,4 +92,3 @@ private:
 #endif
     // _WX_GENERIC_SCROLLWIN_H_
 
-// vi:sts=4:sw=4:et

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());
 
@@ -870,6 +872,8 @@ void wxScrollHelper::HandleOnSize(wxSizeEvent& WXUNUSED(event))
 
     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