Improve sizer support in generic wxNotebook. Fix the widgets sample

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 9a60c67422e026f31aaadcd4c652cb8f3d882e24..0a2f061b724d701ac1c56a03f81555104ec48f74 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -578,8 +578,6 @@ int wxSplitterWindow::GetWindowSize() const
 
 int wxSplitterWindow::AdjustSashPosition(int sashPos) const
 {
-    int window_size = GetWindowSize();
-
     wxWindow *win;
 
     win = GetWindow1();
@@ -608,8 +606,8 @@ int wxSplitterWindow::AdjustSashPosition(int sashPos) const
         if ( minSize == -1 || m_minimumPaneSize > minSize )
             minSize = m_minimumPaneSize;
 
-        int maxSize = window_size - minSize - GetBorderSize() - GetSashSize();
-        if ( sashPos > maxSize )
+        int maxSize = GetWindowSize() - minSize - GetBorderSize() - GetSashSize();
+        if ( maxSize > 0 && sashPos > maxSize )
             sashPos = maxSize;
     }