fix digitalmars bug (ambiguous symbol)

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 2df6674596197fa925d2d713edb27e3c36288d98..3f1c33e32769c7cd13ab00a0337f6f4c46f23cb6 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -1,90 +1,106 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        splitter.cpp
+// Name:        src/generic/splitter.cpp

 // Purpose:     wxSplitterWindow implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxSplitterWindow implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "splitter.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
     #pragma implementation "splitter.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_SPLITTER
+

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/log.h"
+
+    #include "wx/dcscreen.h"
+
+    #include "wx/window.h"
+    #include "wx/dialog.h"
+    #include "wx/frame.h"
+
+    #include "wx/settings.h"

 #endif
 
 #endif
 

-#include <stdlib.h>
+#include "wx/renderer.h"

 
 

-#include "wx/string.h"

 #include "wx/splitter.h"
 #include "wx/splitter.h"

-#include "wx/dcscreen.h"

 
 

-#if !USE_SHARED_LIBRARY
+#include <stdlib.h>
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_UNSPLIT)
+

 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)

-IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent)
+
+/*
+       TODO PROPERTIES
+               style wxSP_3D
+               sashpos (long , 0 )
+               minsize (long -1 )
+               object, object_ref
+               orientation
+*/
+
+IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxNotifyEvent)

 
 BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     EVT_PAINT(wxSplitterWindow::OnPaint)
     EVT_SIZE(wxSplitterWindow::OnSize)
 
 BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     EVT_PAINT(wxSplitterWindow::OnPaint)
     EVT_SIZE(wxSplitterWindow::OnSize)

-    EVT_IDLE(wxSplitterWindow::OnIdle)

     EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent)
 
     EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent)
 

-    EVT_SPLITTER_SASH_POS_CHANGED(-1, wxSplitterWindow::OnSashPosChanged)
-    // NB: we borrow OnSashPosChanged for purposes of
-    // EVT_SPLITTER_SASH_POS_CHANGING since default implementation is identical
-    EVT_SPLITTER_SASH_POS_CHANGING(-1, wxSplitterWindow::OnSashPosChanged)
-    EVT_SPLITTER_DCLICK(-1,           wxSplitterWindow::OnDoubleClick)
-    EVT_SPLITTER_UNSPLIT(-1,          wxSplitterWindow::OnUnsplitEvent)
+#if defined( __WXMSW__ ) || defined( __WXMAC__)
+    EVT_SET_CURSOR(wxSplitterWindow::OnSetCursor)
+#endif // wxMSW
+
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow)

 END_EVENT_TABLE()
 END_EVENT_TABLE()

-#endif

 
 

-wxSplitterWindow::wxSplitterWindow()
-{
-    m_splitMode = wxSPLIT_VERTICAL;
-    m_permitUnsplitAlways = FALSE;
-    m_windowOne = (wxWindow *) NULL;
-    m_windowTwo = (wxWindow *) NULL;
-    m_dragMode = wxSPLIT_DRAG_NONE;
-    m_oldX = 0;
-    m_oldY = 0;
-    m_firstX = 0;
-    m_firstY = 0;
-    m_sashSize = 7;
-    m_borderSize = 2;
-    m_sashPosition = 0;
-    m_sashCursorWE = (wxCursor *) NULL;
-    m_sashCursorNS = (wxCursor *) NULL;
-    m_sashTrackerPen = (wxPen *) NULL;
-    m_lightShadowPen = (wxPen *) NULL;
-    m_mediumShadowPen = (wxPen *) NULL;
-    m_darkShadowPen = (wxPen *) NULL;
-    m_faceBrush = (wxBrush *) NULL;
-    m_facePen = (wxPen *) NULL;
-    m_hilightPen = (wxPen *) NULL;
-    m_minimumPaneSize = 0;
-    m_needUpdating = FALSE;
-}
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow);

 
 

-wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id,
+bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,

                                    const wxPoint& pos,
                                    const wxSize& size,
                                    long style,
                                    const wxString& name)
                                    const wxPoint& pos,
                                    const wxSize& size,
                                    long style,
                                    const wxString& name)

-                : wxWindow(parent, id, pos, size, style, name)

 {
 {

-    m_splitMode = wxSPLIT_VERTICAL;
+    // allow TABbing from one window to the other
+    style |= wxTAB_TRAVERSAL;
+
+    // we draw our border ourselves to blend the sash with it
+    style &= ~wxBORDER_MASK;
+    style |= wxBORDER_NONE;
+
+    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        return FALSE;
+

     m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0;
     m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0;

+
+    return TRUE;
+}
+
+void wxSplitterWindow::Init()
+{
+    m_container.SetContainerWindow(this);
+
+    m_splitMode = wxSPLIT_VERTICAL;
+    m_permitUnsplitAlways = TRUE;

     m_windowOne = (wxWindow *) NULL;
     m_windowTwo = (wxWindow *) NULL;
     m_dragMode = wxSPLIT_DRAG_NONE;
     m_windowOne = (wxWindow *) NULL;
     m_windowTwo = (wxWindow *) NULL;
     m_dragMode = wxSPLIT_DRAG_NONE;


@@ -92,102 +108,114 @@ wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id,
     m_oldY = 0;
     m_firstX = 0;
     m_firstY = 0;
     m_oldY = 0;
     m_firstX = 0;
     m_firstY = 0;

-    m_sashSize = 7;
-    m_borderSize = 2;
-    m_sashPosition = 0;
+    m_sashPosition = m_requestedSashPosition = 0;

     m_minimumPaneSize = 0;
     m_minimumPaneSize = 0;

-    m_sashCursorWE = new wxCursor(wxCURSOR_SIZEWE);
-    m_sashCursorNS = new wxCursor(wxCURSOR_SIZENS);
+    m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
+    m_sashCursorNS = wxCursor(wxCURSOR_SIZENS);

     m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxSOLID);
     m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxSOLID);

