Layout fixes due to measuring with the wrong font. Also added

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 46e4c888f57ed9e1fae02af179d1ec07a49bf0fe..22c09bc9ff710f2ad6e8466aebceca9d93d52a62 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

     #pragma implementation "splitter.h"
 #endif
 
     #pragma implementation "splitter.h"
 #endif
 


@@ -50,12 +50,12 @@ 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
+    TODO PROPERTIES
+        style wxSP_3D
+        sashpos (long , 0 )
+        minsize (long -1 )
+        object, object_ref
+        orientation

 */
 
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxNotifyEvent)
 */
 
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxNotifyEvent)


@@ -87,16 +87,12 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
     style &= ~wxBORDER_MASK;
     style |= wxBORDER_NONE;
 
     style &= ~wxBORDER_MASK;
     style |= wxBORDER_NONE;
 

-    // we don't need to be completely repainted after resize and doing it
-    // results in horrible flicker
-    style |= wxNO_FULL_REPAINT_ON_RESIZE;
-

     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )

-        return FALSE;
+        return false;

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

-    return TRUE;
+    return true;

 }
 
 void wxSplitterWindow::Init()
 }
 
 void wxSplitterWindow::Init()


@@ -104,7 +100,7 @@ void wxSplitterWindow::Init()
     m_container.SetContainerWindow(this);
 
     m_splitMode = wxSPLIT_VERTICAL;
     m_container.SetContainerWindow(this);
 
     m_splitMode = wxSPLIT_VERTICAL;

-    m_permitUnsplitAlways = TRUE;
+    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;


@@ -113,12 +109,13 @@ void wxSplitterWindow::Init()
     m_firstX = 0;
     m_firstY = 0;
     m_sashPosition = m_requestedSashPosition = 0;
     m_firstX = 0;
     m_firstY = 0;
     m_sashPosition = m_requestedSashPosition = 0;

+    m_checkRequestedSashPosition = false;

     m_minimumPaneSize = 0;
     m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
     m_sashCursorNS = wxCursor(wxCURSOR_SIZENS);
     m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxSOLID);
 
     m_minimumPaneSize = 0;
     m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
     m_sashCursorNS = wxCursor(wxCURSOR_SIZENS);
     m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxSOLID);
 

-    m_needUpdating = FALSE;
+    m_needUpdating = false;

     m_isHot = false;
 }
 
     m_isHot = false;
 }
 


@@ -177,7 +174,16 @@ void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 void wxSplitterWindow::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 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();
 }
     if (m_needUpdating)
         SizeWindows();
 }


@@ -202,7 +208,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         {
             // Start the drag now
             m_dragMode = wxSPLIT_DRAG_DRAGGING;
         {
             // Start the drag now
             m_dragMode = wxSPLIT_DRAG_DRAGGING;

-            
+

             // Capture mouse and set the cursor
             CaptureMouse();
             SetResizeCursor();
             // Capture mouse and set the cursor
             CaptureMouse();
             SetResizeCursor();


@@ -227,7 +233,7 @@ 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();
         SetCursor(* wxSTANDARD_CURSOR);
         // Release mouse and unset the cursor
         ReleaseMouse();
         SetCursor(* wxSTANDARD_CURSOR);


@@ -360,7 +366,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         else
         {
             SetSashPositionAndNotify(posSashNew);
         else
         {
             SetSashPositionAndNotify(posSashNew);

-            m_needUpdating = TRUE;
+            m_needUpdating = true;

         }
     }
     else if ( event.LeftDClick() && m_windowTwo )
         }
     }
     else if ( event.LeftDClick() && m_windowTwo )


@@ -374,13 +380,8 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
     // 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!
     // 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() )
-    {
-        parent = parent->GetParent();
-    }
-
-    bool iconized = FALSE;
+    wxWindow *parent = wxGetTopLevelParent(this);
+    bool iconized;

 
     wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow);
     if ( winTop )
 
     wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow);
     if ( winTop )


