remove duplicate deletion

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

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 2553c9f70044d3224dd4d0d565983729c941e3e3..9b9b7a11567f5d0612b0be147a3dc82ee76678d8 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -8,7 +8,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -26,12 +26,17 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

+#if !wxUSE_SASH
+    #error "Thisfile requires wxUSE_SASH to be defined."
+#endif // wxUSE_SASH
+

 #include <math.h>
 #include <stdlib.h>
 
 #include "wx/string.h"
 #include "wx/dcscreen.h"
 #include "wx/sashwin.h"
 #include <math.h>
 #include <stdlib.h>
 
 #include "wx/string.h"
 #include "wx/dcscreen.h"
 #include "wx/sashwin.h"

+#include "wx/laywin.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow)


@@ -109,13 +114,21 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
 
     wxSashEdgePosition sashHit = SashHitTest(x, y);
 
 
     wxSashEdgePosition sashHit = SashHitTest(x, y);
 

-       if (event.LeftDown())
-       {
+    // reset the cursor
+#ifdef __WXMOTIF__
+    SetCursor(* wxSTANDARD_CURSOR);
+#endif
+#ifdef __WXMSW__
+    SetCursor(wxCursor());
+#endif
+
+    if (event.LeftDown())
+    {

         if ( sashHit != wxSASH_NONE )
         {
             CaptureMouse();
 
         if ( sashHit != wxSASH_NONE )
         {
             CaptureMouse();
 

-           // Required for X to specify that
+            // Required for X to specify that

             // that we wish to draw on top of all windows
             // - and we optimise by specifying the area
             // for creating the overlap window.
             // that we wish to draw on top of all windows
             // - and we optimise by specifying the area
             // for creating the overlap window.


@@ -137,7 +150,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
             m_firstX = x;
             m_firstY = y;
         }
             m_firstX = x;
             m_firstY = y;
         }

-       }
+    }

     else if ( event.LeftUp() && m_dragMode == wxSASH_DRAG_LEFT_DOWN )
     {
         // Wasn't a proper drag
     else if ( event.LeftUp() && m_dragMode == wxSASH_DRAG_LEFT_DOWN )
     {
         // Wasn't a proper drag


@@ -145,14 +158,12 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         wxScreenDC::EndDrawingOnTop();
         m_dragMode = wxSASH_DRAG_NONE;
         m_draggingEdge = wxSASH_NONE;
         wxScreenDC::EndDrawingOnTop();
         m_dragMode = wxSASH_DRAG_NONE;
         m_draggingEdge = wxSASH_NONE;

-
-        SetCursor(*wxSTANDARD_CURSOR);

     }
     }