-    m_lightShadowPen = (wxPen *) NULL;
-    m_mediumShadowPen = (wxPen *) NULL;
-    m_darkShadowPen = (wxPen *) NULL;
-    m_faceBrush = (wxBrush *) NULL;
-    m_facePen = (wxPen *) NULL;
-    m_hilightPen = (wxPen *) NULL;

 
 

-    if ( style & wxSP_3D )
-    {
-        m_borderSize = 2;
-        m_sashSize = 7;
-    }
-    else if ( style & wxSP_BORDER )
-    {
-        m_borderSize = 1;
-        m_sashSize = 3;
-    }
-    else
+    m_needUpdating = FALSE;
+    m_isHot = false;
+}
+
+wxSplitterWindow::~wxSplitterWindow()
+{
+    delete m_sashTrackerPen;
+}
+
+// ----------------------------------------------------------------------------
+// entering/leaving sash
+// ----------------------------------------------------------------------------
+
+void wxSplitterWindow::RedrawIfHotSensitive(bool isHot)
+{
+    if ( wxRendererNative::Get().GetSplitterParams(this).isHotSensitive )

     {
     {

-        m_borderSize = 0;
-        m_sashSize = 3;
+        m_isHot = isHot;
+
+        wxClientDC dc(this);
+        DrawSash(dc);

     }
     }

+    //else: we don't change our appearance, don't redraw to avoid flicker
+}

 
 

-    // Eventually, we'll respond to colour change messages
-    InitColours();
+void wxSplitterWindow::OnEnterSash()
+{
+    SetResizeCursor();

 
 

-    // For debugging purposes, to see the background.
-//    SetBackground(wxBLUE_BRUSH);
+    RedrawIfHotSensitive(true);
+}

 
 

-    m_needUpdating = FALSE;
+void wxSplitterWindow::OnLeaveSash()
+{
+    SetCursor(*wxSTANDARD_CURSOR);
+
+    RedrawIfHotSensitive(false);

 }
 
 }
 

-wxSplitterWindow::~wxSplitterWindow()
+void wxSplitterWindow::SetResizeCursor()

 {
 {

-    delete m_sashCursorWE;
-    delete m_sashCursorNS;
-    delete m_sashTrackerPen;
-    delete m_lightShadowPen;
-    delete m_darkShadowPen;
-    delete m_mediumShadowPen;
-    delete m_hilightPen;
-    delete m_facePen;
-    delete m_faceBrush;
+    SetCursor(m_splitMode == wxSPLIT_VERTICAL ? m_sashCursorWE
+                                              : m_sashCursorNS);

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// other event handlers
+// ----------------------------------------------------------------------------
+

 void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
 
 void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
 

-    if ( m_borderSize > 0 )
-        DrawBorders(dc);

     DrawSash(dc);
 }
 
     DrawSash(dc);
 }
 