@@ -391,7 +392,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
     {
         wxFAIL_MSG(wxT("should have a top level parent!"));
 
     {
         wxFAIL_MSG(wxT("should have a top level parent!"));
 

-        iconized = FALSE;
+        iconized = false;

     }
 
     if ( iconized )
     }
 
     if ( iconized )


@@ -417,12 +418,13 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
 bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
 {
     if ( m_windowTwo == NULL || m_sashPosition == 0)
 bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
 {
     if ( m_windowTwo == NULL || m_sashPosition == 0)

-        return FALSE; // No sash
+        return false; // No sash

 
     int z = m_splitMode == wxSPLIT_VERTICAL ? x : y;
 
     int z = m_splitMode == wxSPLIT_VERTICAL ? x : y;

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

 
 

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

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


@@ -571,15 +573,21 @@ bool wxSplitterWindow::DoSetSashPosition(int sashPos)
     int newSashPosition = AdjustSashPosition(sashPos);
 
     if ( newSashPosition == m_sashPosition )
     int newSashPosition = AdjustSashPosition(sashPos);
 
     if ( newSashPosition == m_sashPosition )

-        return FALSE;
+        return false;

 
     m_sashPosition = newSashPosition;
 
 
     m_sashPosition = newSashPosition;
 

-    return TRUE;
+    return true;

 }
 
 void wxSplitterWindow::SetSashPositionAndNotify(int sashPos)
 {
 }
 
 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);
     if ( DoSetSashPosition(sashPos) )
     {
         wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this);


@@ -595,7 +603,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_requestedSashPosition != INT_MAX )
+    if ( m_checkRequestedSashPosition && m_requestedSashPosition != INT_MAX )

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


@@ -654,13 +662,13 @@ void wxSplitterWindow::SizeWindows()
     wxClientDC dc(this);
     DrawSash(dc);
 
     wxClientDC dc(this);
     DrawSash(dc);
 

-    SetNeedUpdating(FALSE);
+    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,
+    wxASSERT_MSG( (!window || (window && window->GetParent() == this)),

                   _T("windows in the splitter should have it as parent!") );
 
     m_windowOne = window;
                   _T("windows in the splitter should have it as parent!") );
 
     m_windowOne = window;


@@ -670,18 +678,18 @@ void wxSplitterWindow::Initialize(wxWindow *window)
 
 // 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.
+// Does nothing and returns false if the window is already split.

 bool wxSplitterWindow::DoSplit(wxSplitMode mode,
                                wxWindow *window1, wxWindow *window2,
                                int sashPosition)
 {
     if ( IsSplit() )
 bool wxSplitterWindow::DoSplit(wxSplitMode mode,
                                wxWindow *window1, wxWindow *window2,
                                int sashPosition)
 {
     if ( IsSplit() )

-        return FALSE;
+        return false;

 
 

-    wxCHECK_MSG( window1 && window2, FALSE,
+    wxCHECK_MSG( window1 && window2, false,

                  _T("can not split with NULL window(s)") );
 
                  _T("can not split with NULL window(s)") );
 

-    wxCHECK_MSG( window1->GetParent() == this && window2->GetParent() == this, FALSE,
+    wxCHECK_MSG( window1->GetParent() == this && window2->GetParent() == this, false,

                   _T("windows in the splitter should have it as parent!") );
 
     m_splitMode = mode;
                   _T("windows in the splitter should have it as parent!") );
 
     m_splitMode = mode;


@@ -691,12 +699,13 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
     // 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;
     // 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();
 
 
     DoSetSashPosition(ConvertSashPosition(sashPosition));
 
     SizeWindows();
 

-    return TRUE;
+    return true;

 }
 
 int wxSplitterWindow::ConvertSashPosition(int sashPosition) const
 }
 
 int wxSplitterWindow::ConvertSashPosition(int sashPosition) const


