X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4419ba31aa1ec9e1e58211c54938ff7c53ca21a3..3a8c693aea7d83397af67825943e2750f1723628:/src/generic/splitter.cpp

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index b2627b53e4..6ff6aa9b62 100644
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -32,8 +32,13 @@
 #include "wx/splitter.h"
 #include "wx/dcscreen.h"
 #include "wx/settings.h"
+#include "wx/log.h"
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_UNSPLIT)
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent)
 
@@ -43,6 +48,8 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     EVT_IDLE(wxSplitterWindow::OnIdle)
     EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent)
 
+    EVT_SET_CURSOR(wxSplitterWindow::OnSetCursor)
+
     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
@@ -50,44 +57,37 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     EVT_SPLITTER_DCLICK(-1,           wxSplitterWindow::OnDoubleClick)
     EVT_SPLITTER_UNSPLIT(-1,          wxSplitterWindow::OnUnsplitEvent)
 END_EVENT_TABLE()
-#endif
-
-wxSplitterWindow::wxSplitterWindow()
-{
-    m_splitMode = wxSPLIT_VERTICAL;
-    m_permitUnsplitAlways = FALSE;
-    m_windowOne = (wxWindow *) NULL;
-    m_windowTwo = (wxWindow *) NULL;
-    m_dragMode = wxSPLIT_DRAG_NONE;
-    m_oldX = 0;
-    m_oldY = 0;
-    m_firstX = 0;
-    m_firstY = 0;
-    m_sashSize = 7;
-    m_borderSize = 2;
-    m_sashPosition = 0;
-    m_sashCursorWE = (wxCursor *) NULL;
-    m_sashCursorNS = (wxCursor *) NULL;
-    m_sashTrackerPen = (wxPen *) NULL;
-    m_lightShadowPen = (wxPen *) NULL;
-    m_mediumShadowPen = (wxPen *) NULL;
-    m_darkShadowPen = (wxPen *) NULL;
-    m_faceBrush = (wxBrush *) NULL;
-    m_facePen = (wxPen *) NULL;
-    m_hilightPen = (wxPen *) NULL;
-    m_minimumPaneSize = 0;
-    m_needUpdating = FALSE;
-}
 
-wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id,
+bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
                                    const wxPoint& pos,
                                    const wxSize& size,
                                    long style,
                                    const wxString& name)
-                : wxWindow(parent, id, pos, size, style, name)
 {
-    m_splitMode = wxSPLIT_VERTICAL;
+    if (!wxWindow::Create(parent, id, pos, size, style, name))
+        return FALSE;
+
     m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0;
+
+    if ( style & wxSP_3DSASH )
+        m_sashSize = 7;
+    else
+        m_sashSize = 3;
+
+    if ( style & wxSP_3DBORDER )
+        m_borderSize = 2;
+    else if ( style & wxSP_BORDER )
+        m_borderSize = 1;
+    else
+        m_borderSize = 0;
+
+    return TRUE;
+}
+
+void wxSplitterWindow::Init()
+{
+    m_splitMode = wxSPLIT_VERTICAL;
+    m_permitUnsplitAlways = TRUE;
     m_windowOne = (wxWindow *) NULL;
     m_windowTwo = (wxWindow *) NULL;
     m_dragMode = wxSPLIT_DRAG_NONE;
@@ -109,28 +109,11 @@ wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id,
     m_facePen = (wxPen *) NULL;
     m_hilightPen = (wxPen *) NULL;
 
-    if ( style & wxSP_3D )
-    {
-        m_borderSize = 2;
-        m_sashSize = 7;
-    }
-    else if ( style & wxSP_BORDER )
-    {
-        m_borderSize = 1;
-        m_sashSize = 3;
-    }
-    else
-    {
-        m_borderSize = 0;
-        m_sashSize = 3;
-    }
+    m_borderSize = 0;
+    m_sashSize = 3;
 
-    // Eventually, we'll respond to colour change messages
     InitColours();
 
-    // For debugging purposes, to see the background.
-//    SetBackground(wxBLUE_BRUSH);
-
     m_needUpdating = FALSE;
 }
 
