restored old casts (there was a reason for them)

[wxWidgets.git] / src / generic / scrlwing.cpp

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index c17909a7094eac716811b2e668e0472398334997..1cef14d60fc59e3b85736d47f0ff7ede48be94a0 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -40,6 +40,7 @@
 #include "wx/scrolwin.h"
 #include "wx/panel.h"
 #include "wx/timer.h"
 #include "wx/scrolwin.h"
 #include "wx/panel.h"
 #include "wx/timer.h"

+#include "wx/sizer.h"

 
 #ifdef __WXMSW__
     #include <windows.h> // for DLGC_WANTARROWS
 
 #ifdef __WXMSW__
     #include <windows.h> // for DLGC_WANTARROWS


@@ -1115,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)