Add handling of http errors to wxWebViewIE. Tidy up existing large case statement.

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index c5833830c88af4e8c57ef231d6f8178780c7cc33..1db5638513fc1c0c56fea11f27d81a69f55c58b5 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -118,10 +118,10 @@ void wxSplitterWindow::Init()
     m_oldX = 0;
     m_oldY = 0;
     m_sashStart = 0;
     m_oldX = 0;
     m_oldY = 0;
     m_sashStart = 0;

-    m_sashPosition = m_requestedSashPosition = 0;
+    m_sashPosition = 0;
+    m_requestedSashPosition = INT_MAX;

     m_sashGravity = 0.0;
     m_lastSize = wxSize(0,0);
     m_sashGravity = 0.0;
     m_lastSize = wxSize(0,0);

-    m_checkRequestedSashPosition = false;

     m_minimumPaneSize = 0;
     m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
     m_sashCursorNS = wxCursor(wxCURSOR_SIZENS);
     m_minimumPaneSize = 0;
     m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
     m_sashCursorNS = wxCursor(wxCURSOR_SIZENS);


@@ -193,20 +193,21 @@ void wxSplitterWindow::OnInternalIdle()
 {
     wxWindow::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)
+    // We may need to update the children sizes in two cases: either because
+    // we're in the middle of a live update as indicated by m_needUpdating or
+    // because we have a requested but not yet set sash position as indicated
+    // by m_requestedSashPosition having a valid value.
+    if ( m_needUpdating )

     {
     {

-        m_checkRequestedSashPosition = true;
-        SizeWindows();
-        return; // it won't needUpdating in this case
+        m_needUpdating = false;

     }
     }

-
-    if (m_needUpdating)
+    else if ( m_requestedSashPosition == INT_MAX )

     {
     {

-        m_needUpdating = false;
-        SizeWindows();
+        // We don't need to resize the children.
+        return;

     }
     }

+
+    SizeWindows();

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


@@ -434,37 +435,44 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
         return;
     }
 
         return;
     }
 

-    if ( m_windowTwo )
-    {
-        int w, h;
-        GetClientSize(&w, &h);
+    const wxSize curSize = event.GetSize();

 
 

-        int size = m_splitMode == wxSPLIT_VERTICAL ? w : h;
+    // Update the sash position if needed.
+    //
+    // Notice that we shouldn't do this if the sash position requested by user
+    // couldn't be set yet as it would never be taken into account at all if we
+    // modified it before this happens.
+    if ( m_windowTwo && m_requestedSashPosition == INT_MAX )
+    {
+        int size = m_splitMode == wxSPLIT_VERTICAL ? curSize.x : curSize.y;

 
         int old_size = m_splitMode == wxSPLIT_VERTICAL ? m_lastSize.x : m_lastSize.y;
 
 
         int old_size = m_splitMode == wxSPLIT_VERTICAL ? m_lastSize.x : m_lastSize.y;
 

-        // Don't do anything if the size didn't really change. In particular,
-        // it is important that we don't reset our sash position because it's
-        // out of current range in this case as otherwise the really requested
-        // position would be lost and never set. Wait until we get a real size
-        // event with our non-initial size to do it.
+        // Don't do anything if the size didn't really change.

         if ( size != old_size )
         {
         if ( size != old_size )
         {

+            int newPosition = -1;
+
+            // Apply gravity if we use it.

             int delta = (int) ( (size - old_size)*m_sashGravity );
             if ( delta != 0 )
             {
             int delta = (int) ( (size - old_size)*m_sashGravity );
             if ( delta != 0 )
             {

-                int newPosition = m_sashPosition + delta;
+                newPosition = m_sashPosition + delta;

                 if( newPosition < m_minimumPaneSize )
                     newPosition = m_minimumPaneSize;
                 if( newPosition < m_minimumPaneSize )
                     newPosition = m_minimumPaneSize;

-                SetSashPositionAndNotify(newPosition);

             }
 
             }
 

-            if ( m_sashPosition >= size - 5 )
-                SetSashPositionAndNotify(wxMax(10, size - 40));
-            m_lastSize = wxSize(w,h);
+            // Also check if the second window became too small.
+            newPosition = AdjustSashPosition(newPosition == -1
+                                                 ? m_sashPosition
+                                                 : newPosition);
+            if ( newPosition != m_sashPosition )
+                SetSashPositionAndNotify(newPosition);

         }
     }
 
         }
     }
 

