wxUSE_TOOLTIPS and wxUSE_IMAGE furthur fixes

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index f5e8b7985574da315dd73d5bd90d35a16d02eb0d..7c5d2354bdf3a0647d8976e7411a04b43e3117b6 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -1,79 +1,118 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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 <math.h>
-#include <stdlib.h>
+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif
+
+#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)
 

+/*
+    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)
     EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent)
 BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     EVT_PAINT(wxSplitterWindow::OnPaint)
     EVT_SIZE(wxSplitterWindow::OnSize)
     EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent)

+
+#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_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;
-}
+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)

 {
 {

+    // 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;
+
+    // FIXME: with this line the background is not erased at all under GTK1,
+    //        so temporary avoid it there
+#if !defined(__WXGTK__) || defined(__WXGTK20__)
+    // don't erase the splitter background, it's pointless as we overwrite it
+    // anyhow
+    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+#endif
+
+    return true;
+}
+
+void wxSplitterWindow::Init()
+{
+    m_container.SetContainerWindow(this);
+

     m_splitMode = wxSPLIT_VERTICAL;
     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;


@@ -81,88 +120,129 @@ 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_sashGravity = 0.0;
+    m_lastSize = wxSize(0,0);
+    m_checkRequestedSashPosition = false;

     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);

 }
 
 }
 

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

 {
 {

-    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(*wxSTANDARD_CURSOR);
+
+    RedrawIfHotSensitive(false);
+}
+
+void wxSplitterWindow::SetResizeCursor()
+{
+    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::OnInternalIdle()
+{
+    wxWindow::OnInternalIdle();
+
+    // if this is the first idle time after a sash position has potentially
+    // been set, allow SizeWindows to check for a requested size.
+    if (!m_checkRequestedSashPosition)
+    {
+        m_checkRequestedSashPosition = true;
+        SizeWindows();
+        return; // it won't needUpdating in this case
+    }
+
+    if (m_needUpdating)
+        SizeWindows();
+}
+

 void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 {
 void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 {

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

 
 

-    // reset the cursor
-#ifdef __WXMOTIF__
-    SetCursor(* wxSTANDARD_CURSOR);
+    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
+#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX == 1
+    bool isLive = true ;

 #else
 #else

-    SetCursor(wxCursor());
+    bool isLive = (GetWindowStyleFlag() & wxSP_LIVE_UPDATE) != 0;

 #endif
 #endif

-

     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);
+            }

 
 

-            DrawSashTracker(x, y);

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

+
+            SetResizeCursor();

             return;
         }
     }
             return;
         }
     }


@@ -170,260 +250,264 @@ 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

-        DrawSashTracker(m_oldX, m_oldY);
+        if ( !isLive )
+        {
+            DrawSashTracker(m_oldX, m_oldY);
+        }

 
 

-        int w, h;
-        GetClientSize(&w, &h);
-        if ( m_splitMode == wxSPLIT_VERTICAL )
+        // 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 )

         {
         {

-            if ( !OnSashPositionChange(x) )
-                return;
+            // change not allowed
+            return;
+        }

 
 

-            if ( x <= 4 )
+        if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 )
+        {
+            // Deal with possible unsplit scenarios
+            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;

-

                 OnUnsplit(removedWindow);
                 OnUnsplit(removedWindow);

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

             }
             }

-            else if ( x >= (w - 4) )
+            else if ( posSashNew == GetWindowSize() )

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

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

             }
             else
             {
             }
             else
             {

-                m_sashPosition = x;
+                SetSashPositionAndNotify(posSashNew);

             }
         }
             }
         }

-        else  // m_splitMode == wxSPLIT_VERTICAL
+        else

         {
         {

-            if ( !OnSashPositionChange(y) )
-                return;
-
-            if ( y <= 4 )
-            {
-                // We remove the first window from the view
-                wxWindow *removedWindow = m_windowOne;
-                m_windowOne = m_windowTwo;
-                m_windowTwo = (wxWindow *) NULL;
+            SetSashPositionAndNotify(posSashNew);
+        }

 
 

-                OnUnsplit(removedWindow);
-                m_sashPosition = 0;
-            }
-            else if ( y >= (h - 4) )
-            {
-                // We remove the second window from the view
-                wxWindow *removedWindow = m_windowTwo;
-                m_windowTwo = (wxWindow *) NULL;
-                OnUnsplit(removedWindow);
-                m_sashPosition = 0;
-            }
-            else
-            {
-                m_sashPosition = y;
-            }
-        } // m_splitMode == wxSPLIT_VERTICAL

         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);
-                }
-        }
+        if ( event.Leaving() || !SashHitTest(x, y) )
+            OnLeaveSash();
+        else
+            OnEnterSash();

     }
     }

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

     {
     {

+        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;
+        }
+
+        int posSashOld = isLive ? m_sashPosition : m_sashPositionCurrent;
+        int posSashNew = OnSashPositionChanging(posSashOld + diff);
+        if ( posSashNew == -1 )
+        {
+            // change not allowed
+            return;
+        }
+
+        if ( posSashNew == m_sashPosition )
+            return;
+

         // Erase old tracker
         // Erase old tracker

-        DrawSashTracker(m_oldX, m_oldY);
+        if ( !isLive )
+        {
+            DrawSashTracker(m_oldX, m_oldY);
+        }

 
 

-        // Draw new one
-        DrawSashTracker(x, y);
+        if (m_splitMode == wxSPLIT_VERTICAL)
+            x = posSashNew;
+        else
+            y = posSashNew;

 
 

+        // Remember old positions

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

-    }
-    else if ( event.LeftDClick() )
-    {
-        OnDoubleClickSash(x, y);
-    }
-}

 
 

-void wxSplitterWindow::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-    int cw, ch;
-    GetClientSize( &cw, &ch );
-    if ( m_windowTwo )
-    {
-        if ( m_splitMode == wxSPLIT_VERTICAL )
+#ifdef __WXMSW__
+        // As we captured the mouse, we may get the mouse events from outside
+        // our window - for example, negative values in x, y. This has a weird
+        // consequence under MSW where we use unsigned values sometimes and
+        // signed ones other times: the coordinates turn as big positive
+        // numbers and so the sash is drawn on the *right* side of the window
+        // instead of the left (or bottom instead of top). Correct this.
+        if ( (short)m_oldX < 0 )
+            m_oldX = 0;
+        if ( (short)m_oldY < 0 )
+            m_oldY = 0;
+#endif // __WXMSW__
+
+        // Draw new one
+        if ( !isLive )

         {
         {

-            if ( m_sashPosition >= (cw - 5) )
-                m_sashPosition = wxMax(10, cw - 40);
+            m_sashPositionCurrent = posSashNew;
+
+            DrawSashTracker(m_oldX, m_oldY);

         }
         }

-        if ( m_splitMode == wxSPLIT_HORIZONTAL )
+        else

         {
         {

-            if ( m_sashPosition >= (ch - 5) )
-                m_sashPosition = wxMax(10, ch - 40);
+            SetSashPositionAndNotify(posSashNew);
+            m_needUpdating = true;

         }
     }
         }
     }

-    SizeWindows();
+    else if ( event.LeftDClick() && m_windowTwo )
+    {
+        OnDoubleClickSash(x, y);
+    }

 }
 
 }
 

-bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
+void wxSplitterWindow::OnSize(wxSizeEvent& event)

 {
 {

-    if ( m_windowTwo == NULL || m_sashPosition == 0)
-        return FALSE; // No sash
-
-    if ( m_splitMode == wxSPLIT_VERTICAL )
+    // only process this message if we're not iconized - otherwise iconizing
+    // and restoring a window containing the splitter has a funny side effect
+    // of changing the splitter position!
+    wxWindow *parent = wxGetTopLevelParent(this);
+    bool iconized;
+
+    wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow);
+    if ( winTop )

     {
     {

-        if ( (x >= m_sashPosition - tolerance) && (x <= m_sashPosition + m_sashSize + tolerance) )
-            return TRUE;
-        else
-            return FALSE;
+        iconized = winTop->IsIconized();

     }
     else
     {
     }
     else
     {

-        if ( (y >= (m_sashPosition- tolerance)) && (y <= (m_sashPosition + m_sashSize + tolerance)) )
-            return TRUE;
-        else
-            return FALSE;
-    }
-
-    return FALSE;
-}
+        wxFAIL_MSG(wxT("should have a top level parent!"));

 
 

-// Draw 3D effect borders
-void wxSplitterWindow::DrawBorders(wxDC& dc)
-{
-    int w, h;
-    GetClientSize(&w, &h);
+        iconized = false;
+    }

 
 

-    if ( GetWindowStyleFlag() & wxSP_3D )
+    if ( iconized )

     {
     {

-        dc.SetPen(*m_mediumShadowPen);
-        dc.DrawLine(0, 0, w-1, 0);
-        dc.DrawLine(0, 0, 0, h - 1);
-
-        dc.SetPen(*m_darkShadowPen);
-        dc.DrawLine(1, 1, w-2, 1);
-        dc.DrawLine(1, 1, 1, h-2);
+        m_lastSize = wxSize(0,0);

 
 

-        dc.SetPen(*m_hilightPen);
-        dc.DrawLine(0, h-1, w-1, h-1);
-        dc.DrawLine(w-1, 0, w-1, h); // Surely the maximum y pos. should be h - 1.
-                                     /// Anyway, h is required for MSW.
+        event.Skip();

 
 

-        dc.SetPen(*m_lightShadowPen);
-        dc.DrawLine(w-2, 1, w-2, h-2); // Right hand side
-        dc.DrawLine(1, h-2, w-1, h-2);     // Bottom
-    }
-    else if ( GetWindowStyleFlag() & wxSP_BORDER )
-    {
-        dc.SetBrush(*wxTRANSPARENT_BRUSH);
-        dc.SetPen(*wxBLACK_PEN);
-        dc.DrawRectangle(0, 0, w-1, h-1);
+        return;

     }
 
     }
 

-    dc.SetPen(wxNullPen);
-    dc.SetBrush(wxNullBrush);
-}
-
-// Draw the sash
-void wxSplitterWindow::DrawSash(wxDC& dc)
-{
-    if ( m_sashPosition == 0 || !m_windowTwo)
-        return;
+    if ( m_windowTwo )
+    {
+        int w, h;
+        GetClientSize(&w, &h);

 
 

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

 
 

-    if ( GetWindowStyleFlag() & wxSP_3D )
-    {
-        if ( m_splitMode == wxSPLIT_VERTICAL )
+        int old_size = m_splitMode == wxSPLIT_VERTICAL ? m_lastSize.x : m_lastSize.y;
+        if ( old_size != 0 )

         {
         {

-            dc.SetPen(*m_facePen);
-            dc.SetBrush(*m_faceBrush);
-            dc.DrawRectangle(m_sashPosition + 2, 0, m_sashSize - 4, h);
-
-            dc.SetBrush(*wxTRANSPARENT_BRUSH);
+            int delta = (int) ( (size - old_size)*m_sashGravity );
+            if ( delta != 0 )
+            {
+                int newPosition = m_sashPosition + delta;
+                if( newPosition < m_minimumPaneSize )
+                    newPosition = m_minimumPaneSize;
+                SetSashPositionAndNotify(newPosition);
+            }
+        }

 
 

-            dc.SetPen(*m_lightShadowPen);
-            dc.DrawLine(m_sashPosition, 1, m_sashPosition, h-2);
+        if ( m_sashPosition >= size - 5 )
+            SetSashPositionAndNotify(wxMax(10, size - 40));
+        m_lastSize = wxSize(w,h);
+    }

 
 

-            dc.SetPen(*m_hilightPen);
-            dc.DrawLine(m_sashPosition+1, 0, m_sashPosition+1, h);
+    SizeWindows();
+}

 
 

-            dc.SetPen(*m_mediumShadowPen);
-            dc.DrawLine(m_sashPosition+m_sashSize-2, 1, m_sashPosition+m_sashSize-2, h-1);
+void wxSplitterWindow::SetSashGravity(double gravity)
+{
+    wxCHECK_RET( gravity >= 0. && gravity <= 1.,
+                    _T("invalid gravity value") );

 
 

-            dc.SetPen(*m_darkShadowPen);
-            dc.DrawLine(m_sashPosition+m_sashSize-1, 2, m_sashPosition+m_sashSize-1, h-2);
-        }
-        else
-        {
-            dc.SetPen(*m_facePen);
-            dc.SetBrush(*m_faceBrush);
-            dc.DrawRectangle(0, m_sashPosition + 2, w, m_sashSize - 4);
+    m_sashGravity = gravity;
+}

 
 

-            dc.SetBrush(*wxTRANSPARENT_BRUSH);
+bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
+{
+    if ( m_windowTwo == NULL || m_sashPosition == 0)
+        return false; // No sash

 
 

-            dc.SetPen(*m_lightShadowPen);
-            dc.DrawLine(1, m_sashPosition, w-2, m_sashPosition);
+    int z = m_splitMode == wxSPLIT_VERTICAL ? x : y;
+    int hitMin = m_sashPosition - tolerance;
+    int hitMax = m_sashPosition + GetSashSize() + tolerance;

 
 

-            dc.SetPen(*m_hilightPen);
-            dc.DrawLine(0, m_sashPosition+1, w, m_sashPosition+1);
+    return z >=  hitMin && z <= hitMax;
+}

 
 

-            dc.SetPen(*m_mediumShadowPen);
-            dc.DrawLine(1, m_sashPosition+m_sashSize-2, w-1, m_sashPosition+m_sashSize-2);
+int wxSplitterWindow::GetSashSize() const
+{
+    return wxRendererNative::Get().GetSplitterParams(this).widthSash;
+}

 
 

-            dc.SetPen(*m_darkShadowPen);
-            dc.DrawLine(2, m_sashPosition+m_sashSize-1, w-2, 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 ++;
+int wxSplitterWindow::GetBorderSize() const
+{
+    return wxRendererNative::Get().GetSplitterParams(this).border;
+}

 
 

-            dc.DrawRectangle(0, m_sashPosition, w1, m_sashSize);
-        }
+// Draw the sash
+void wxSplitterWindow::DrawSash(wxDC& dc)
+{
+    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;

 
 

-    }
+    // 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 ? (int)wxCONTROL_CURRENT : 0
+                            );

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


@@ -470,16 +554,89 @@ void wxSplitterWindow::DrawSashTracker(int x, int y)
     ClientToScreen(&x1, &y1);
     ClientToScreen(&x2, &y2);
 
     ClientToScreen(&x1, &y1);
     ClientToScreen(&x2, &y2);
 

-    screenDC.SetLogicalFunction(wxXOR);
+    screenDC.SetLogicalFunction(wxINVERT);

     screenDC.SetPen(*m_sashTrackerPen);
     screenDC.SetBrush(*wxTRANSPARENT_BRUSH);
 
     screenDC.DrawLine(x1, y1, x2, y2);
 
     screenDC.SetLogicalFunction(wxCOPY);
     screenDC.SetPen(*m_sashTrackerPen);
     screenDC.SetBrush(*wxTRANSPARENT_BRUSH);
 
     screenDC.DrawLine(x1, y1, x2, y2);
 
     screenDC.SetLogicalFunction(wxCOPY);

+}
+
+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() - GetSashSize();
+        if ( sashPos > maxSize )
+            sashPos = maxSize;
+    }

 
 

-    screenDC.SetPen(wxNullPen);
-    screenDC.SetBrush(wxNullBrush);
+    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)
+{
+    // we must reset the request here, otherwise the sash would be stuck at
+    // old position if the user attempted to move the sash after invalid
+    // (e.g. smaller than minsize) sash position was requested using
+    // SetSashPosition():
+    m_requestedSashPosition = INT_MAX;
+
+    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.


@@ -487,109 +644,146 @@ 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_checkRequestedSashPosition && 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);
+        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);
+            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));
+            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);

-    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 && window->GetParent() == this)),
+                  _T("windows in the splitter should have it as parent!") );
+
+    if (! window->IsShown())
+        window->Show();
+

     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.
 }
 
 // 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)
+// Does nothing and returns false if the window is already split.
+bool wxSplitterWindow::DoSplit(wxSplitMode mode,
+                               wxWindow *window1, wxWindow *window2,
+                               int sashPosition)

 {
     if ( IsSplit() )
 {
     if ( IsSplit() )

-        return FALSE;
+        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!") );
+
+    if (! window1->IsShown())
+        window1->Show();
+    if (! window2->IsShown())
+        window2->Show();
+
+    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;
+    m_checkRequestedSashPosition = false;
+
+    DoSetSashPosition(ConvertSashPosition(sashPosition));

 
     SizeWindows();
 
 
     SizeWindows();
 

-    return TRUE;
+    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)
 {
     if ( ! IsSplit() )
 // Remove the specified (or second) window from the view
 // Doesn't actually delete the window.
 bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
 {
     if ( ! IsSplit() )

-        return FALSE;
+        return false;

 
 

-    wxWindow *win = NULL;
+    wxWindow *win;

     if ( toRemove == NULL || toRemove == m_windowTwo)
     {
         win = m_windowTwo ;
     if ( toRemove == NULL || toRemove == m_windowTwo)
     {
         win = m_windowTwo ;


@@ -603,23 +797,23 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG("splitter: attempt to remove a non-existent window");
+        wxFAIL_MSG(wxT("splitter: attempt to remove a non-existent window"));

 
 

-        return FALSE;
+        return false;

     }
 
     OnUnsplit(win);
     }
 
     OnUnsplit(win);

-    m_sashPosition = 0;
+    DoSetSashPosition(0);

     SizeWindows();
 
     SizeWindows();
 

-    return TRUE;
+    return true;

 }
 
 // Replace a window with another one
 bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
 {
 }
 
 // Replace a window with another one
 bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
 {

-    wxCHECK_MSG( winOld, FALSE, "use one of Split() functions instead" );
-    wxCHECK_MSG( winNew, FALSE, "use Unsplit() functions instead" );
+    wxCHECK_MSG( winOld, false, wxT("use one of Split() functions instead") );
+    wxCHECK_MSG( winNew, false, wxT("use Unsplit() functions instead") );

 
     if ( winOld == m_windowTwo )
     {
 
     if ( winOld == m_windowTwo )
     {


@@ -631,19 +825,31 @@ bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG("splitter: attempt to replace a non-existent window");
+        wxFAIL_MSG(wxT("splitter: attempt to replace a non-existent window"));

 
 

-        return FALSE;
+        return false;

     }
 
     SizeWindows();
 
     }
 
     SizeWindows();
 

-    return TRUE;
+    return true;
+}
+
+void wxSplitterWindow::SetMinimumPaneSize(int min)
+{
+    m_minimumPaneSize = min;
+    int pos = m_requestedSashPosition != INT_MAX ? m_requestedSashPosition : m_sashPosition;
+    SetSashPosition(pos); // re-check limits

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

-    m_sashPosition = position;
+    // 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 = position;
+    m_checkRequestedSashPosition = false;
+
+    DoSetSashPosition(ConvertSashPosition(position));

 
     if ( redraw )
     {
 
     if ( redraw )
     {


@@ -651,76 +857,186 @@ void wxSplitterWindow::SetSashPosition(int position, bool redraw)
     }
 }
 
     }
 }
 

-bool wxSplitterWindow::OnSashPositionChange(int newSashPosition)
+// Make sure the child window sizes are updated. This is useful
+// for reducing flicker by updating the sizes before a
+// window is shown, if you know the overall size is correct.
+void wxSplitterWindow::UpdateSize()

 {
 {

-  // is the left/upper pane too small?
-  if ( newSashPosition < m_minimumPaneSize )
-    return NULL;
+    m_checkRequestedSashPosition = true;
+    SizeWindows();
+    m_checkRequestedSashPosition = false;
+}
+
+bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event)
+{
+    return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed();
+}
+
+wxSize wxSplitterWindow::DoGetBestSize() const
+{
+    // get best sizes of subwindows
+    wxSize size1, size2;
+    if ( m_windowOne )
+        size1 = m_windowOne->GetBestSize();
+    if ( m_windowTwo )
+        size2 = m_windowTwo->GetBestSize();
+
+    // sum them
+    //
+    // pSash points to the size component to which sash size must be added
+    int *pSash;
+    wxSize sizeBest;
+    if ( m_splitMode == wxSPLIT_VERTICAL )
+    {
+        sizeBest.y = wxMax(size1.y, size2.y);
+        sizeBest.x = wxMax(size1.x, m_minimumPaneSize) +
+                        wxMax(size2.x, m_minimumPaneSize);

 
 

-  // is the right/lower pane too small?
-  int w, h;
-  GetClientSize(&w, &h);
+        pSash = &sizeBest.x;
+    }
+    else // wxSPLIT_HORIZONTAL
+    {
+        sizeBest.x = wxMax(size1.x, size2.x);
+        sizeBest.y = wxMax(size1.y, m_minimumPaneSize) +
+                        wxMax(size2.y, m_minimumPaneSize);
+
+        pSash = &sizeBest.y;
+    }

 
 

-  if ( m_splitMode == wxSPLIT_VERTICAL )
-  {
-    if ( w - newSashPosition < m_minimumPaneSize )
-      return FALSE;
-  }
-  else // m_splitMode = wxSPLIT_HORIZONTAL
-  {
-    if ( h - newSashPosition < m_minimumPaneSize )
-      return FALSE;
-  }
+    // account for the border and the sash
+    int border = 2*GetBorderSize();
+    *pSash += GetSashSize();
+    sizeBest.x += border;
+    sizeBest.y += border;

 
 

-  // it's ok to move sash
-  return TRUE;
+    return sizeBest;

 }
 
 }
 

-// Called when the sash is double-clicked.
-// The default behaviour is to remove the sash if the
-// minimum pane size is zero.
-void wxSplitterWindow::OnDoubleClickSash(int WXUNUSED(x), int WXUNUSED(y) )
+// ---------------------------------------------------------------------------
+// wxSplitterWindow virtual functions: they now just generate the events
+// ---------------------------------------------------------------------------
+
+bool wxSplitterWindow::OnSashPositionChange(int WXUNUSED(newSashPosition))

 {
 {

-    if ( GetMinimumPaneSize() == 0 )
+    // 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;
+
+    // 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
+    int window_size = GetWindowSize();
+
+    bool unsplit_scenario = false;
+    if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 )

     {
     {

-        Unsplit();
+        // Do edge detection if unsplit premitted
+        if ( newSashPosition <= UNSPLIT_THRESHOLD )
+        {
+            // threshold top / left check
+            newSashPosition = 0;
+            unsplit_scenario = true;
+        }
+        if ( newSashPosition >= window_size - UNSPLIT_THRESHOLD )
+        {
+            // threshold bottom/right check
+            newSashPosition = window_size;
+            unsplit_scenario = true;
+        }

     }
     }

+
+    if ( !unsplit_scenario )
+    {
+        // If resultant pane would be too small, enlarge it
+        newSashPosition = AdjustSashPosition(newSashPosition);
+    }
+
+    // If the result is out of bounds it means minimum size is too big,
+    // so split window in half as best compromise.
+    if ( newSashPosition < 0 || newSashPosition > window_size )
+        newSashPosition = window_size / 2;
+
+    // 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;
+    }
+    else
+    {
+        // it could have been changed by it
+        newSashPosition = event.GetSashPosition();
+    }
+
+    return newSashPosition;

 }
 
 }
 

-// Initialize colours
-void wxSplitterWindow::InitColours()
+// Called when the sash is double-clicked. The default behaviour is to remove
+// the sash if the minimum pane size is zero.
+void wxSplitterWindow::OnDoubleClickSash(int x, int y)

 {
 {

-    wxDELETE( m_facePen );
-    wxDELETE( m_faceBrush );
-    wxDELETE( m_mediumShadowPen );
-    wxDELETE( m_darkShadowPen );
-    wxDELETE( m_lightShadowPen );
-    wxDELETE( m_hilightPen );
+    wxCHECK_RET(m_windowTwo, wxT("splitter: no window to remove"));

 
 

-    // 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);
+    // 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) )
+    {
+        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
+}

 
 

-    wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
-    m_mediumShadowPen = new wxPen(mediumShadowColour, 1, wxSOLID);
+void wxSplitterWindow::OnUnsplit(wxWindow *winRemoved)
+{
+    // call this before calling the event handler which may delete the window
+    winRemoved->Show(false);
+}

 
 

-    wxColour darkShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW));
-    m_darkShadowPen = new wxPen(darkShadowColour, 1, wxSOLID);
+#if defined( __WXMSW__ ) || defined( __WXMAC__)

 
 

-    wxColour lightShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT));
-    m_lightShadowPen = new wxPen(lightShadowColour, 1, wxSOLID);
+// 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

 
 

-    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
+    if ( SashHitTest(event.GetX(), event.GetY(), 0) )
+    {
+        // default processing is ok
+        event.Skip();
+    }
+    //else: do nothing, in particular, don't call Skip()

 }
 
 }
 

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