-void wxSplitterWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
+void wxSplitterWindow::OnInternalIdle()

 {
 {

+    wxWindow::OnInternalIdle();
+    

     if (m_needUpdating)
         SizeWindows();
 }
 
 void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 {
     if (m_needUpdating)
         SizeWindows();
 }
 
 void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 {

-    long x = event.GetX();
-    long y = event.GetY();
+    int x = (int)event.GetX(),
+        y = (int)event.GetY();

 
 

-    // reset the cursor
-#ifdef __WXMOTIF__
-    SetCursor(* wxSTANDARD_CURSOR);
-#endif
-#ifdef __WXMSW__
-    SetCursor(wxCursor());
-#endif
+    if (GetWindowStyle() & wxSP_NOSASH)
+        return;

 
 

+    // with wxSP_LIVE_UPDATE style the splitter windows are always resized
+    // 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
+    bool isLive = (GetWindowStyleFlag() & wxSP_LIVE_UPDATE) != 0;

 
     if (event.LeftDown())
     {
         if ( SashHitTest(x, y) )
         {
 
     if (event.LeftDown())
     {
         if ( SashHitTest(x, y) )
         {

+            // Start the drag now
+            m_dragMode = wxSPLIT_DRAG_DRAGGING;
+            
+            // Capture mouse and set the cursor

             CaptureMouse();
             CaptureMouse();

+            SetResizeCursor();

 
 

-            m_dragMode = wxSPLIT_DRAG_DRAGGING;
+            if ( !isLive )
+            {
+                // remember the initial sash position and draw the initial
+                // shadow sash
+                m_sashPositionCurrent = m_sashPosition;
+
+                DrawSashTracker(x, y);
+            }

 
 

-            if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
-           {
-               DrawSashTracker(x, y);
-           }
-           

             m_oldX = x;
             m_oldY = y;
             m_oldX = x;
             m_oldY = y;

+
+            SetResizeCursor();

             return;
         }
     }
             return;
         }
     }


@@ -195,127 +223,115 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     {
         // We can stop dragging now and see what we've got.
         m_dragMode = wxSPLIT_DRAG_NONE;
     {
         // We can stop dragging now and see what we've got.
         m_dragMode = wxSPLIT_DRAG_NONE;

+        
+        // Release mouse and unset the cursor

         ReleaseMouse();
         ReleaseMouse();

+        SetCursor(* wxSTANDARD_CURSOR);
+
+        // exit if unsplit after doubleclick
+        if ( !IsSplit() )
+        {
+            return;
+        }

 
         // Erase old tracker
 
         // Erase old tracker

-        if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
-       {
+        if ( !isLive )
+        {

             DrawSashTracker(m_oldX, m_oldY);
             DrawSashTracker(m_oldX, m_oldY);

-       }
+        }

 
 

-        // Obtain window size. We are only interested in the dimension the sash
-        // splits up
-        int w, h;
-        GetClientSize(&w, &h);
-        int window_size = (m_splitMode == wxSPLIT_VERTICAL ? w : h );
-        int new_sash_position =
-            (int) ( m_splitMode == wxSPLIT_VERTICAL ? x : y );
-
-        wxSplitterEvent eventSplitter(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED,
-                                      this);
-        eventSplitter.m_data.pos = new_sash_position;
-        if ( GetEventHandler()->ProcessEvent(eventSplitter) )
+        // the position of the click doesn't exactly correspond to
+        // m_sashPosition, rather it changes it by the distance by which the
+        // mouse has moved
+        int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_oldX : y - m_oldY;
+
+        int posSashOld = isLive ? m_sashPosition : m_sashPositionCurrent;
+        int posSashNew = OnSashPositionChanging(posSashOld + diff);
+        if ( posSashNew == -1 )

         {
         {

-            new_sash_position = eventSplitter.GetSashPosition();
-            if ( new_sash_position == -1 )
-            {
-                // change not allowed
-                return;
-            }
+            // change not allowed
+            return;

         }
 
         }
 

-        if ( m_permitUnsplitAlways
-                || m_minimumPaneSize == 0 )
+        if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 )

         {
             // Deal with possible unsplit scenarios
         {
             // Deal with possible unsplit scenarios

-            if ( new_sash_position == 0 )
+            if ( posSashNew == 0 )

             {
                 // We remove the first window from the view
                 wxWindow *removedWindow = m_windowOne;
                 m_windowOne = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
             {
                 // We remove the first window from the view
                 wxWindow *removedWindow = m_windowOne;
                 m_windowOne = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;

-                SendUnsplitEvent(removedWindow);
-                m_sashPosition = 0;
+                OnUnsplit(removedWindow);
+                wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+                event.m_data.win = removedWindow;
+                (void)DoSendEvent(event);
+                SetSashPositionAndNotify(0);

             }
             }

-            else if ( new_sash_position == window_size )
+            else if ( posSashNew == GetWindowSize() )

             {
                 // We remove the second window from the view
                 wxWindow *removedWindow = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
             {
                 // We remove the second window from the view
                 wxWindow *removedWindow = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;

-                SendUnsplitEvent(removedWindow);
-                m_sashPosition = 0;
+                OnUnsplit(removedWindow);
+                wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+                event.m_data.win = removedWindow;
+                (void)DoSendEvent(event);
+                SetSashPositionAndNotify(0);

             }
             else
             {
             }
             else
             {

-                m_sashPosition = new_sash_position;
+                SetSashPositionAndNotify(posSashNew);

             }
         }
         else
         {
             }
         }
         else
         {

-            m_sashPosition = new_sash_position;
+            SetSashPositionAndNotify(posSashNew);

         }
 
         SizeWindows();
     }  // left up && dragging
         }
 
         SizeWindows();
     }  // left up && dragging

-    else if (event.Moving() && !event.Dragging())
+    else if ((event.Moving() || event.Leaving() || event.Entering()) && (m_dragMode == wxSPLIT_DRAG_NONE))

     {
     {

-        // Just change the cursor if required
-        if ( SashHitTest(x, y) )
-        {
-                if ( m_splitMode == wxSPLIT_VERTICAL )
-                {
-                    SetCursor(*m_sashCursorWE);
-                }
-                else
-                {
-                    SetCursor(*m_sashCursorNS);
-                }
-        }
-#ifdef __WXGTK__
+        if ( event.Leaving() || !SashHitTest(x, y) )
+            OnLeaveSash();

         else
         else

-        {
-            // where else do we unset the cursor?
-            SetCursor(* wxSTANDARD_CURSOR);
-        }
-#endif // __WXGTK__
+            OnEnterSash();

     }
     }

-    else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) 
+    else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))

     {
     {

-        // Obtain window size. We are only interested in the dimension the sash
-        // splits up
-        int new_sash_position =
-            (int) ( m_splitMode == wxSPLIT_VERTICAL ? x : y );
+        int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_oldX : y - m_oldY;
+        if ( !diff )
+        {
+            // nothing to do, mouse didn't really move far enough
+            return;
+        }

 
 

-        wxSplitterEvent eventSplitter(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING,
-                                      this);
-        eventSplitter.m_data.pos = new_sash_position;
-        if ( GetEventHandler()->ProcessEvent(eventSplitter) )
+        int posSashOld = isLive ? m_sashPosition : m_sashPositionCurrent;
+        int posSashNew = OnSashPositionChanging(posSashOld + diff);
+        if ( posSashNew == -1 )

         {
         {

-            new_sash_position = eventSplitter.GetSashPosition();
-            if ( new_sash_position == -1 )
-            {
-                // change not allowed
-                return;
-            }
+            // change not allowed
+            return;

         }
 
         }
 

+        if ( posSashNew == m_sashPosition )
+            return;
+

         // Erase old tracker
         // Erase old tracker

-        if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
-       {
+        if ( !isLive )
+        {

             DrawSashTracker(m_oldX, m_oldY);
             DrawSashTracker(m_oldX, m_oldY);

-       }
+        }

 
         if (m_splitMode == wxSPLIT_VERTICAL)
 
         if (m_splitMode == wxSPLIT_VERTICAL)

-            x = new_sash_position;
+            x = posSashNew;

         else
         else

-            y = new_sash_position;
+            y = posSashNew;

 
 

-        if (new_sash_position != -1)
-        {
-            // Only modify if permitted
-            m_oldX = x;
-            m_oldY = y;
-        }
+        // Remember old positions
+        m_oldX = x;
+        m_oldY = y;

 
 #ifdef __WXMSW__
         // As we captured the mouse, we may get the mouse events from outside
 
 #ifdef __WXMSW__
         // As we captured the mouse, we may get the mouse events from outside


@@ -331,24 +347,21 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 #endif // __WXMSW__
 
         // Draw new one
 #endif // __WXMSW__
 
         // Draw new one

-        if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
-       {
+        if ( !isLive )
+        {
+            m_sashPositionCurrent = posSashNew;
+

             DrawSashTracker(m_oldX, m_oldY);
             DrawSashTracker(m_oldX, m_oldY);

-       }
-       else
-       {
-            m_sashPosition = new_sash_position;
-           m_needUpdating = TRUE;
-       }
+        }
+        else
+        {
+            SetSashPositionAndNotify(posSashNew);
+            m_needUpdating = TRUE;
+        }

     }
     }

