unreachable code warning fix (Unicode build)

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index e2a2a3ca99ab66eb9cd79a537f54eae0546e0b12..0c04fde00056bc7864366d336f353a1ea1402ca4 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -122,7 +122,8 @@ void wxSplitterWindow::Init()
     m_firstY = 0;
     m_sashPosition = m_requestedSashPosition = 0;
     m_sashGravity = 0.0;
-    m_lastSize = wxSize();
+    m_sashSize = -1; // -1 means use the native sash size
+    m_lastSize = wxSize(0,0);
     m_checkRequestedSashPosition = false;
     m_minimumPaneSize = 0;
     m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
@@ -414,7 +415,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
 
     if ( iconized )
     {
-        m_lastSize = wxSize();
+        m_lastSize = wxSize(0,0);
 
         event.Skip();
 
@@ -471,7 +472,7 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
 
 int wxSplitterWindow::GetSashSize() const
 {
-    return wxRendererNative::Get().GetSplitterParams(this).widthSash;
+    return m_sashSize > -1 ? m_sashSize : wxRendererNative::Get().GetSplitterParams(this).widthSash;
 }
 
 int wxSplitterWindow::GetBorderSize() const
@@ -877,9 +878,9 @@ wxSize wxSplitterWindow::DoGetBestSize() const
     // get best sizes of subwindows
     wxSize size1, size2;
     if ( m_windowOne )
-        size1 = m_windowOne->GetBestSize();
+        size1 = m_windowOne->GetAdjustedBestSize();
     if ( m_windowTwo )
-        size2 = m_windowTwo->GetBestSize();
+        size2 = m_windowTwo->GetAdjustedBestSize();
 
     // sum them
     //