virtualized m_row/col height/widths arrays

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 69ddce49e00d97d80ba5fa424509495b2d528db2..6950009cb04e290edb236e92fb8f9ebd38c0c86c 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -21,7 +21,9 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
+    #include "wx/window.h"
+    #include "wx/dialog.h"
+    #include "wx/frame.h"

 #endif
 
 #include <stdlib.h>
 #endif
 
 #include <stdlib.h>


@@ -29,25 +31,29 @@
 #include "wx/string.h"
 #include "wx/splitter.h"
 #include "wx/dcscreen.h"
 #include "wx/string.h"
 #include "wx/splitter.h"
 #include "wx/dcscreen.h"

+#include "wx/settings.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent)
 
 BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     EVT_PAINT(wxSplitterWindow::OnPaint)
     EVT_SIZE(wxSplitterWindow::OnSize)
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent)
 
 BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     EVT_PAINT(wxSplitterWindow::OnPaint)
     EVT_SIZE(wxSplitterWindow::OnSize)

+    EVT_IDLE(wxSplitterWindow::OnIdle)

     EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent)
 
     EVT_SPLITTER_SASH_POS_CHANGED(-1, wxSplitterWindow::OnSashPosChanged)
     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)
 END_EVENT_TABLE()
     EVT_SPLITTER_DCLICK(-1,           wxSplitterWindow::OnDoubleClick)
     EVT_SPLITTER_UNSPLIT(-1,          wxSplitterWindow::OnUnsplitEvent)
 END_EVENT_TABLE()

-#endif

 
 wxSplitterWindow::wxSplitterWindow()
 {
     m_splitMode = wxSPLIT_VERTICAL;
 
 wxSplitterWindow::wxSplitterWindow()
 {
     m_splitMode = wxSPLIT_VERTICAL;

+    m_permitUnsplitAlways = FALSE;

     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;


@@ -68,6 +74,7 @@ wxSplitterWindow::wxSplitterWindow()
     m_facePen = (wxPen *) NULL;
     m_hilightPen = (wxPen *) NULL;
     m_minimumPaneSize = 0;
     m_facePen = (wxPen *) NULL;
     m_hilightPen = (wxPen *) NULL;
     m_minimumPaneSize = 0;

+    m_needUpdating = FALSE;

 }
 
 wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id,
 }
 
 wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id,


@@ -78,6 +85,7 @@ wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id,
                 : wxWindow(parent, id, pos, size, style, name)
 {
     m_splitMode = wxSPLIT_VERTICAL;
                 : wxWindow(parent, id, pos, size, style, name)
 {
     m_splitMode = wxSPLIT_VERTICAL;

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

     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;


@@ -120,6 +128,8 @@ wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id,
 
     // For debugging purposes, to see the background.
 //    SetBackground(wxBLUE_BRUSH);
 
     // For debugging purposes, to see the background.
 //    SetBackground(wxBLUE_BRUSH);

+
+    m_needUpdating = FALSE;

 }
 
 wxSplitterWindow::~wxSplitterWindow()
 }
 
 wxSplitterWindow::~wxSplitterWindow()


@@ -144,11 +154,16 @@ void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
     DrawSash(dc);
 }
 
     DrawSash(dc);
 }
 

+void wxSplitterWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
+{
+    if (m_needUpdating)
+        SizeWindows();
+}

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

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

 
     // reset the cursor
 #ifdef __WXMOTIF__
 
     // reset the cursor
 #ifdef __WXMOTIF__


@@ -158,15 +173,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     SetCursor(wxCursor());
 #endif
 
     SetCursor(wxCursor());
 #endif
 

-    // under wxGTK the method above causes the mouse
-    // to flicker so we set the standard cursor only
-    // when leaving the window and when moving over
-    // non-sash parts of the window. this should work
-    // on the other platforms as well, but who knows.
-#ifdef __WXGTK__
-    if (event.Leaving())
-        SetCursor(* wxSTANDARD_CURSOR);
-#endif

 
     if (event.LeftDown())
     {
 
     if (event.LeftDown())
     {


@@ -176,9 +182,22 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 
             m_dragMode = wxSPLIT_DRAG_DRAGGING;
 
 
             m_dragMode = wxSPLIT_DRAG_DRAGGING;
 

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

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

+
+            if ( m_splitMode == wxSPLIT_VERTICAL )
+            {
+                SetCursor(*m_sashCursorWE);
+            }
+            else
+            {
+                SetCursor(*m_sashCursorNS);
+            }

             return;
         }
     }
             return;
         }
     }