-    else if ( event.LeftDClick() )
+    else if ( event.LeftDClick() && m_windowTwo )

     {
     {

-        wxSplitterEvent eventSplitter(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED,
-                                      this);
-        eventSplitter.m_data.pt.x = x;
-        eventSplitter.m_data.pt.y = y;
-
-        (void)GetEventHandler()->ProcessEvent(eventSplitter);
+        OnDoubleClickSash(x, y);

     }
 }
 
     }
 }
 


@@ -364,42 +377,37 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
     }
 
     bool iconized = FALSE;
     }
 
     bool iconized = FALSE;

-    wxFrame *frame = wxDynamicCast(parent, wxFrame);
-    if ( frame )
-        iconized = frame->IsIconized();
+
+    wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow);
+    if ( winTop )
+    {
+        iconized = winTop->IsIconized();
+    }

     else
     {
     else
     {

-        wxDialog *dialog = wxDynamicCast(parent, wxDialog);
-        if ( dialog )
-            iconized = dialog->IsIconized();
-        else
-            wxFAIL_MSG(wxT("should have a top level frame or dialog parent!"));
+        wxFAIL_MSG(wxT("should have a top level parent!"));
+
+        iconized = FALSE;

     }
 
     if ( iconized )
     {
         event.Skip();
     }
 
     if ( iconized )
     {
         event.Skip();

+
+        return;

     }
     }

-    else
+
+    if ( m_windowTwo )

     {
     {

-        int cw, ch;
-        GetClientSize( &cw, &ch );
-        if ( m_windowTwo )
-        {
-            if ( m_splitMode == wxSPLIT_VERTICAL )
-            {
-                if ( m_sashPosition >= (cw - 5) )
-                    m_sashPosition = wxMax(10, cw - 40);
-            }
-            if ( m_splitMode == wxSPLIT_HORIZONTAL )
-            {
-                if ( m_sashPosition >= (ch - 5) )
-                    m_sashPosition = wxMax(10, ch - 40);
-            }
-        }
+        int w, h;
+        GetClientSize(&w, &h);

 
 

-        SizeWindows();
+        int size = m_splitMode == wxSPLIT_VERTICAL ? w : h;
+        if ( m_sashPosition >= size - 5 )
+            SetSashPositionAndNotify(wxMax(10, size - 40));

     }
     }

+
+    SizeWindows();

 }
 
 bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
 }
 
 bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)


@@ -407,148 +415,51 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
     if ( m_windowTwo == NULL || m_sashPosition == 0)
         return FALSE; // No sash
 
     if ( m_windowTwo == NULL || m_sashPosition == 0)
         return FALSE; // No sash
 

-    if ( m_splitMode == wxSPLIT_VERTICAL )
-    {
-        if ( (x >= m_sashPosition - tolerance) && (x <= m_sashPosition + m_sashSize + tolerance) )
-            return TRUE;
-        else
-            return FALSE;
-    }
-    else
-    {
-        if ( (y >= (m_sashPosition- tolerance)) && (y <= (m_sashPosition + m_sashSize + tolerance)) )
-            return TRUE;
-        else
-            return FALSE;
-    }
+    int z = m_splitMode == wxSPLIT_VERTICAL ? x : y;

 
 

-    return FALSE;
+    return z >= m_sashPosition - tolerance &&
+            z <= m_sashPosition + GetSashSize() + tolerance;

 }
 
 }
 

