fixed a compilation warning about signed/unsigned comparison

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 448d795d35375d25ec1652ad6628281a8f9b8b01..5e293514bdd3b96e236bdf6fd24bc98ff39a10f0 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxSplitterWindow implementation
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxSplitterWindow implementation
 // Author:      Julian Smart
 // Modified by:


@@ -111,8 +111,8 @@ void wxSplitterWindow::Init()
     m_borderSize = 2;
     m_sashPosition = m_requestedSashPosition = 0;
     m_minimumPaneSize = 0;
     m_borderSize = 2;
     m_sashPosition = m_requestedSashPosition = 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_lightShadowPen = (wxPen *) NULL;
     m_mediumShadowPen = (wxPen *) NULL;
     m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxSOLID);
     m_lightShadowPen = (wxPen *) NULL;
     m_mediumShadowPen = (wxPen *) NULL;


@@ -131,8 +131,6 @@ void wxSplitterWindow::Init()
 
 wxSplitterWindow::~wxSplitterWindow()
 {
 
 wxSplitterWindow::~wxSplitterWindow()
 {

-    delete m_sashCursorWE;
-    delete m_sashCursorNS;

     delete m_sashTrackerPen;
     delete m_lightShadowPen;
     delete m_darkShadowPen;
     delete m_sashTrackerPen;
     delete m_lightShadowPen;
     delete m_darkShadowPen;


@@ -142,6 +140,12 @@ wxSplitterWindow::~wxSplitterWindow()
     delete m_faceBrush;
 }
 
     delete m_faceBrush;
 }
 

+void wxSplitterWindow::SetResizeCursor()
+{
+    SetCursor(m_splitMode == wxSPLIT_VERTICAL ? m_sashCursorWE
+                                              : m_sashCursorNS);
+}
+

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


@@ -167,14 +171,19 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     // reset the cursor
 #ifdef __WXMOTIF__
     SetCursor(* wxSTANDARD_CURSOR);
     // reset the cursor
 #ifdef __WXMOTIF__
     SetCursor(* wxSTANDARD_CURSOR);

-#endif
-#ifdef __WXMSW__
+#elif defined(__WXMSW__)

     SetCursor(wxCursor());
 #endif
 
     if (GetWindowStyle() & wxSP_NOSASH)
         return;
 
     SetCursor(wxCursor());
 #endif
 
     if (GetWindowStyle() & wxSP_NOSASH)
         return;
 

+    // with wxSP_LIVE_UPDATE style the splitter windows are always resized
+    // following the mouse movement while it drags the sash, without it we only
+    // draw the sash at the new position but only resize the windows when the
+    // dragging is finished
+    bool isLive = (GetWindowStyleFlag() & wxSP_LIVE_UPDATE) != 0;
+

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


@@ -183,22 +192,19 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 
             m_dragMode = wxSPLIT_DRAG_DRAGGING;
 
 
             m_dragMode = wxSPLIT_DRAG_DRAGGING;
 

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

             {
             {

+                // remember the initial sash position and draw the initial
+                // shadow sash
+                m_sashPositionCurrent = m_sashPosition;
+

                 DrawSashTracker(x, y);
             }
 
             m_oldX = x;
             m_oldY = y;
 
                 DrawSashTracker(x, y);
             }
 
             m_oldX = x;
             m_oldY = y;
 

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

             return;
         }
     }
             return;
         }
     }


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

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

         {
             DrawSashTracker(m_oldX, m_oldY);
         }
         {
             DrawSashTracker(m_oldX, m_oldY);
         }


@@ -219,7 +225,8 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         // mouse has moved
         int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_oldX : y - m_oldY;
 
         // mouse has moved
         int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_oldX : y - m_oldY;
 

-        int posSashNew = OnSashPositionChanging(m_sashPosition + diff);
+        int posSashOld = isLive ? m_sashPosition : m_sashPositionCurrent;
+        int posSashNew = OnSashPositionChanging(posSashOld + diff);

         if ( posSashNew == -1 )
         {
             // change not allowed
         if ( posSashNew == -1 )
         {
             // change not allowed


@@ -236,7 +243,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                 m_windowOne = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);
                 m_windowOne = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);

-                DoSetSashPosition(0);
+                SetSashPositionAndNotify(0);

             }
             else if ( posSashNew == GetWindowSize() )
             {
             }
             else if ( posSashNew == GetWindowSize() )
             {


@@ -244,16 +251,16 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                 wxWindow *removedWindow = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);
                 wxWindow *removedWindow = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);

-                DoSetSashPosition(0);
+                SetSashPositionAndNotify(0);

             }
             else
             {
             }
             else
             {

-                DoSetSashPosition(posSashNew);
+                SetSashPositionAndNotify(posSashNew);

             }
         }
         else
         {
             }
         }
         else
         {

-            DoSetSashPosition(posSashNew);
+            SetSashPositionAndNotify(posSashNew);

         }
 
         SizeWindows();
         }
 
         SizeWindows();