@@ -189,7 +208,10 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         ReleaseMouse();
 
         // Erase old tracker
         ReleaseMouse();
 
         // Erase old tracker

-        DrawSashTracker(m_oldX, m_oldY);
+        if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
+        {
+            DrawSashTracker(m_oldX, m_oldY);
+        }

 
         // Obtain window size. We are only interested in the dimension the sash
         // splits up
 
         // Obtain window size. We are only interested in the dimension the sash
         // splits up


@@ -212,22 +234,31 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
             }
         }
 
             }
         }
 

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

         {
         {

-            // 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;
-        }
-        else if ( new_sash_position == window_size )
-        {
-            // We remove the second window from the view
-            wxWindow *removedWindow = m_windowTwo;
-            m_windowTwo = (wxWindow *) NULL;
-            SendUnsplitEvent(removedWindow);
-            m_sashPosition = 0;
+            // Deal with possible unsplit scenarios
+            if ( new_sash_position == 0 )
+            {
+                // 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;
+            }
+            else if ( new_sash_position == window_size )
+            {
+                // We remove the second window from the view
+                wxWindow *removedWindow = m_windowTwo;
+                m_windowTwo = (wxWindow *) NULL;
+                SendUnsplitEvent(removedWindow);
+                m_sashPosition = 0;
+            }
+            else
+            {
+                m_sashPosition = new_sash_position;
+            }

         }
         else
         {
         }
         else
         {


@@ -258,16 +289,80 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         }
 #endif // __WXGTK__
     }
         }
 #endif // __WXGTK__
     }

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

     {
     {

+#ifdef __WXMSW__
+        // Otherwise, the cursor sometimes reverts to the normal cursor
+        // during dragging.
+        if ( m_splitMode == wxSPLIT_VERTICAL )
+        {
+            SetCursor(*m_sashCursorWE);
+        }
+        else
+        {
+            SetCursor(*m_sashCursorNS);
+        }
+#endif
+
+        // 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 );
+
+        wxSplitterEvent eventSplitter(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING,
+                                      this);
+        eventSplitter.m_data.pos = new_sash_position;
+        if ( GetEventHandler()->ProcessEvent(eventSplitter) )
+        {
+            new_sash_position = eventSplitter.GetSashPosition();
+            if ( new_sash_position == -1 )
+            {
+                // change not allowed
+                return;
+            }
+        }
+

         // Erase old tracker
         // Erase old tracker

-        DrawSashTracker(m_oldX, m_oldY);
+        if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
+        {
+            DrawSashTracker(m_oldX, m_oldY);
+        }

 
 

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

 
 

-        m_oldX = x;
-        m_oldY = y;
+        if (new_sash_position != -1)
+        {
+            // Only modify if permitted
+            m_oldX = x;
+            m_oldY = y;
+        }
+
+#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 ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
+        {
+            DrawSashTracker(m_oldX, m_oldY);
+        }
+        else
+        {
+            m_sashPosition = new_sash_position;
+            m_needUpdating = TRUE;
+        }

     }
     else if ( event.LeftDClick() )
     {
     }
     else if ( event.LeftDClick() )
     {


@@ -280,24 +375,54 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     }
 }
 
     }
 }
 

-void wxSplitterWindow::OnSize(wxSizeEvent& WXUNUSED(event))
+void wxSplitterWindow::OnSize(wxSizeEvent& event)

 {
 {

-    int cw, ch;
-    GetClientSize( &cw, &ch );
-    if ( m_windowTwo )
+    // 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 = GetParent();
+    while ( parent && !parent->IsTopLevel() )

     {
     {

-        if ( m_splitMode == wxSPLIT_VERTICAL )
-        {
-            if ( m_sashPosition >= (cw - 5) )
-                m_sashPosition = wxMax(10, cw - 40);
-        }
-        if ( m_splitMode == wxSPLIT_HORIZONTAL )
+        parent = parent->GetParent();
+    }
+
+    bool iconized = FALSE;
+    wxFrame *frame = wxDynamicCast(parent, wxFrame);
+    if ( frame )
+        iconized = frame->IsIconized();
+    else
+    {
+        wxDialog *dialog = wxDynamicCast(parent, wxDialog);
+        if ( dialog )
+            iconized = dialog->IsIconized();
+        else
+            wxFAIL_MSG(wxT("should have a top level frame or dialog parent!"));
+    }
+
+    if ( iconized )
+    {
+        event.Skip();
+    }
+    else
+    {
+        int cw, ch;
+        GetClientSize( &cw, &ch );
+        if ( m_windowTwo )

         {
         {

-            if ( m_sashPosition >= (ch - 5) )
-                m_sashPosition = wxMax(10, ch - 40);
+            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);
+            }

         }
         }

+
+        SizeWindows();

     }
     }

