// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
END_EVENT_TABLE()
#endif
-wxSplitterWindow::wxSplitterWindow(void)
+wxSplitterWindow::wxSplitterWindow()
{
m_splitMode = wxSPLIT_VERTICAL;
- m_windowOne = NULL;
- m_windowTwo = NULL;
+ m_windowOne = (wxWindow *) NULL;
+ m_windowTwo = (wxWindow *) NULL;
m_dragMode = wxSPLIT_DRAG_NONE;
m_oldX = 0;
m_oldY = 0;
m_sashSize = 7;
m_borderSize = 2;
m_sashPosition = 0;
- m_sashCursorWE = NULL;
- m_sashCursorNS = NULL;
- m_sashTrackerPen = NULL;
- m_lightShadowPen = NULL;
- m_mediumShadowPen = NULL;
- m_darkShadowPen = NULL;
- m_faceBrush = NULL;
- m_facePen = NULL;
- m_hilightPen = NULL;
+ 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;
}
-wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos,
- const wxSize& size, long style, const wxString& name)
- :wxWindow(parent, id, pos, size, style, name)
+wxSplitterWindow::wxSplitterWindow(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;
- m_windowOne = NULL;
- m_windowTwo = NULL;
+ m_windowOne = (wxWindow *) NULL;
+ m_windowTwo = (wxWindow *) NULL;
m_dragMode = wxSPLIT_DRAG_NONE;
m_oldX = 0;
m_oldY = 0;
m_sashCursorWE = new wxCursor(wxCURSOR_SIZEWE);
m_sashCursorNS = new wxCursor(wxCURSOR_SIZENS);
m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxSOLID);
- m_lightShadowPen = NULL;
- m_mediumShadowPen = NULL;
- m_darkShadowPen = NULL;
- m_faceBrush = NULL;
- m_facePen = NULL;
- m_hilightPen = 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;
if ( style & wxSP_3D )
{
// Eventually, we'll respond to colour change messages
InitColours();
- SetDoubleClick(TRUE);
-
// For debugging purposes, to see the background.
// SetBackground(wxBLUE_BRUSH);
}
-wxSplitterWindow::~wxSplitterWindow(void)
+wxSplitterWindow::~wxSplitterWindow()
{
delete m_sashCursorWE;
delete m_sashCursorNS;
long x, y;
event.Position(&x, &y);
- if (event.LeftDown())
- {
+ if (event.LeftDown())
+ {
if ( SashHitTest(x, y) )
{
- CaptureMouse();
-
- // 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.
- wxScreenDC::StartDrawingOnTop(this);
-
- // We don't say we're dragging yet; we leave that
- // decision for the Dragging() branch, to ensure
- // the user has dragged a little bit.
- m_dragMode = wxSPLIT_DRAG_LEFT_DOWN;
- m_firstX = x;
- m_firstY = y;
- }
- }
- else if ( event.LeftUp() && m_dragMode == wxSPLIT_DRAG_LEFT_DOWN )
- {
- // Wasn't a proper drag
- ReleaseMouse();
- wxScreenDC::EndDrawingOnTop();
- m_dragMode = wxSPLIT_DRAG_NONE;
+ CaptureMouse();
- SetCursor(*wxSTANDARD_CURSOR);
- wxSetCursor(*wxSTANDARD_CURSOR);
+ m_dragMode = wxSPLIT_DRAG_DRAGGING;
+
+ DrawSashTracker(x, y);
+ m_oldX = x;
+ m_oldY = y;
+ return;
+ }
}
- else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING)
- {
+ else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING)
+ {
// We can stop dragging now and see what we've got.
m_dragMode = wxSPLIT_DRAG_NONE;
- ReleaseMouse();
+ ReleaseMouse();
+
// Erase old tracker
DrawSashTracker(m_oldX, m_oldY);
- // End drawing on top (frees the window used for drawing
- // over the screen)
- wxScreenDC::EndDrawingOnTop();
-
int w, h;
- GetClientSize(&w, &h);
+ GetClientSize(&w, &h);
if ( m_splitMode == wxSPLIT_VERTICAL )
{
- // First check if we should veto this resize because
- // the pane size is too small
- if ( wxMax(x, 0) < m_minimumPaneSize || wxMax((w - x), 0) < m_minimumPaneSize)
+ if ( !OnSashPositionChange(x) )
return;
if ( x <= 4 )
// We remove the first window from the view
wxWindow *removedWindow = m_windowOne;
m_windowOne = m_windowTwo;
- m_windowTwo = NULL;
+ m_windowTwo = (wxWindow *) NULL;
OnUnsplit(removedWindow);
m_sashPosition = 0;
{
// We remove the second window from the view
wxWindow *removedWindow = m_windowTwo;
- m_windowTwo = NULL;
+ m_windowTwo = (wxWindow *) NULL;
OnUnsplit(removedWindow);
m_sashPosition = 0;
}
m_sashPosition = x;
}
}
- else
+ else // m_splitMode == wxSPLIT_VERTICAL
{
- // First check if we should veto this resize because
- // the pane size is too small
- if ( wxMax(y, 0) < m_minimumPaneSize || wxMax((h - y), 0) < m_minimumPaneSize)
+ if ( !OnSashPositionChange(y) )
return;
if ( y <= 4 )
// We remove the first window from the view
wxWindow *removedWindow = m_windowOne;
m_windowOne = m_windowTwo;
- m_windowTwo = NULL;
+ m_windowTwo = (wxWindow *) NULL;
OnUnsplit(removedWindow);
m_sashPosition = 0;
{
// We remove the second window from the view
wxWindow *removedWindow = m_windowTwo;
- m_windowTwo = NULL;
+ m_windowTwo = (wxWindow *) NULL;
OnUnsplit(removedWindow);
m_sashPosition = 0;
}
{
m_sashPosition = y;
}
- }
+ } // m_splitMode == wxSPLIT_VERTICAL
SizeWindows();
- }
- else if (event.Moving() && !event.Dragging())
- {
+ } // left up && dragging
+ else if (event.Moving() && !event.Dragging())
+ {
// Just change the cursor if required
if ( SashHitTest(x, y) )
{
- if ( m_splitMode == wxSPLIT_VERTICAL )
+ if ( m_splitMode == wxSPLIT_VERTICAL )
{
- SetCursor(*m_sashCursorWE);
- // Windows needs the following
- wxSetCursor(*m_sashCursorWE);
+ SetCursor(*m_sashCursorWE);
}
else
{
- SetCursor(*m_sashCursorNS);
- wxSetCursor(*m_sashCursorNS);
+ SetCursor(*m_sashCursorNS);
}
}
else
{
- SetCursor(*wxSTANDARD_CURSOR);
- wxSetCursor(*wxSTANDARD_CURSOR);
+ SetCursor(*wxSTANDARD_CURSOR);
}
- }
- else if ( (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) ||
- (event.Dragging() && SashHitTest(x, y, 4)) )
- {
- if ( m_splitMode == wxSPLIT_VERTICAL )
- {
- SetCursor(*m_sashCursorWE);
- wxSetCursor(*m_sashCursorWE);
- }
- else
- {
- SetCursor(*m_sashCursorNS);
- wxSetCursor(*m_sashCursorNS);
- }
-
- // Detect that this is really a drag: we've moved more than 1 pixel either way
- if ((m_dragMode == wxSPLIT_DRAG_LEFT_DOWN) &&
-// (abs((int)x - m_firstX) > 1 || abs((int)y - m_firstY) > 1) )
- (abs((int)x - m_firstX) > 0 || abs((int)y - m_firstY) > 1) )
- {
- m_dragMode = wxSPLIT_DRAG_DRAGGING;
- DrawSashTracker(x, y);
- }
- else
- {
- if ( m_dragMode == wxSPLIT_DRAG_DRAGGING )
- {
- // Erase old tracker
- DrawSashTracker(m_oldX, m_oldY);
+ }
+ else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))
+ {
+ // Erase old tracker
+ DrawSashTracker(m_oldX, m_oldY);
- // Draw new one
- DrawSashTracker(x, y);
- }
- }
+ // Draw new one
+ DrawSashTracker(x, y);
+
m_oldX = x;
m_oldY = y;
- }
+ }
else if ( event.LeftDClick() )
{
OnDoubleClickSash(x, y);
}
- else
- {
- SetCursor(*wxSTANDARD_CURSOR);
- wxSetCursor(*wxSTANDARD_CURSOR);
- }
}
void wxSplitterWindow::OnSize(wxSizeEvent& WXUNUSED(event))
// Position and size subwindows.
// Note that the border size applies to each subwindow, not
// including the edges next to the sash.
-void wxSplitterWindow::SizeWindows(void)
+void wxSplitterWindow::SizeWindows()
{
int w, h;
GetClientSize(&w, &h);
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);
+ m_windowOne->SetSize(x1, y1, w1, h1);
+ m_windowTwo->SetSize(x2, y2, w2, h2);
}
else
{
void wxSplitterWindow::Initialize(wxWindow *window)
{
m_windowOne = window;
- m_windowTwo = NULL;
+ m_windowTwo = (wxWindow *) NULL;
m_sashPosition = 0;
}
if ( IsSplit() )
return FALSE;
+ int w, h;
+ GetClientSize(&w, &h);
+
m_splitMode = wxSPLIT_VERTICAL;
m_windowOne = window1;
m_windowTwo = window2;
- if ( sashPosition == -1 )
- m_sashPosition = 100;
- else
+ if ( sashPosition > 0 )
m_sashPosition = sashPosition;
+ else if ( sashPosition < 0 )
+ m_sashPosition = w - sashPosition;
+ else // default
+ m_sashPosition = w/2;
SizeWindows();
if ( IsSplit() )
return FALSE;
+ int w, h;
+ GetClientSize(&w, &h);
+
m_splitMode = wxSPLIT_HORIZONTAL;
m_windowOne = window1;
m_windowTwo = window2;
- if ( sashPosition == -1 )
- m_sashPosition = 100;
- else
+ if ( sashPosition > 0 )
m_sashPosition = sashPosition;
+ else if ( sashPosition < 0 )
+ m_sashPosition = h - sashPosition;
+ else // default
+ m_sashPosition = h/2;
SizeWindows();
if ( toRemove == NULL || toRemove == m_windowTwo)
{
wxWindow *win = m_windowTwo ;
- m_windowTwo = NULL;
+ m_windowTwo = (wxWindow *) NULL;
m_sashPosition = 0;
OnUnsplit(win);
SizeWindows();
{
wxWindow *win = m_windowOne ;
m_windowOne = m_windowTwo;
- m_windowTwo = NULL;
+ m_windowTwo = (wxWindow *) NULL;
m_sashPosition = 0;
OnUnsplit(win);
SizeWindows();
}
}
+bool wxSplitterWindow::OnSashPositionChange(int newSashPosition)
+{
+ // is the left/upper pane too small?
+ if ( newSashPosition < m_minimumPaneSize )
+ return NULL;
+
+ // is the right/lower pane too small?
+ int w, h;
+ GetClientSize(&w, &h);
+
+ if ( m_splitMode == wxSPLIT_VERTICAL )
+ {
+ if ( w - newSashPosition < m_minimumPaneSize )
+ return FALSE;
+ }
+ else // m_splitMode = wxSPLIT_HORIZONTAL
+ {
+ if ( h - newSashPosition < m_minimumPaneSize )
+ return FALSE;
+ }
+
+ // it's ok to move sash
+ return TRUE;
+}
+
// Called when the sash is double-clicked.
// The default behaviour is to remove the sash if the
// minimum pane size is zero.
}
// Initialize colours
-void wxSplitterWindow::InitColours(void)
+void wxSplitterWindow::InitColours()
{
- if ( m_facePen )
- delete m_facePen;
- if ( m_faceBrush )
- delete m_faceBrush;
- if ( m_mediumShadowPen )
- delete m_mediumShadowPen;
- if ( m_darkShadowPen )
- delete m_darkShadowPen;
- if ( m_lightShadowPen )
- delete m_lightShadowPen;
- if ( m_hilightPen )
- delete m_hilightPen;
+ wxDELETE( m_facePen );
+ wxDELETE( m_faceBrush );
+ wxDELETE( m_mediumShadowPen );
+ wxDELETE( m_darkShadowPen );
+ wxDELETE( m_lightShadowPen );
+ wxDELETE( m_hilightPen );
// Shadow colours
#if defined(__WIN95__)
-// COLORREF ref = ::GetSysColor(COLOR_3DFACE); // Normally light grey
wxColour faceColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
m_facePen = new wxPen(faceColour, 1, wxSOLID);
m_faceBrush = new wxBrush(faceColour, wxSOLID);
-// ref = ::GetSysColor(COLOR_3DSHADOW); // Normally dark grey
wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
m_mediumShadowPen = new wxPen(mediumShadowColour, 1, wxSOLID);
-// ref = ::GetSysColor(COLOR_3DDKSHADOW); // Normally black
wxColour darkShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW));
m_darkShadowPen = new wxPen(darkShadowColour, 1, wxSOLID);
-// ref = ::GetSysColor(COLOR_3DLIGHT); // Normally light grey
wxColour lightShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT));
m_lightShadowPen = new wxPen(lightShadowColour, 1, wxSOLID);
-// ref = ::GetSysColor(COLOR_3DHILIGHT); // Normally white
wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT));
m_hilightPen = new wxPen(hilightColour, 1, wxSOLID);
-#else
+#else // !Win32
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
+#endif // Win32/!Win32
}
projects / wxWidgets.git / blobdiff