__WINCE__ -> __WXWINCE__

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 03422af4029837f0fd61314fbe64eedde0b98621..11ab7e9734822f083470c67ae5d0f1d1a1cafe67 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -36,6 +36,10 @@
     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 

+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif
+

 #include "wx/renderer.h"
 
 #include "wx/splitter.h"
 #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
     // 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;
     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;
 
         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;
     }
         if ( sashPos > maxSize )
             sashPos = maxSize;
     }