-// Draw 3D effect borders
-void wxSplitterWindow::DrawBorders(wxDC& dc)
+int wxSplitterWindow::GetSashSize() const

 {
 {

-    int w, h;
-    GetClientSize(&w, &h);
-
-    if ( GetWindowStyleFlag() & wxSP_3D )
-    {
-               
-        dc.SetPen(*m_facePen);
-        dc.SetBrush(*m_faceBrush);
-        dc.DrawRectangle(1, 1 , w-1, m_borderSize-2 ); //high
-        dc.DrawRectangle(1, m_borderSize-2 , m_borderSize-2, h-1 ); // left
-        dc.DrawRectangle(w-m_borderSize+2, m_borderSize-2 , w-1, h-1 ); // right
-        dc.DrawRectangle(m_borderSize-2, h-m_borderSize+2 , w-m_borderSize+2, h-1 ); //bottom
-
-        dc.SetPen(*m_mediumShadowPen);
-        dc.DrawLine(m_borderSize-2, m_borderSize-2, w-m_borderSize+1, m_borderSize-2);
-        dc.DrawLine(m_borderSize-2, m_borderSize-2, m_borderSize-2, h-m_borderSize+1);
-
-        dc.SetPen(*m_darkShadowPen);
-        dc.DrawLine(m_borderSize-1, m_borderSize-1, w-m_borderSize, m_borderSize-1);
-        dc.DrawLine(m_borderSize-1, m_borderSize-1, m_borderSize-1, h-m_borderSize);
-
-        dc.SetPen(*m_hilightPen);
-        dc.DrawLine(m_borderSize - 2, h-m_borderSize+1, w-m_borderSize+1, h-m_borderSize+1);
-        dc.DrawLine(w-m_borderSize+1, m_borderSize - 2, w-m_borderSize+1, h-m_borderSize+2); // Surely the maximum y pos. should be h - 1.
-                                     /// Anyway, h is required for MSW.
-
-        dc.SetPen(*m_lightShadowPen);
-        dc.DrawLine(w-m_borderSize, m_borderSize-1, w-m_borderSize, h-m_borderSize); // Right hand side
-        dc.DrawLine(m_borderSize-1, h-m_borderSize, w-m_borderSize+1, h-m_borderSize);     // Bottom
-    }
-    else if ( GetWindowStyleFlag() & wxSP_BORDER )
-    {
-        dc.SetBrush(*wxTRANSPARENT_BRUSH);
-        dc.SetPen(*wxBLACK_PEN);
-        dc.DrawRectangle(0, 0, w-1, h-1);
-    }
+    return wxRendererNative::Get().GetSplitterParams(this).widthSash;
+}

 
 

-    dc.SetPen(wxNullPen);
-    dc.SetBrush(wxNullBrush);
+int wxSplitterWindow::GetBorderSize() const
+{
+    return wxRendererNative::Get().GetSplitterParams(this).border;

 }
 
 // Draw the sash
 void wxSplitterWindow::DrawSash(wxDC& dc)
 {
 }
 
 // Draw the sash
 void wxSplitterWindow::DrawSash(wxDC& dc)
 {

-    if ( m_sashPosition == 0 || !m_windowTwo)
+    if (HasFlag(wxSP_3DBORDER))
+        wxRendererNative::Get().DrawSplitterBorder
+                            (
+                                this,
+                                dc,
+                                GetClientRect()
+                            );
+
+    // don't draw sash if we're not split
+    if ( m_sashPosition == 0 || !m_windowTwo )

         return;
 
         return;
 

-    int w, h;
-    GetClientSize(&w, &h);
-
-    if ( GetWindowStyleFlag() & wxSP_3D )
-    {
-        if ( m_splitMode == wxSPLIT_VERTICAL )
-        {
-            dc.SetPen(*m_facePen);
-            dc.SetBrush(*m_faceBrush);
-            dc.DrawRectangle(m_sashPosition + 2, 0 , m_sashSize - 4, h );
-
-            dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
-            dc.SetPen(*m_lightShadowPen);
-                       int xShadow = m_borderSize ? m_borderSize - 1 : 0 ;
-            dc.DrawLine(m_sashPosition, xShadow , m_sashPosition, h-m_borderSize);
-
-            dc.SetPen(*m_hilightPen);
-            dc.DrawLine(m_sashPosition+1, m_borderSize - 2, m_sashPosition+1, h - m_borderSize+2);
-
-            dc.SetPen(*m_mediumShadowPen);
-                       int yMedium = m_borderSize ? h-m_borderSize+1 : h ;
-            dc.DrawLine(m_sashPosition+m_sashSize-2, xShadow, m_sashPosition+m_sashSize-2, yMedium);
-
-            dc.SetPen(*m_darkShadowPen);
-            dc.DrawLine(m_sashPosition+m_sashSize-1, m_borderSize, m_sashPosition+m_sashSize-1, h-m_borderSize );
-        }
-        else
-        {
-            dc.SetPen(*m_facePen);
-            dc.SetBrush(*m_faceBrush);
-            dc.DrawRectangle( m_borderSize-2, m_sashPosition + 2, w-m_borderSize+2, m_sashSize - 4);
-
-            dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
-            dc.SetPen(*m_lightShadowPen);
-            dc.DrawLine(m_borderSize-1, m_sashPosition, w-m_borderSize, m_sashPosition);
-
-            dc.SetPen(*m_hilightPen);
-            dc.DrawLine(m_borderSize-2, m_sashPosition+1, w-m_borderSize+1, m_sashPosition+1);
-
-            dc.SetPen(*m_mediumShadowPen);
-            dc.DrawLine(m_borderSize-1, m_sashPosition+m_sashSize-2, w-m_borderSize+1, m_sashPosition+m_sashSize-2);
-
-            dc.SetPen(*m_darkShadowPen);
-            dc.DrawLine(m_borderSize, m_sashPosition+m_sashSize-1, w-m_borderSize, m_sashPosition+m_sashSize-1);
-        }
-    }
-    else
-    {
-        if ( m_splitMode == wxSPLIT_VERTICAL )
-        {
-            dc.SetPen(*wxBLACK_PEN);
-            dc.SetBrush(*wxBLACK_BRUSH);
-            int h1 = h-1;
-            if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER )
-                h1 += 1; // Not sure why this is necessary...
-            dc.DrawRectangle(m_sashPosition, 0, m_sashSize, h1);
-        }
-        else
-        {
-            dc.SetPen(*wxBLACK_PEN);
-            dc.SetBrush(*wxBLACK_BRUSH);
-            int w1 = w-1;
-            if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER )
-                w1 ++;
-
-            dc.DrawRectangle(0, m_sashPosition, w1, m_sashSize);
-        }
-
-    }
+    // nor if we're configured to not show it
+    if ( HasFlag(wxSP_NOSASH) )
+        return;

 
 

-    dc.SetPen(wxNullPen);
-    dc.SetBrush(wxNullBrush);
+    wxRendererNative::Get().DrawSplitterSash
+                            (
+                                this,
+                                dc,
+                                GetClientSize(),
+                                m_sashPosition,
+                                m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL
+                                                                : wxHORIZONTAL,
+                                m_isHot ? wxCONTROL_CURRENT : 0
+                            );

 }
 
 // Draw the sash tracker (for whilst moving the sash)
 }
 
 // Draw the sash tracker (for whilst moving the sash)


@@ -602,9 +513,76 @@ void wxSplitterWindow::DrawSashTracker(int x, int y)
     screenDC.DrawLine(x1, y1, x2, y2);
 
     screenDC.SetLogicalFunction(wxCOPY);
     screenDC.DrawLine(x1, y1, x2, y2);
 
     screenDC.SetLogicalFunction(wxCOPY);

+}

 
 