@@ -156,16 +139,18 @@ void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
     DrawSash(dc);
 }
 
-void wxSplitterWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
+void wxSplitterWindow::OnIdle(wxIdleEvent& event)
 {
     if (m_needUpdating)
         SizeWindows();
+
+    event.Skip();
 }
 
 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__
@@ -175,6 +160,8 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     SetCursor(wxCursor());
 #endif
 
+    if (GetWindowStyle() & wxSP_NOSASH)
+        return;
 
     if (event.LeftDown())
     {
@@ -191,6 +178,15 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 
             m_oldX = x;
             m_oldY = y;
+
+            if ( m_splitMode == wxSPLIT_VERTICAL )
+            {
+                SetCursor(*m_sashCursorWE);
+            }
+            else
+            {
+                SetCursor(*m_sashCursorNS);
+            }
             return;
         }
     }
@@ -227,8 +223,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
             }
         }
 
-        if ( m_permitUnsplitAlways
-                || m_minimumPaneSize == 0 )
+        if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 )
         {
             // Deal with possible unsplit scenarios
             if ( new_sash_position == 0 )
@@ -274,9 +269,14 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                     SetCursor(*m_sashCursorNS);
                 }
         }
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMSW__)
         else
         {
+            // We must set the normal cursor in MSW, because
+            // if the child window doesn't have a cursor, the
+            // parent's (splitter window) will be used, and this
+            // must be the standard cursor.
+
             // where else do we unset the cursor?
             SetCursor(* wxSTANDARD_CURSOR);
         }
@@ -284,6 +284,19 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     }
     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 =
@@ -302,6 +315,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
             }
         }
 
+        if (new_sash_position == m_sashPosition)
+            return;
+
         // Erase old tracker
         if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
         {
@@ -313,12 +329,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         else
             y = new_sash_position;
 
-        if (new_sash_position != -1)
-        {
-            // Only modify if permitted
-            m_oldX = x;
-            m_oldY = y;
-        }
+        // Remember old positions
+        m_oldX = x;
+        m_oldY = y;
 
 #ifdef __WXMSW__
         // As we captured the mouse, we may get the mouse events from outside
@@ -424,8 +437,6 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
         else
             return FALSE;
     }
-
-    return FALSE;
 }
 
 // Draw 3D effect borders
@@ -434,7 +445,7 @@ void wxSplitterWindow::DrawBorders(wxDC& dc)
     int w, h;
     GetClientSize(&w, &h);
 