-       else if (event.LeftUp() && m_dragMode == wxSASH_DRAG_DRAGGING)
-       {
+    else if (event.LeftUp() && m_dragMode == wxSASH_DRAG_DRAGGING)
+    {

         // We can stop dragging now and see what we've got.
         m_dragMode = wxSASH_DRAG_NONE;
         // We can stop dragging now and see what we've got.
         m_dragMode = wxSASH_DRAG_NONE;

-               ReleaseMouse();
+        ReleaseMouse();

         // Erase old tracker
         DrawSashTracker(m_draggingEdge, m_oldX, m_oldY);
 
         // Erase old tracker
         DrawSashTracker(m_draggingEdge, m_oldX, m_oldY);
 


@@ -161,100 +172,142 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         wxScreenDC::EndDrawingOnTop();
 
         int w, h;
         wxScreenDC::EndDrawingOnTop();
 
         int w, h;

-               GetSize(&w, &h);
+        GetSize(&w, &h);

         int xp, yp;
         int xp, yp;

-               GetPosition(&xp, &yp);
+        GetPosition(&xp, &yp);

 
         wxSashEdgePosition edge = m_draggingEdge;
         m_draggingEdge = wxSASH_NONE;
 
         wxRect dragRect;
         wxSashDragStatus status = wxSASH_STATUS_OK;
 
         wxSashEdgePosition edge = m_draggingEdge;
         m_draggingEdge = wxSASH_NONE;
 
         wxRect dragRect;
         wxSashDragStatus status = wxSASH_STATUS_OK;

+
+        // the new height and width of the window - if -1, it didn't change
+        int newHeight = -1,
+            newWidth = -1;
+
+        // NB: x and y may be negative and they're relative to the sash window
+        //     upper left corner, while xp and yp are expressed in the parent
+        //     window system of coordinates, so adjust them! After this
+        //     adjustment, all coordinates are relative to the parent window.
+        y += yp;
+        x += xp;
+

         switch (edge)
         {
             case wxSASH_TOP:
         switch (edge)
         {
             case wxSASH_TOP:

-            {
-                if (y > (yp + h))
+                if ( y > yp + h )
+                {
+                    // top sash shouldn't get below the bottom one

                     status = wxSASH_STATUS_OUT_OF_RANGE;
                     status = wxSASH_STATUS_OUT_OF_RANGE;

-                int newHeight = (h - y);
-               newHeight=wxMax(newHeight,m_minimumPaneSizeY);
-               newHeight=wxMin(newHeight,m_maximumPaneSizeY);
-                dragRect = wxRect(xp, (yp + h) - newHeight, w, newHeight);
+                }
+                else
+                {
+                    newHeight = h - (y - yp);
+                }

                 break;
                 break;

-            }
+

             case wxSASH_BOTTOM:
             case wxSASH_BOTTOM:

-            {
-                if (y < 0)
+                if ( y < yp )
+                {
+                    // bottom sash shouldn't get above the top one

                     status = wxSASH_STATUS_OUT_OF_RANGE;
                     status = wxSASH_STATUS_OUT_OF_RANGE;

-                int newHeight = y;
-               newHeight=wxMax(newHeight,m_minimumPaneSizeY);
-               newHeight=wxMin(newHeight,m_maximumPaneSizeY);
-                dragRect = wxRect(xp, yp, w, newHeight);
+                }
+                else
+                {
+                    newHeight = y - yp;
+                }

                 break;
                 break;

-            }
+

             case wxSASH_LEFT:
             case wxSASH_LEFT:

-            {
-                if (x > (xp + w))
+                if ( x > xp + w )
+                {
+                    // left sash shouldn't get beyond the right one

                     status = wxSASH_STATUS_OUT_OF_RANGE;
                     status = wxSASH_STATUS_OUT_OF_RANGE;

-                int newWidth = (w - x);
-               newWidth=wxMax(newWidth,m_minimumPaneSizeX);
-               newWidth=wxMin(newWidth,m_maximumPaneSizeX);
-                dragRect = wxRect((xp + w) - newWidth, yp, newWidth, h);
+                }
+                else
+                {
+                    newWidth = w - (x - xp);
+                }

                 break;
                 break;

-            }
+

             case wxSASH_RIGHT:
             case wxSASH_RIGHT:

-            {
-                if (x < 0)
+                if ( x < xp )
+                {
+                    // and the right sash, finally, shouldn't be beyond the
+                    // left one

                     status = wxSASH_STATUS_OUT_OF_RANGE;
                     status = wxSASH_STATUS_OUT_OF_RANGE;

-                int newWidth = x;
-               newWidth=wxMax(newWidth,m_minimumPaneSizeX);
-               newWidth=wxMin(newWidth,m_maximumPaneSizeX);
-                dragRect = wxRect(xp, yp, newWidth, h);
+                }
+                else
+                {
+                    newWidth = x - xp;
+                }

                 break;
                 break;

-            }
-           case wxSASH_NONE:
-           {
-               break;
-           }
+
+            case wxSASH_NONE:
+                // can this happen at all?
+                break;
+        }
+
+        if ( newHeight == -1 )
+        {
+            // didn't change
+            newHeight = h;
+        }
+        else
+        {
+            // make sure it's in m_minimumPaneSizeY..m_maximumPaneSizeY range
+            newHeight = wxMax(newHeight, m_minimumPaneSizeY);
+            newHeight = wxMin(newHeight, m_maximumPaneSizeY);
+        }
+
+        if ( newWidth == -1 )
+        {
+            // didn't change
+            newWidth = w;
+        }
+        else
+        {
+            // make sure it's in m_minimumPaneSizeY..m_maximumPaneSizeY range
+            newWidth = wxMax(newWidth, m_minimumPaneSizeX);
+            newWidth = wxMin(newWidth, m_maximumPaneSizeX);

         }
 
         }
 

+        dragRect = wxRect(x, y, newWidth, newHeight);
+

         wxSashEvent event(GetId(), edge);
         event.SetEventObject(this);
         event.SetDragStatus(status);
         event.SetDragRect(dragRect);
         GetEventHandler()->ProcessEvent(event);
         wxSashEvent event(GetId(), edge);
         event.SetEventObject(this);
         event.SetDragStatus(status);
         event.SetDragRect(dragRect);
         GetEventHandler()->ProcessEvent(event);

-       }
-       else if (event.Moving() && !event.Dragging())
-       {
+    }
+    else if (event.Moving() && !event.Dragging())
+    {

         // Just change the cursor if required
         if ( sashHit != wxSASH_NONE )
         {
         // Just change the cursor if required
         if ( sashHit != wxSASH_NONE )
         {

-               if ( (sashHit == wxSASH_LEFT) || (sashHit == wxSASH_RIGHT) )
-                {
-                       SetCursor(*m_sashCursorWE);
-                }
-                else
-                {
-                       SetCursor(*m_sashCursorNS);
-                }
+            if ( (sashHit == wxSASH_LEFT) || (sashHit == wxSASH_RIGHT) )
+            {
+                SetCursor(*m_sashCursorWE);
+            }
+            else
+            {
+                SetCursor(*m_sashCursorNS);
+            }
+        }
+    }
+    else if ( event.Dragging() &&
+              ((m_dragMode == wxSASH_DRAG_DRAGGING) ||
+               (m_dragMode == wxSASH_DRAG_LEFT_DOWN)) )
+    {
+        if ( (m_draggingEdge == wxSASH_LEFT) || (m_draggingEdge == wxSASH_RIGHT) )
+        {
+            SetCursor(*m_sashCursorWE);

         }
         else
         {
         }
         else
         {

-           SetCursor(*wxSTANDARD_CURSOR);
+            SetCursor(*m_sashCursorNS);

         }
         }

-       }
-       else if ( event.Dragging() &&
-              ((m_dragMode == wxSASH_DRAG_DRAGGING) || (m_dragMode == wxSASH_DRAG_LEFT_DOWN))
-            )
-       {
-                if ( (m_draggingEdge == wxSASH_LEFT) || (m_draggingEdge == wxSASH_RIGHT) )
-         {
-               SetCursor(*m_sashCursorWE);
-         }
-         else
-         {
-               SetCursor(*m_sashCursorNS);
-         }

 
         if (m_dragMode == wxSASH_DRAG_LEFT_DOWN)
         {
 
         if (m_dragMode == wxSASH_DRAG_LEFT_DOWN)
         {


@@ -263,18 +316,18 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         }
         else
         {
         }
         else
         {

-          if ( m_dragMode == wxSASH_DRAG_DRAGGING )
-          {
-            // Erase old tracker
-            DrawSashTracker(m_draggingEdge, m_oldX, m_oldY);
+            if ( m_dragMode == wxSASH_DRAG_DRAGGING )
+            {
+                // Erase old tracker
+                DrawSashTracker(m_draggingEdge, m_oldX, m_oldY);

 
 

-            // Draw new one
-            DrawSashTracker(m_draggingEdge, x, y);
-          }
+                // Draw new one
+                DrawSashTracker(m_draggingEdge, x, y);
+            }

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

-       }
+    }

     else if ( event.LeftDClick() )
     {
         // Nothing
     else if ( event.LeftDClick() )
     {
         // Nothing


@@ -324,7 +377,7 @@ wxSashEdgePosition wxSashWindow::SashHitTest(int x, int y, int WXUNUSED(toleranc
                 }
                 case wxSASH_LEFT:
                 {
                 }
                 case wxSASH_LEFT:
                 {

-                    if ((x >= GetEdgeMargin(position)) && (x >= 0))
+                    if ((x <= GetEdgeMargin(position)) && (x >= 0))

                         return wxSASH_LEFT;
                     break;
                 }
                         return wxSASH_LEFT;
                     break;
                 }


@@ -513,7 +566,7 @@ void wxSashWindow::DrawSashTracker(wxSashEdgePosition edge, int x, int y)
 
     wxPen sashTrackerPen(*wxBLACK, 2, wxSOLID);
 
 
     wxPen sashTrackerPen(*wxBLACK, 2, wxSOLID);
 

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

     screenDC.SetPen(sashTrackerPen);
     screenDC.SetBrush(*wxTRANSPARENT_BRUSH);
 
     screenDC.SetPen(sashTrackerPen);
     screenDC.SetBrush(*wxTRANSPARENT_BRUSH);
 


@@ -533,7 +586,7 @@ void wxSashWindow::SizeWindows()
     int cw, ch;
     GetClientSize(&cw, &ch);
 
     int cw, ch;
     GetClientSize(&cw, &ch);
 

-    if (GetChildren().Number() > 0)
+    if (GetChildren().Number() == 1)

     {
         wxWindow* child = (wxWindow*) (GetChildren().First()->Data());
 
     {
         wxWindow* child = (wxWindow*) (GetChildren().First()->Data());
 


@@ -574,6 +627,16 @@ void wxSashWindow::SizeWindows()
 
         child->SetSize(x, y, width, height);
     }
 
         child->SetSize(x, y, width, height);
     }

+    else if (GetChildren().Number() > 1)
+    {
+        // Perhaps multiple children are themselves sash windows.
+        // TODO: this doesn't really work because the subwindows sizes/positions
+        // must be set to leave a gap for the parent's sash (hit-test and decorations).
+        // Perhaps we can allow for this within LayoutWindow, testing whether the parent
+        // is a sash window, and if so, allowing some space for the edges.
+        wxLayoutAlgorithm layout;
+        layout.LayoutWindow(this);
+    }

 
     wxClientDC dc(this);
     DrawBorders(dc);
 
     wxClientDC dc(this);
     DrawBorders(dc);