-    screenDC.SetPen(wxNullPen);
-    screenDC.SetBrush(wxNullBrush);
+int wxSplitterWindow::GetWindowSize() const
+{
+    wxSize size = GetClientSize();
+
+    return m_splitMode == wxSPLIT_VERTICAL ? size.x : size.y;
+}
+
+int wxSplitterWindow::AdjustSashPosition(int sashPos) const
+{
+    int window_size = GetWindowSize();
+
+    wxWindow *win;
+
+    win = GetWindow1();
+    if ( win )
+    {
+        // the window shouldn't be smaller than its own minimal size nor
+        // smaller than the minimual pane size specified for this splitter
+        int minSize = m_splitMode == wxSPLIT_VERTICAL ? win->GetMinWidth()
+                                                      : win->GetMinHeight();
+
+        if ( minSize == -1 || m_minimumPaneSize > minSize )
+            minSize = m_minimumPaneSize;
+
+        minSize += GetBorderSize();
+
+        if ( sashPos < minSize )
+            sashPos = minSize;
+    }
+
+    win = GetWindow2();
+    if ( win )
+    {
+        int minSize = m_splitMode == wxSPLIT_VERTICAL ? win->GetMinWidth()
+                                                      : win->GetMinHeight();
+
+        if ( minSize == -1 || m_minimumPaneSize > minSize )
+            minSize = m_minimumPaneSize;
+
+        int maxSize = window_size - minSize - GetBorderSize();
+        if ( sashPos > maxSize )
+            sashPos = maxSize;
+    }
+
+    return sashPos;
+}
+
+bool wxSplitterWindow::DoSetSashPosition(int sashPos)
+{
+    int newSashPosition = AdjustSashPosition(sashPos);
+
+    if ( newSashPosition == m_sashPosition )
+        return FALSE;
+
+    m_sashPosition = newSashPosition;
+
+    return TRUE;
+}
+
+void wxSplitterWindow::SetSashPositionAndNotify(int sashPos)
+{
+    if ( DoSetSashPosition(sashPos) )
+    {
+        wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this);
+        event.m_data.pos = m_sashPosition;
+
+        (void)DoSendEvent(event);
+    }

 }
 
 // Position and size subwindows.
 }
 
 // Position and size subwindows.


@@ -612,115 +590,129 @@ void wxSplitterWindow::DrawSashTracker(int x, int y)
 // including the edges next to the sash.
 void wxSplitterWindow::SizeWindows()
 {
 // including the edges next to the sash.
 void wxSplitterWindow::SizeWindows()
 {

+    // check if we have delayed setting the real sash position
+    if ( m_requestedSashPosition != INT_MAX )
+    {
+        int newSashPosition = ConvertSashPosition(m_requestedSashPosition);
+        if ( newSashPosition != m_sashPosition )
+        {
+            DoSetSashPosition(newSashPosition);
+        }
+
+        if ( newSashPosition <= m_sashPosition
+            && newSashPosition >= m_sashPosition - GetBorderSize() )
+        {
+            // don't update it any more
+            m_requestedSashPosition = INT_MAX;
+        }
+    }
+

     int w, h;
     GetClientSize(&w, &h);
 
     int w, h;
     GetClientSize(&w, &h);
 

-    if ( m_windowOne && !m_windowTwo )
+    if ( GetWindow1() && !GetWindow2() )

     {
     {

-        m_windowOne->SetSize(m_borderSize, m_borderSize, w - 2*m_borderSize, h - 2*m_borderSize);
-       
-       if (m_windowOne->GetAutoLayout())
-           m_windowOne->Layout();
+        GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(),
+                              w - 2*GetBorderSize(), h - 2*GetBorderSize());

     }
     }

-    else if ( m_windowOne && m_windowTwo )
+    else if ( GetWindow1() && GetWindow2() )

     {
     {

-        if (m_splitMode == wxSPLIT_VERTICAL)
+        const int border = GetBorderSize(),
+                  sash = GetSashSize();
+
+        int size1 = GetSashPosition() - border,
+            size2 = GetSashPosition() + sash;
+
+        int x2, y2, w1, h1, w2, h2;
+        if ( GetSplitMode() == wxSPLIT_VERTICAL )

         {
         {

-            int x1 = m_borderSize;
-            int y1 = m_borderSize;
-            int w1 = m_sashPosition - m_borderSize;
-            int h1 = h - 2*m_borderSize;
-
-            int x2 = m_sashPosition + m_sashSize;
-            int y2 = m_borderSize;
-            int w2 = w - 2*m_borderSize - m_sashSize - w1;
-            int h2 = h - 2*m_borderSize;
-
-            m_windowOne->SetSize(x1, y1, w1, h1);
-            m_windowTwo->SetSize(x2, y2, w2, h2);
-       
-           if (m_windowOne->GetAutoLayout())
-               m_windowOne->Layout();
-           if (m_windowTwo->GetAutoLayout())
-               m_windowTwo->Layout();
+            w1 = size1;
+            w2 = w - 2*border - sash - w1;
+            h1 =
+            h2 = h - 2*border;
+            x2 = size2;
+            y2 = border;

         }
         }

-        else
+        else // horz splitter

         {
         {

-            m_windowOne->SetSize(m_borderSize, m_borderSize,
-                w - 2*m_borderSize, m_sashPosition - m_borderSize);
-            m_windowTwo->SetSize(m_borderSize, m_sashPosition + m_sashSize,
-                w - 2*m_borderSize, h - 2*m_borderSize - m_sashSize - (m_sashPosition - m_borderSize));
-               
-           if (m_windowOne->GetAutoLayout())
-               m_windowOne->Layout();
-           if (m_windowTwo->GetAutoLayout())
-               m_windowTwo->Layout();
+            w1 =
+            w2 = w - 2*border;
+            h1 = size1;
+            h2 = h - 2*border - sash - h1;
+            x2 = border;
+            y2 = size2;

         }
         }

+
+        GetWindow1()->SetSize(border, border, w1, h1);
+        GetWindow2()->SetSize(x2, y2, w2, h2);

     }
     }

+

     wxClientDC dc(this);
     wxClientDC dc(this);

-       if ( m_borderSize > 0 )
-               DrawBorders(dc);

     DrawSash(dc);
     DrawSash(dc);

+
+    SetNeedUpdating(FALSE);

 }
 
 // Set pane for unsplit window
 void wxSplitterWindow::Initialize(wxWindow *window)
 {
 }
 
 // Set pane for unsplit window
 void wxSplitterWindow::Initialize(wxWindow *window)
 {

+    wxASSERT_MSG( window && window->GetParent() == this,
+                  _T("windows in the splitter should have it as parent!") );
+

     m_windowOne = window;
     m_windowTwo = (wxWindow *) NULL;
     m_windowOne = window;
     m_windowTwo = (wxWindow *) NULL;

-    m_sashPosition = 0;
+    DoSetSashPosition(0);

 }
 
 // Associates the given window with window 2, drawing the appropriate sash
 // and changing the split mode.
 // Does nothing and returns FALSE if the window is already split.
 }
 
 // Associates the given window with window 2, drawing the appropriate sash
 // and changing the split mode.
 // Does nothing and returns FALSE if the window is already split.