-    if ( GetWindowStyleFlag() & wxSP_3D )
+    if ( GetWindowStyleFlag() & wxSP_3DBORDER )
     {
 
         dc.SetPen(*m_facePen);
@@ -477,11 +488,13 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
 {
     if ( m_sashPosition == 0 || !m_windowTwo)
         return;
+    if (GetWindowStyle() & wxSP_NOSASH)
+        return;
 
     int w, h;
     GetClientSize(&w, &h);
 
-    if ( GetWindowStyleFlag() & wxSP_3D )
+    if ( GetWindowStyleFlag() & wxSP_3DSASH )
     {
         if ( m_splitMode == wxSPLIT_VERTICAL )
         {
@@ -492,7 +505,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
             dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
             dc.SetPen(*m_lightShadowPen);
-                        int xShadow = m_borderSize ? m_borderSize - 1 : 0 ;
+            int xShadow = m_borderSize ? m_borderSize - 1 : 0 ;
             dc.DrawLine(m_sashPosition, xShadow , m_sashPosition, h-m_borderSize);
 
             dc.SetPen(*m_hilightPen);
@@ -504,6 +517,18 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
 
             dc.SetPen(*m_darkShadowPen);
             dc.DrawLine(m_sashPosition+m_sashSize-1, m_borderSize, m_sashPosition+m_sashSize-1, h-m_borderSize );
+
+            // Draw the top and bottom edges of the sash, if requested
+            if (GetWindowStyle() & wxSP_FULLSASH)
+            {
+                // Top
+                dc.SetPen(*m_hilightPen);
+                dc.DrawLine(m_sashPosition+1, m_borderSize, m_sashPosition+m_sashSize-1, m_borderSize);
+
+                // Bottom
+                dc.SetPen(*m_darkShadowPen);
+                dc.DrawLine(m_sashPosition+1, h-m_borderSize-1, m_sashPosition+m_sashSize-1, h-m_borderSize-1);
+            }
         }
         else
         {
@@ -524,6 +549,18 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
 
             dc.SetPen(*m_darkShadowPen);
             dc.DrawLine(m_borderSize, m_sashPosition+m_sashSize-1, w-m_borderSize, m_sashPosition+m_sashSize-1);
+
+            // Draw the left and right edges of the sash, if requested
+            if (GetWindowStyle() & wxSP_FULLSASH)
+            {
+                // Left
+                dc.SetPen(*m_hilightPen);
+                dc.DrawLine(m_borderSize, m_sashPosition, m_borderSize, m_sashPosition+m_sashSize);
+
+                // Right
+                dc.SetPen(*m_darkShadowPen);
+                dc.DrawLine(w-m_borderSize-1, m_sashPosition+1, w-m_borderSize-1, m_sashPosition+m_sashSize-1);
+            }
         }
     }
     else
@@ -533,19 +570,28 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
             dc.SetPen(*wxBLACK_PEN);
             dc.SetBrush(*wxBLACK_BRUSH);
             int h1 = h-1;
-            if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER )
+            int y1 = 0;
+            if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
                 h1 += 1; // Not sure why this is necessary...
-            dc.DrawRectangle(m_sashPosition, 0, m_sashSize, h1);
+            if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER)
+            {
+                y1 = 2; h1 -= 3;
+            }
+            dc.DrawRectangle(m_sashPosition, y1, m_sashSize, h1);
         }
         else
         {
             dc.SetPen(*wxBLACK_PEN);
             dc.SetBrush(*wxBLACK_BRUSH);
             int w1 = w-1;
-            if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER )
+            int x1 = 0;
+            if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
                 w1 ++;
-
-            dc.DrawRectangle(0, m_sashPosition, w1, m_sashSize);
+            if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER)
+            {
+                x1 = 2; w1 -= 3;
+            }
+            dc.DrawRectangle(x1, m_sashPosition, w1, m_sashSize);
         }
 
     }
@@ -618,42 +664,42 @@ void wxSplitterWindow::SizeWindows()
     int w, h;
     GetClientSize(&w, &h);
 
-    if ( m_windowOne && !m_windowTwo )
+    if ( GetWindow1() && !GetWindow2() )
     {
-        m_windowOne->SetSize(m_borderSize, m_borderSize, w - 2*m_borderSize, h - 2*m_borderSize);
+        GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(), w - 2*GetBorderSize(), h - 2*GetBorderSize());
 
     }
-    else if ( m_windowOne && m_windowTwo )
+    else if ( GetWindow1() && GetWindow2() )
     {
-        if (m_splitMode == wxSPLIT_VERTICAL)
+        if (GetSplitMode() == wxSPLIT_VERTICAL)
         {
-            int x1 = m_borderSize;
-            int y1 = m_borderSize;
-            int w1 = m_sashPosition - m_borderSize;
-            int h1 = h - 2*m_borderSize;
-
-            int x2 = m_sashPosition + m_sashSize;
-            int y2 = m_borderSize;
-            int w2 = w - 2*m_borderSize - m_sashSize - w1;
-            int h2 = h - 2*m_borderSize;
-
-            m_windowOne->SetSize(x1, y1, w1, h1);
-            m_windowTwo->SetSize(x2, y2, w2, h2);
-
+            int x1 = GetBorderSize();
+            int y1 = GetBorderSize();
+            int w1 = GetSashPosition() - GetBorderSize();
+            int h1 = h - 2*GetBorderSize();
+
+            int x2 = GetSashPosition() + GetSashSize();
+            int y2 = GetBorderSize();
+            int w2 = w - 2*GetBorderSize() - GetSashSize() - w1;
+            int h2 = h - 2*GetBorderSize();
+
+            GetWindow1()->SetSize(x1, y1, w1, h1);
+            GetWindow2()->SetSize(x2, y2, w2, h2);
         }
         else
         {
-            m_windowOne->SetSize(m_borderSize, 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));
-
+            GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(),
+                w - 2*GetBorderSize(), GetSashPosition() - GetBorderSize());
+            GetWindow2()->SetSize(GetBorderSize(), GetSashPosition() + GetSashSize(),
+                w - 2*GetBorderSize(), h - 2*GetBorderSize() - GetSashSize() - (GetSashPosition() - GetBorderSize()));
         }
     }
     wxClientDC dc(this);