-    SizeWindows();

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


@@ -319,8 +444,6 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
         else
             return FALSE;
     }
         else
             return FALSE;
     }

-
-    return FALSE;

 }
 
 // Draw 3D effect borders
 }
 
 // Draw 3D effect borders


@@ -331,22 +454,30 @@ void wxSplitterWindow::DrawBorders(wxDC& dc)
 
     if ( GetWindowStyleFlag() & wxSP_3D )
     {
 
     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.SetPen(*m_mediumShadowPen);

-        dc.DrawLine(0, 0, w-1, 0);
-        dc.DrawLine(0, 0, 0, h - 1);
+        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.SetPen(*m_darkShadowPen);

-        dc.DrawLine(1, 1, w-2, 1);
-        dc.DrawLine(1, 1, 1, h-2);
+        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.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.
+        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);
                                      /// Anyway, h is required for MSW.
 
         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
+        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 )
     {
     }
     else if ( GetWindowStyleFlag() & wxSP_BORDER )
     {


@@ -374,41 +505,43 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
         {
             dc.SetPen(*m_facePen);
             dc.SetBrush(*m_faceBrush);
         {
             dc.SetPen(*m_facePen);
             dc.SetBrush(*m_faceBrush);

-            dc.DrawRectangle(m_sashPosition + 2, 0, m_sashSize - 4, h);
+            dc.DrawRectangle(m_sashPosition + 2, 0 , m_sashSize - 4, h );

 
             dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
             dc.SetPen(*m_lightShadowPen);
 
             dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
             dc.SetPen(*m_lightShadowPen);

-            dc.DrawLine(m_sashPosition, 1, m_sashPosition, h-2);
+                        int xShadow = m_borderSize ? m_borderSize - 1 : 0 ;
+            dc.DrawLine(m_sashPosition, xShadow , m_sashPosition, h-m_borderSize);

 
             dc.SetPen(*m_hilightPen);
 
             dc.SetPen(*m_hilightPen);

-            dc.DrawLine(m_sashPosition+1, 0, m_sashPosition+1, h);
+            dc.DrawLine(m_sashPosition+1, m_borderSize - 2, m_sashPosition+1, h - m_borderSize+2);

 
             dc.SetPen(*m_mediumShadowPen);
 
             dc.SetPen(*m_mediumShadowPen);

-            dc.DrawLine(m_sashPosition+m_sashSize-2, 1, m_sashPosition+m_sashSize-2, h-1);
+                        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.SetPen(*m_darkShadowPen);

-            dc.DrawLine(m_sashPosition+m_sashSize-1, 2, m_sashPosition+m_sashSize-1, h-2);
+            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);
         }
         else
         {
             dc.SetPen(*m_facePen);
             dc.SetBrush(*m_faceBrush);

-            dc.DrawRectangle(0, m_sashPosition + 2, w, m_sashSize - 4);
+            dc.DrawRectangle( m_borderSize-2, m_sashPosition + 2, w-m_borderSize+2, m_sashSize - 4);

 
             dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
             dc.SetPen(*m_lightShadowPen);
 
             dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
             dc.SetPen(*m_lightShadowPen);

-            dc.DrawLine(1, m_sashPosition, w-2, m_sashPosition);
+            dc.DrawLine(m_borderSize-1, m_sashPosition, w-m_borderSize, m_sashPosition);

 
             dc.SetPen(*m_hilightPen);
 
             dc.SetPen(*m_hilightPen);

-            dc.DrawLine(0, m_sashPosition+1, w, m_sashPosition+1);
+            dc.DrawLine(m_borderSize-2, m_sashPosition+1, w-m_borderSize+1, m_sashPosition+1);

 
             dc.SetPen(*m_mediumShadowPen);
 
             dc.SetPen(*m_mediumShadowPen);

-            dc.DrawLine(1, m_sashPosition+m_sashSize-2, w-1, m_sashPosition+m_sashSize-2);
+            dc.DrawLine(m_borderSize-1, m_sashPosition+m_sashSize-2, w-m_borderSize+1, m_sashPosition+m_sashSize-2);

 
             dc.SetPen(*m_darkShadowPen);
 
             dc.SetPen(*m_darkShadowPen);

-            dc.DrawLine(2, m_sashPosition+m_sashSize-1, w-2, m_sashPosition+m_sashSize-1);
+            dc.DrawLine(m_borderSize, m_sashPosition+m_sashSize-1, w-m_borderSize, m_sashPosition+m_sashSize-1);

         }
     }
     else
         }
     }
     else