@@ -263,14 +270,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         // Just change the cursor if required
         if ( SashHitTest(x, y) )
         {
         // Just change the cursor if required
         if ( SashHitTest(x, y) )
         {

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

         }
 #if defined(__WXGTK__) || defined(__WXMSW__)
         else
         }
 #if defined(__WXGTK__) || defined(__WXMSW__)
         else


@@ -290,19 +290,13 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 #ifdef __WXMSW__
         // Otherwise, the cursor sometimes reverts to the normal cursor
         // during 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);
-        }
+        SetResizeCursor();

 #endif // __WXMSW__
 
         int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_oldX : y - m_oldY;
 
 #endif // __WXMSW__
 
         int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_oldX : y - m_oldY;
 

-        int posSashNew = OnSashPositionChanging(m_sashPosition + diff);
+        int posSashOld = isLive ? m_sashPosition : m_sashPositionCurrent;
+        int posSashNew = OnSashPositionChanging(posSashOld + diff);

         if ( posSashNew == -1 )
         {
             // change not allowed
         if ( posSashNew == -1 )
         {
             // change not allowed


@@ -313,7 +307,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
             return;
 
         // Erase old tracker
             return;
 
         // Erase old tracker

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

         {
             DrawSashTracker(m_oldX, m_oldY);
         }
         {
             DrawSashTracker(m_oldX, m_oldY);
         }


@@ -341,13 +335,15 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 #endif // __WXMSW__
 
         // Draw new one
 #endif // __WXMSW__
 
         // Draw new one

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

         {
         {

+            m_sashPositionCurrent = posSashNew;
+

             DrawSashTracker(m_oldX, m_oldY);
         }
         else
         {
             DrawSashTracker(m_oldX, m_oldY);
         }
         else
         {

-            DoSetSashPosition(posSashNew);
+            SetSashPositionAndNotify(posSashNew);

             m_needUpdating = TRUE;
         }
     }
             m_needUpdating = TRUE;
         }
     }


@@ -388,7 +384,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
         iconized = FALSE;
     }
 #endif
         iconized = FALSE;
     }
 #endif

-    
+

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


@@ -403,12 +399,12 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
         if ( m_splitMode == wxSPLIT_VERTICAL )
         {
             if ( m_sashPosition >= (cw - 5) )
         if ( m_splitMode == wxSPLIT_VERTICAL )
         {
             if ( m_sashPosition >= (cw - 5) )

-                DoSetSashPosition(wxMax(10, cw - 40));
+                SetSashPositionAndNotify(wxMax(10, cw - 40));

         }
         else // m_splitMode == wxSPLIT_HORIZONTAL
         {
             if ( m_sashPosition >= (ch - 5) )
         }
         else // m_splitMode == wxSPLIT_HORIZONTAL
         {
             if ( m_sashPosition >= (ch - 5) )

-                DoSetSashPosition(wxMax(10, ch - 40));
+                SetSashPositionAndNotify(wxMax(10, ch - 40));

         }
     }
 
         }
     }
 


@@ -716,14 +712,22 @@ int wxSplitterWindow::AdjustSashPosition(int sashPos) const
     return sashPos;
 }
 
     return sashPos;
 }
 

-void wxSplitterWindow::DoSetSashPosition(int sashPos)
+bool wxSplitterWindow::DoSetSashPosition(int sashPos)

 {
     int newSashPosition = AdjustSashPosition(sashPos);
 
 {
     int newSashPosition = AdjustSashPosition(sashPos);
 

-    if ( newSashPosition != m_sashPosition )
-    {
-        m_sashPosition = newSashPosition;
+    if ( newSashPosition == m_sashPosition )
+        return FALSE;
+
+    m_sashPosition = newSashPosition;

 
 

+    return TRUE;
+}
+
+void wxSplitterWindow::SetSashPositionAndNotify(int sashPos)
+{
+    if ( DoSetSashPosition(sashPos) )
+    {

         wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this);
         event.m_data.pos = m_sashPosition;
 
         wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this);
         event.m_data.pos = m_sashPosition;
 


@@ -757,7 +761,7 @@ void wxSplitterWindow::SizeWindows()
 
     if ( GetWindow1() && !GetWindow2() )
     {
 
     if ( GetWindow1() && !GetWindow2() )
     {

-        GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(), 
+        GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(),

                               w - 2*GetBorderSize(), h - 2*GetBorderSize());
     }
     else if ( GetWindow1() && GetWindow2() )
                               w - 2*GetBorderSize(), h - 2*GetBorderSize());
     }
     else if ( GetWindow1() && GetWindow2() )


@@ -796,6 +800,9 @@ void wxSplitterWindow::SizeWindows()
 // Set pane for unsplit window
 void wxSplitterWindow::Initialize(wxWindow *window)
 {
 // Set pane for unsplit window
 void wxSplitterWindow::Initialize(wxWindow *window)
 {

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

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


@@ -811,6 +818,9 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
     if ( IsSplit() )
         return FALSE;
 
     if ( IsSplit() )
         return FALSE;
 

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

     m_splitMode = mode;
     m_windowOne = window1;
     m_windowTwo = window2;
     m_splitMode = mode;
     m_windowOne = window1;
     m_windowTwo = window2;