-    if ( m_borderSize > 0 )
+    if ( GetBorderSize() > 0 )
         DrawBorders(dc);
     DrawSash(dc);
+
+    SetNeedUpdating(FALSE);
 }
 
 // Set pane for unsplit window
@@ -681,7 +727,7 @@ bool wxSplitterWindow::SplitVertically(wxWindow *window1, wxWindow *window2, int
     if ( sashPosition > 0 )
         m_sashPosition = sashPosition;
     else if ( sashPosition < 0 )
-        m_sashPosition = w - sashPosition;
+        m_sashPosition = w + sashPosition;   // It's negative so adding is subtracting
     else    // default
         m_sashPosition = w/2;
 
@@ -704,7 +750,7 @@ bool wxSplitterWindow::SplitHorizontally(wxWindow *window1, wxWindow *window2, i
     if ( sashPosition > 0 )
         m_sashPosition = sashPosition;
     else if ( sashPosition < 0 )
-        m_sashPosition = h - sashPosition;
+        m_sashPosition = h + sashPosition; // It's negative so adding is subtracting
     else    // default
         m_sashPosition = h/2;
 
@@ -794,7 +840,7 @@ void wxSplitterWindow::InitColours()
     wxDELETE( m_hilightPen );
 
     // Shadow colours
-#if defined(__WIN95__)
+#ifndef __WIN16__
     wxColour faceColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
     m_facePen = new wxPen(faceColour, 1, wxSOLID);
     m_faceBrush = new wxBrush(faceColour, wxSOLID);
@@ -810,14 +856,14 @@ void wxSplitterWindow::InitColours()
 
     wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT));
     m_hilightPen = new wxPen(hilightColour, 1, wxSOLID);
-#else // !Win32
+#else
     m_facePen = new wxPen("LIGHT GREY", 1, wxSOLID);
     m_faceBrush = new wxBrush("LIGHT GREY", wxSOLID);
     m_mediumShadowPen = new wxPen("GREY", 1, wxSOLID);
     m_darkShadowPen = new wxPen("BLACK", 1, wxSOLID);
     m_lightShadowPen = new wxPen("LIGHT GREY", 1, wxSOLID);
     m_hilightPen = new wxPen("WHITE", 1, wxSOLID);
-#endif // Win32/!Win32
+#endif // __WIN16__
 }
 
 void wxSplitterWindow::SendUnsplitEvent(wxWindow *winRemoved)
@@ -909,3 +955,27 @@ void wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)
     // for compatibility, call the virtual function
     OnUnsplit(win);
 }
+
+#if defined(__WXMSW__)
+    #define WXUNUSED_UNLESS_MSW(identifier)    identifier
+#else
+    #define WXUNUSED_UNLESS_MSW(identifier)    WXUNUSED(identifier)
+#endif
+
+void wxSplitterWindow::OnSetCursor(wxSetCursorEvent& WXUNUSED_UNLESS_MSW(event))
+{
+    // this is currently called (and needed) under MSW only...
+#ifdef __WXMSW__
+
+    // if we don't do it, the resizing cursor might be set for child window:
+    // 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()) )
+    {
+        // default processing is ok
+        event.Skip();
+    }
+    //else: do nothing, in particular, don't call Skip()
+#endif // wxMSW
+}