+    m_lastSize = curSize;
+

     SizeWindows();
 }
 
     SizeWindows();
 }
 


@@ -476,19 +484,29 @@ void wxSplitterWindow::SetSashGravity(double gravity)
     m_sashGravity = gravity;
 }
 
     m_sashGravity = gravity;
 }
 

-bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
+bool wxSplitterWindow::SashHitTest(int x, int y)

 {
     if ( m_windowTwo == NULL || m_sashPosition == 0)
         return false; // No sash
 
     int z = m_splitMode == wxSPLIT_VERTICAL ? x : y;
 {
     if ( m_windowTwo == NULL || m_sashPosition == 0)
         return false; // No sash
 
     int z = m_splitMode == wxSPLIT_VERTICAL ? x : y;

-    int hitMin = m_sashPosition - tolerance;
-    int hitMax = m_sashPosition + GetSashSize() + tolerance;
+    int hitMax = m_sashPosition + GetSashSize() - 1;

 
 

-    return z >=  hitMin && z <= hitMax;
+    return z >= m_sashPosition && z <= hitMax;
+}
+
+void wxSplitterWindow::SetSashInvisible(bool invisible)
+{
+    if ( IsSashInvisible() != invisible )
+        ToggleWindowStyle(wxSP_NOSASH);

 }
 
 int wxSplitterWindow::GetSashSize() const
 }
 
 int wxSplitterWindow::GetSashSize() const

+{
+    return IsSashInvisible() ? 0 : GetDefaultSashSize();
+}
+
+int wxSplitterWindow::GetDefaultSashSize() const

 {
     return wxRendererNative::Get().GetSplitterParams(this).widthSash;
 }
 {
     return wxRendererNative::Get().GetSplitterParams(this).widthSash;
 }


@@ -514,7 +532,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
         return;
 
     // nor if we're configured to not show it
         return;
 
     // nor if we're configured to not show it

-    if ( HasFlag(wxSP_NOSASH) )
+    if ( IsSashInvisible() )

         return;
 
     wxRendererNative::Get().DrawSplitterSash
         return;
 
     wxRendererNative::Get().DrawSplitterSash


@@ -646,7 +664,7 @@ void wxSplitterWindow::SetSashPositionAndNotify(int sashPos)
 void wxSplitterWindow::SizeWindows()
 {
     // check if we have delayed setting the real sash position
 void wxSplitterWindow::SizeWindows()
 {
     // check if we have delayed setting the real sash position

-    if ( m_checkRequestedSashPosition && m_requestedSashPosition != INT_MAX )
+    if ( m_requestedSashPosition != INT_MAX )

     {
         int newSashPosition = ConvertSashPosition(m_requestedSashPosition);
         if ( newSashPosition != m_sashPosition )
     {
         int newSashPosition = ConvertSashPosition(m_requestedSashPosition);
         if ( newSashPosition != m_sashPosition )


@@ -847,7 +865,6 @@ void wxSplitterWindow::SetSashPosition(int position, bool redraw)
     // 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;
     // 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));
 
 
     DoSetSashPosition(ConvertSashPosition(position));
 


@@ -862,9 +879,7 @@ void wxSplitterWindow::SetSashPosition(int position, bool redraw)
 // window is shown, if you know the overall size is correct.
 void wxSplitterWindow::UpdateSize()
 {
 // window is shown, if you know the overall size is correct.
 void wxSplitterWindow::UpdateSize()
 {

-    m_checkRequestedSashPosition = true;

     SizeWindows();
     SizeWindows();

-    m_checkRequestedSashPosition = false;

 }
 
 bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event)
 }
 
 bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event)


@@ -1031,7 +1046,7 @@ void wxSplitterWindow::OnSetCursor(wxSetCursorEvent& event)
     // and like this we explicitly say that our cursor should not be used for
     // children windows which overlap us
 
     // and like this we explicitly say that our cursor should not be used for
     // children windows which overlap us
 

-    if ( SashHitTest(event.GetX(), event.GetY(), 0) )
+    if ( SashHitTest(event.GetX(), event.GetY()) )

     {
         // default processing is ok
         event.Skip();
     {
         // default processing is ok
         event.Skip();