@@ -722,9 +731,9 @@ int wxSplitterWindow::ConvertSashPosition(int sashPosition) const
 bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
 {
     if ( ! IsSplit() )
 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 ;


@@ -740,21 +749,21 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
     {
         wxFAIL_MSG(wxT("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);
     DoSetSashPosition(0);
     SizeWindows();
 
     }
 
     OnUnsplit(win);
     DoSetSashPosition(0);
     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, wxT("use one of Split() functions instead") );
-    wxCHECK_MSG( winNew, FALSE, wxT("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 )
     {


@@ -768,23 +777,29 @@ bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
     {
         wxFAIL_MSG(wxT("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;
 }
 
 void wxSplitterWindow::SetMinimumPaneSize(int min)
 {
     m_minimumPaneSize = min;

-    SetSashPosition(m_sashPosition); // re-check limits
+    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)
 {

-    DoSetSashPosition(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 )
     {


@@ -792,6 +807,16 @@ void wxSplitterWindow::SetSashPosition(int position, bool redraw)
     }
 }
 
     }
 }
 

+// 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()
+{
+    m_checkRequestedSashPosition = true;
+    SizeWindows();
+    m_checkRequestedSashPosition = false;
+}
+

 bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event)
 {
     return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed();
 bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event)
 {
     return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed();


@@ -804,7 +829,7 @@ bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event)
 bool wxSplitterWindow::OnSashPositionChange(int WXUNUSED(newSashPosition))
 {
     // always allow by default
 bool wxSplitterWindow::OnSashPositionChange(int WXUNUSED(newSashPosition))
 {
     // always allow by default

-    return TRUE;
+    return true;

 }
 
 int wxSplitterWindow::OnSashPositionChanging(int newSashPosition)
 }
 
 int wxSplitterWindow::OnSashPositionChanging(int newSashPosition)


@@ -822,7 +847,7 @@ int wxSplitterWindow::OnSashPositionChanging(int newSashPosition)
     // Obtain relevant window dimension for bottom / right threshold check
     int window_size = GetWindowSize();
 
     // Obtain relevant window dimension for bottom / right threshold check
     int window_size = GetWindowSize();
 

-    bool unsplit_scenario = FALSE;
+    bool unsplit_scenario = false;

     if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 )
     {
         // Do edge detection if unsplit premitted
     if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 )
     {
         // Do edge detection if unsplit premitted


@@ -830,13 +855,13 @@ int wxSplitterWindow::OnSashPositionChanging(int newSashPosition)
         {
             // threshold top / left check
             newSashPosition = 0;
         {
             // threshold top / left check
             newSashPosition = 0;

-            unsplit_scenario = TRUE;
+            unsplit_scenario = true;

         }
         if ( newSashPosition >= window_size - UNSPLIT_THRESHOLD )
         {
             // threshold bottom/right check
             newSashPosition = window_size;
         }
         if ( newSashPosition >= window_size - UNSPLIT_THRESHOLD )
         {
             // threshold bottom/right check
             newSashPosition = window_size;

-            unsplit_scenario = TRUE;
+            unsplit_scenario = true;

         }
     }
 
         }
     }
 


@@ -901,7 +926,7 @@ void wxSplitterWindow::OnDoubleClickSash(int x, int y)
 void wxSplitterWindow::OnUnsplit(wxWindow *winRemoved)
 {
     // call this before calling the event handler which may delete the window
 void wxSplitterWindow::OnUnsplit(wxWindow *winRemoved)
 {
     // call this before calling the event handler which may delete the window

-    winRemoved->Show(FALSE);
+    winRemoved->Show(false);

 }
 
 #if defined( __WXMSW__ ) || defined( __WXMAC__)
 }
 
 #if defined( __WXMSW__ ) || defined( __WXMAC__)


@@ -913,7 +938,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()) )
+    if ( SashHitTest(event.GetX(), event.GetY(), 0) )

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