restore Robin's code (reverted previous commit)

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

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 43f061c2d676f4f07e676aa85ae59de323435f1f..1cef14d60fc59e3b85736d47f0ff7ede48be94a0 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -1116,8 +1116,9 @@ bool wxGenericScrolledWindow::Layout()
         GetSizer()->SetDimension(x, y, w, h);
         return TRUE;
     }
         GetSizer()->SetDimension(x, y, w, h);
         return TRUE;
     }

-    else
-        return wxPanel::Layout();  // fall back to default for LayoutConstraints
+
+    // fall back to default for LayoutConstraints
+    return wxPanel::Layout();

 }
 
 void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
 }
 
 void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)