@@ -483,7 +616,7 @@ 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.SetPen(*m_sashTrackerPen);
     screenDC.SetBrush(*wxTRANSPARENT_BRUSH);
 


@@ -506,9 +639,7 @@ void wxSplitterWindow::SizeWindows()
     if ( m_windowOne && !m_windowTwo )
     {
         m_windowOne->SetSize(m_borderSize, m_borderSize, w - 2*m_borderSize, h - 2*m_borderSize);
     if ( m_windowOne && !m_windowTwo )
     {
         m_windowOne->SetSize(m_borderSize, m_borderSize, w - 2*m_borderSize, h - 2*m_borderSize);

-       
-       if (m_windowOne->GetAutoLayout())
-           m_windowOne->Layout();
+

     }
     else if ( m_windowOne && m_windowTwo )
     {
     }
     else if ( m_windowOne && m_windowTwo )
     {


@@ -526,11 +657,7 @@ void wxSplitterWindow::SizeWindows()
 
             m_windowOne->SetSize(x1, y1, w1, h1);
             m_windowTwo->SetSize(x2, y2, w2, h2);
 
             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();
+

         }
         else
         {
         }
         else
         {


@@ -538,15 +665,12 @@ void wxSplitterWindow::SizeWindows()
                 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));
                 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();
+

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

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

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


@@ -629,7 +753,7 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
     }
     else
     {
     }
     else
     {

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

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -644,8 +768,8 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
 // 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, _T("use one of Split() functions instead") );
-    wxCHECK_MSG( winNew, FALSE, _T("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 )
     {


@@ -657,7 +781,7 @@ bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
     }
     else
     {
     }
     else
     {

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

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -738,27 +862,34 @@ void wxSplitterWindow::OnSashPosChanged(wxSplitterEvent& event)
     GetClientSize(&w, &h);
     int window_size = (m_splitMode == wxSPLIT_VERTICAL) ? w : h ;
 
     GetClientSize(&w, &h);
     int window_size = (m_splitMode == wxSPLIT_VERTICAL) ? w : h ;
 

-    if ( newSashPosition <= UNSPLIT_THRESHOLD )
+    bool unsplit_scenario = FALSE;
+    if ( m_permitUnsplitAlways
+            || m_minimumPaneSize == 0 )

     {
     {

-        // threshold top / left check
-        newSashPosition = 0;
+        // 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;
+        }

     }
     }

-    else if ( newSashPosition >= window_size - UNSPLIT_THRESHOLD )
+
+    if ( !unsplit_scenario )

     {
     {

-        // threshold bottom/right check
-        newSashPosition = window_size;
+        // 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;

     }
 
     }
 

-    // If resultant pane would be too small, enlarge it.
-
-    // Check upper / left pane
-    if ( newSashPosition < m_minimumPaneSize )
-        newSashPosition = m_minimumPaneSize;
-
-    // Check lower / right pane (check even if sash was just adjusted)
-    if ( newSashPosition > window_size - m_minimumPaneSize )
-        newSashPosition = window_size - m_minimumPaneSize;
-

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


@@ -780,7 +911,7 @@ void wxSplitterWindow::OnDoubleClick(wxSplitterEvent& event)
     // for compatibility, call the virtual function
     OnDoubleClickSash(event.GetX(), event.GetY());
 
     // for compatibility, call the virtual function
     OnDoubleClickSash(event.GetX(), event.GetY());
 

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

     {
         Unsplit();
     }
     {
         Unsplit();
     }


@@ -790,8 +921,9 @@ void wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)
 {
     wxWindow *win = event.GetWindowBeingRemoved();
 
 {
     wxWindow *win = event.GetWindowBeingRemoved();
 

+    // do it before calling OnUnsplit() which may delete the window
+    win->Show(FALSE);
+

     // for compatibility, call the virtual function
     OnUnsplit(win);
     // for compatibility, call the virtual function
     OnUnsplit(win);

-
-    win->Show(FALSE);

 }
 }