-bool wxSplitterWindow::SplitVertically(wxWindow *window1, wxWindow *window2, int sashPosition)
+bool wxSplitterWindow::DoSplit(wxSplitMode mode,
+                               wxWindow *window1, wxWindow *window2,
+                               int sashPosition)

 {
     if ( IsSplit() )
         return FALSE;
 
 {
     if ( IsSplit() )
         return FALSE;
 

-    int w, h;
-    GetClientSize(&w, &h);
+    wxCHECK_MSG( window1 && window2, FALSE,
+                 _T("can not split with NULL window(s)") );

 
 

-    m_splitMode = wxSPLIT_VERTICAL;
+    wxCHECK_MSG( window1->GetParent() == this && window2->GetParent() == this, FALSE,
+                  _T("windows in the splitter should have it as parent!") );
+
+    m_splitMode = mode;

     m_windowOne = window1;
     m_windowTwo = window2;
     m_windowOne = window1;
     m_windowTwo = window2;

-    if ( sashPosition > 0 )
-        m_sashPosition = sashPosition;
-    else if ( sashPosition < 0 )
-        m_sashPosition = w - sashPosition;
-    else    // default
-        m_sashPosition = w/2;
+
+    // remember the sash position we want to set for later if we can't set it
+    // right now (e.g. because the window is too small)
+    m_requestedSashPosition = sashPosition;
+
+    DoSetSashPosition(ConvertSashPosition(sashPosition));

 
     SizeWindows();
 
     return TRUE;
 }
 
 
     SizeWindows();
 
     return TRUE;
 }
 

-bool wxSplitterWindow::SplitHorizontally(wxWindow *window1, wxWindow *window2, int sashPosition)
+int wxSplitterWindow::ConvertSashPosition(int sashPosition) const

 {
 {

-    if ( IsSplit() )
-        return FALSE;
-
-    int w, h;
-    GetClientSize(&w, &h);
-
-    m_splitMode = wxSPLIT_HORIZONTAL;
-    m_windowOne = window1;
-    m_windowTwo = window2;

     if ( sashPosition > 0 )
     if ( sashPosition > 0 )

-        m_sashPosition = sashPosition;
+    {
+        return sashPosition;
+    }

     else if ( sashPosition < 0 )
     else if ( sashPosition < 0 )

-        m_sashPosition = h - sashPosition;
-    else    // default
-        m_sashPosition = h/2;
-
-    SizeWindows();
-
-    return TRUE;
+    {
+        // It's negative so adding is subtracting
+        return GetWindowSize() + sashPosition;
+    }
+    else // sashPosition == 0
+    {
+        // default, put it in the centre
+        return GetWindowSize() / 2;
+    }

 }
 
 }
 

-

 // Remove the specified (or second) window from the view
 // Doesn't actually delete the window.
 bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
 // Remove the specified (or second) window from the view
 // Doesn't actually delete the window.
 bool wxSplitterWindow::Unsplit(wxWindow *toRemove)


@@ -747,8 +739,8 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    SendUnsplitEvent(win);
-    m_sashPosition = 0;
+    OnUnsplit(win);
+    DoSetSashPosition(0);

     SizeWindows();
 
     return TRUE;
     SizeWindows();
 
     return TRUE;


@@ -780,9 +772,15 @@ bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
     return TRUE;
 }
 
     return TRUE;
 }
 

+void wxSplitterWindow::SetMinimumPaneSize(int min)
+{
+    m_minimumPaneSize = min;
+    SetSashPosition(m_sashPosition); // re-check limits
+}
+

 void wxSplitterWindow::SetSashPosition(int position, bool redraw)
 {
 void wxSplitterWindow::SetSashPosition(int position, bool redraw)
 {

-    m_sashPosition = position;
+    DoSetSashPosition(position);

 
     if ( redraw )
     {
 
     if ( redraw )
     {


@@ -790,70 +788,38 @@ void wxSplitterWindow::SetSashPosition(int position, bool redraw)
     }
 }
 
     }
 }
 

