X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a20d7ea2c512e1bb51d58016ede8e69a0198162d..e11898f903183f897a2b2a50a4447ea73ba7273f:/src/generic/splitter.cpp

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 03422af402..11ab7e9734 100644
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -36,6 +36,10 @@
     #include "wx/settings.h"
 #endif
 
+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif
+
 #include "wx/renderer.h"
 
 #include "wx/splitter.h"
@@ -200,7 +204,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     // following the mouse movement while it drags the sash, without it we only
     // draw the sash at the new position but only resize the windows when the
     // dragging is finished
-#ifdef __WXMAC__ && TARGET_API_MAC_OSX == 1
+#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX == 1
     bool isLive = true ;
 #else
     bool isLive = (GetWindowStyleFlag() & wxSP_LIVE_UPDATE) != 0;
@@ -563,7 +567,7 @@ int wxSplitterWindow::AdjustSashPosition(int sashPos) const
         if ( minSize == -1 || m_minimumPaneSize > minSize )
             minSize = m_minimumPaneSize;
 
-        int maxSize = window_size - minSize - GetBorderSize();
+        int maxSize = window_size - minSize - GetBorderSize() - GetSashSize();
         if ( sashPos > maxSize )
             sashPos = maxSize;
     }