-// Initialize colours
-void wxSplitterWindow::InitColours()
+bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event)

 {
 {

-    wxDELETE( m_facePen );
-    wxDELETE( m_faceBrush );
-    wxDELETE( m_mediumShadowPen );
-    wxDELETE( m_darkShadowPen );
-    wxDELETE( m_lightShadowPen );
-    wxDELETE( m_hilightPen );
-
-    // Shadow colours
-#if defined(__WIN95__)
-    wxColour faceColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-    m_facePen = new wxPen(faceColour, 1, wxSOLID);
-    m_faceBrush = new wxBrush(faceColour, wxSOLID);
-
-    wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
-    m_mediumShadowPen = new wxPen(mediumShadowColour, 1, wxSOLID);
-
-    wxColour darkShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW));
-    m_darkShadowPen = new wxPen(darkShadowColour, 1, wxSOLID);
-
-    wxColour lightShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT));
-    m_lightShadowPen = new wxPen(lightShadowColour, 1, wxSOLID);
-
-    wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT));
-    m_hilightPen = new wxPen(hilightColour, 1, wxSOLID);
-#else // !Win32
-    m_facePen = new wxPen("LIGHT GREY", 1, wxSOLID);
-    m_faceBrush = new wxBrush("LIGHT GREY", wxSOLID);
-    m_mediumShadowPen = new wxPen("GREY", 1, wxSOLID);
-    m_darkShadowPen = new wxPen("BLACK", 1, wxSOLID);
-    m_lightShadowPen = new wxPen("LIGHT GREY", 1, wxSOLID);
-    m_hilightPen = new wxPen("WHITE", 1, wxSOLID);
-#endif // Win32/!Win32
-}
-
-void wxSplitterWindow::SendUnsplitEvent(wxWindow *winRemoved)
-{
-    wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
-    event.m_data.win = winRemoved;
-
-    (void)GetEventHandler()->ProcessEvent(event);
+    return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed();

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------

-// splitter event handlers
+// wxSplitterWindow virtual functions: they now just generate the events

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-void wxSplitterWindow::OnSashPosChanged(wxSplitterEvent& event)
+bool wxSplitterWindow::OnSashPositionChange(int WXUNUSED(newSashPosition))
+{
+    // always allow by default
+    return TRUE;
+}
+
+int wxSplitterWindow::OnSashPositionChanging(int newSashPosition)

 {
     // If within UNSPLIT_THRESHOLD from edge, set to edge to cause closure.
     const int UNSPLIT_THRESHOLD = 4;
 
 {
     // If within UNSPLIT_THRESHOLD from edge, set to edge to cause closure.
     const int UNSPLIT_THRESHOLD = 4;
 

-    int newSashPosition = event.GetSashPosition();
+    // first of all, check if OnSashPositionChange() doesn't forbid this change
+    if ( !OnSashPositionChange(newSashPosition) )
+    {
+        // it does
+        return -1;
+    }

 
     // Obtain relevant window dimension for bottom / right threshold check
 
     // Obtain relevant window dimension for bottom / right threshold check

-    int w, h;
-    GetClientSize(&w, &h);
-    int window_size = (m_splitMode == wxSPLIT_VERTICAL) ? w : h ;
+    int window_size = GetWindowSize();

 
     bool unsplit_scenario = FALSE;
 
     bool unsplit_scenario = FALSE;

-    if ( m_permitUnsplitAlways
-            || m_minimumPaneSize == 0 )
+    if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 )

     {
         // Do edge detection if unsplit premitted
         if ( newSashPosition <= UNSPLIT_THRESHOLD )
     {
         // Do edge detection if unsplit premitted
         if ( newSashPosition <= UNSPLIT_THRESHOLD )


@@ -873,10 +839,7 @@ void wxSplitterWindow::OnSashPosChanged(wxSplitterEvent& event)
     if ( !unsplit_scenario )
     {
         // If resultant pane would be too small, enlarge it
     if ( !unsplit_scenario )
     {
         // If resultant pane would be too small, enlarge it

-        if ( newSashPosition < m_minimumPaneSize )
-            newSashPosition = m_minimumPaneSize;
-        if ( newSashPosition > window_size - m_minimumPaneSize )
-            newSashPosition = window_size - m_minimumPaneSize;
+        newSashPosition = AdjustSashPosition(newSashPosition);

     }
 
     // If the result is out of bounds it means minimum size is too big,
     }
 
     // If the result is out of bounds it means minimum size is too big,


@@ -884,35 +847,77 @@ void wxSplitterWindow::OnSashPosChanged(wxSplitterEvent& event)
     if ( newSashPosition < 0 || newSashPosition > window_size )
         newSashPosition = window_size / 2;
 
     if ( newSashPosition < 0 || newSashPosition > window_size )
         newSashPosition = window_size / 2;
 

-    // for compatibility, call the virtual function
-    if ( !OnSashPositionChange(newSashPosition) )
+    // now let the event handler have it
+    //
+    // FIXME: shouldn't we do it before the adjustments above so as to ensure
+    //        that the sash position is always reasonable?
+    wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, this);
+    event.m_data.pos = newSashPosition;
+
+    if ( !DoSendEvent(event) )

     {
     {

+        // the event handler vetoed the change

         newSashPosition = -1;
     }
         newSashPosition = -1;
     }

+    else
+    {
+        // it could have been changed by it
+        newSashPosition = event.GetSashPosition();
+    }

 
 

-    event.SetSashPosition(newSashPosition);
+    return newSashPosition;

 }
 
 // Called when the sash is double-clicked. The default behaviour is to remove
 // the sash if the minimum pane size is zero.
 }
 
 // Called when the sash is double-clicked. The default behaviour is to remove
 // the sash if the minimum pane size is zero.

-void wxSplitterWindow::OnDoubleClick(wxSplitterEvent& event)
+void wxSplitterWindow::OnDoubleClickSash(int x, int y)

 {
 {

-    // for compatibility, call the virtual function
-    OnDoubleClickSash(event.GetX(), event.GetY());
+    wxCHECK_RET(m_windowTwo, wxT("splitter: no window to remove"));

 
 

-    if ( GetMinimumPaneSize() == 0
-        || m_permitUnsplitAlways)
+    // new code should handle events instead of using the virtual functions
+    wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, this);
+    event.m_data.pt.x = x;
+    event.m_data.pt.y = y;
+    if ( DoSendEvent(event) )

     {
     {

-        Unsplit();
+        if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways )
+        {
+            wxWindow* win = m_windowTwo;
+            if ( Unsplit(win) )
+            {
+                wxSplitterEvent unsplitEvent(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+                unsplitEvent.m_data.win = win;
+                (void)DoSendEvent(unsplitEvent);
+            }
+        }

     }
     }

+    //else: blocked by user

 }
 
 }
 

-void wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)
+void wxSplitterWindow::OnUnsplit(wxWindow *winRemoved)

 {
 {

-    wxWindow *win = event.GetWindowBeingRemoved();
+    // call this before calling the event handler which may delete the window
+    winRemoved->Show(FALSE);
+}

 
 

-    // for compatibility, call the virtual function
-    OnUnsplit(win);
+#if defined( __WXMSW__ ) || defined( __WXMAC__)
+
+// this is currently called (and needed) under MSW only...
+void wxSplitterWindow::OnSetCursor(wxSetCursorEvent& event)
+{
+    // if we don't do it, the resizing cursor might be set for child window:
+    // and like this we explicitly say that our cursor should not be used for
+    // children windows which overlap us

 
 

-    win->Show(FALSE);
+    if ( SashHitTest(event.GetX(), event.GetY()) )
+    {
+        // default processing is ok
+        event.Skip();
+    }
+    //else: do nothing, in particular, don't call Skip()

 }
 }

+
+#endif // wxMSW || wxMac
+
+#endif // wxUSE_SPLITTER
+