#endif
#ifndef WX_PRECOMP
- #include "wx/wx.h"
+ #include "wx/window.h"
+ #include "wx/dialog.h"
+ #include "wx/frame.h"
#endif
#include <stdlib.h>
#include "wx/string.h"
#include "wx/splitter.h"
#include "wx/dcscreen.h"
+#include "wx/settings.h"
+#include "wx/log.h"
+#include "wx/utils.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)
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
EVT_SPLITTER_SASH_POS_CHANGING(-1, wxSplitterWindow::OnSashPosChanged)
EVT_SPLITTER_DCLICK(-1, wxSplitterWindow::OnDoubleClick)
EVT_SPLITTER_UNSPLIT(-1, wxSplitterWindow::OnUnsplitEvent)
+
+ WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow)
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;
-}
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow);
-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;
+ // allow TABbing from one window to the other
+ style |= wxTAB_TRAVERSAL;
+
+ 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;
+
+#ifdef __WXMAC__
+ int major,minor;
+ wxGetOsVersion( &major, &minor );
+ if (major >= 10)
+ m_windowStyle |= wxSP_SASH_AQUA;
+#endif
+
+ return TRUE;
+}
+
+void wxSplitterWindow::Init()
+{
+ m_container.SetContainerWindow(this);
+
+ m_splitMode = wxSPLIT_VERTICAL;
+ m_permitUnsplitAlways = TRUE;
m_windowOne = (wxWindow *) NULL;
m_windowTwo = (wxWindow *) NULL;
m_dragMode = wxSPLIT_DRAG_NONE;
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;
}
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__
SetCursor(wxCursor());
#endif
+ if (GetWindowStyle() & wxSP_NOSASH)
+ return;
if (event.LeftDown())
{
m_dragMode = wxSPLIT_DRAG_DRAGGING;
if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
- {
- DrawSashTracker(x, y);
- }
-
+ {
+ DrawSashTracker(x, y);
+ }
+
m_oldX = x;
m_oldY = y;
+
+ if ( m_splitMode == wxSPLIT_VERTICAL )
+ {
+ SetCursor(*m_sashCursorWE);
+ }
+ else
+ {
+ SetCursor(*m_sashCursorNS);
+ }
return;
}
}
// Erase old tracker
if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
- {
+ {
DrawSashTracker(m_oldX, m_oldY);
- }
+ }
// Obtain window size. We are only interested in the dimension the sash
// splits up
}
}
- if ( m_permitUnsplitAlways
- || m_minimumPaneSize == 0 )
+ if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 )
{
// Deal with possible unsplit scenarios
if ( new_sash_position == 0 )
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);
}
#endif // __WXGTK__
}
- else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))
+ 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 =
}
}
+ if (new_sash_position == m_sashPosition)
+ return;
+
// Erase old tracker
if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
- {
+ {
DrawSashTracker(m_oldX, m_oldY);
- }
+ }
if (m_splitMode == wxSPLIT_VERTICAL)
x = new_sash_position;
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
// Draw new one
if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
- {
+ {
DrawSashTracker(m_oldX, m_oldY);
- }
- else
- {
+ }
+ else
+ {
m_sashPosition = new_sash_position;
- m_needUpdating = TRUE;
- }
+ m_needUpdating = TRUE;
+ }
}
else if ( event.LeftDClick() )
{
if ( dialog )
iconized = dialog->IsIconized();
else
- wxFAIL_MSG(T("should have a top level frame or dialog parent!"));
+ wxFAIL_MSG(wxT("should have a top level frame or dialog parent!"));
}
if ( iconized )
else
return FALSE;
}
-
- return FALSE;
}
// Draw 3D effect borders
int w, h;
GetClientSize(&w, &h);
- if ( GetWindowStyleFlag() & wxSP_3D )
+ if ( GetWindowStyleFlag() & wxSP_3DBORDER )
{
-
+
dc.SetPen(*m_facePen);
dc.SetBrush(*m_faceBrush);
dc.DrawRectangle(1, 1 , w-1, m_borderSize-2 ); //high
{
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 )
{
dc.SetPen(*m_facePen);
- dc.SetBrush(*m_faceBrush);
+
+ if (HasFlag( wxSP_SASH_AQUA ))
+ dc.SetBrush(*wxWHITE_BRUSH);
+ else
+ dc.SetBrush(*m_faceBrush);
dc.DrawRectangle(m_sashPosition + 2, 0 , m_sashSize - 4, h );
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);
dc.DrawLine(m_sashPosition+1, m_borderSize - 2, m_sashPosition+1, h - m_borderSize+2);
- dc.SetPen(*m_mediumShadowPen);
- int yMedium = m_borderSize ? h-m_borderSize+1 : h ;
+ if (!HasFlag( wxSP_SASH_AQUA ))
+ dc.SetPen(*m_mediumShadowPen);
+
+ int yMedium = m_borderSize ? h-m_borderSize+1 : h ;
dc.DrawLine(m_sashPosition+m_sashSize-2, xShadow, m_sashPosition+m_sashSize-2, yMedium);
- dc.SetPen(*m_darkShadowPen);
+ if (HasFlag( wxSP_SASH_AQUA ))
+ dc.SetPen(*m_lightShadowPen);
+ else
+ 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
{
dc.SetPen(*m_facePen);
- dc.SetBrush(*m_faceBrush);
+ if (HasFlag( wxSP_SASH_AQUA ))
+ dc.SetBrush(*wxWHITE_BRUSH);
+ else
+ dc.SetBrush(*m_faceBrush);
dc.DrawRectangle( m_borderSize-2, m_sashPosition + 2, w-m_borderSize+2, m_sashSize - 4);
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.SetPen(*m_hilightPen);
dc.DrawLine(m_borderSize-2, m_sashPosition+1, w-m_borderSize+1, m_sashPosition+1);
- dc.SetPen(*m_mediumShadowPen);
+ if (!HasFlag( wxSP_SASH_AQUA ))
+ dc.SetPen(*m_mediumShadowPen);
dc.DrawLine(m_borderSize-1, m_sashPosition+m_sashSize-2, w-m_borderSize+1, m_sashPosition+m_sashSize-2);
- dc.SetPen(*m_darkShadowPen);
+ if (HasFlag( wxSP_SASH_AQUA ))
+ dc.SetPen(*m_lightShadowPen);
+ else
+ 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
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);
}
}
screenDC.SetBrush(wxNullBrush);
}
+void wxSplitterWindow::AdjustSashPosition(int &sashPos)
+{
+ int w, h;
+ GetClientSize(&w, &h);
+ int window_size = (m_splitMode == wxSPLIT_VERTICAL) ? w : h;
+ wxWindow *win;
+
+ if ( sashPos < m_minimumPaneSize )
+ sashPos = m_minimumPaneSize;
+ else if ( sashPos > window_size - m_minimumPaneSize )
+ sashPos = window_size - m_minimumPaneSize;
+
+ win = GetWindow1();
+ if ( win )
+ {
+ int minSize = (m_splitMode == wxSPLIT_VERTICAL) ?
+ win->GetMinWidth() : win->GetMinHeight();
+ if ( minSize != -1 && sashPos < minSize + GetBorderSize() )
+ sashPos = minSize + GetBorderSize();
+ }
+
+ win = GetWindow2();
+ if ( win )
+ {
+ int minSize = (m_splitMode == wxSPLIT_VERTICAL) ?
+ win->GetMinWidth() : win->GetMinHeight();
+ if ( minSize != -1 && sashPos > window_size - minSize - GetBorderSize() )
+ sashPos = window_size - minSize - GetBorderSize();
+ }
+}
+
// Position and size subwindows.
// Note that the border size applies to each subwindow, not
// including the edges next to the sash.
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);
-
- if (m_windowOne->GetAutoLayout())
- m_windowOne->Layout();
+ 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);
-
- if (m_windowOne->GetAutoLayout())
- m_windowOne->Layout();
- if (m_windowTwo->GetAutoLayout())
- m_windowTwo->Layout();
+ 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));
-
- if (m_windowOne->GetAutoLayout())
- m_windowOne->Layout();
- if (m_windowTwo->GetAutoLayout())
- m_windowTwo->Layout();
+ 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 )
- DrawBorders(dc);
+ if ( GetBorderSize() > 0 )
+ DrawBorders(dc);
DrawSash(dc);
+
+ SetNeedUpdating(FALSE);
}
// Set pane for unsplit window
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;
+
+ AdjustSashPosition(m_sashPosition);
SizeWindows();
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;
+ AdjustSashPosition(m_sashPosition);
+
SizeWindows();
return TRUE;
}
else
{
- wxFAIL_MSG(T("splitter: attempt to remove a non-existent window"));
+ wxFAIL_MSG(wxT("splitter: attempt to remove a non-existent window"));
return FALSE;
}
// Replace a window with another one
bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
{
- wxCHECK_MSG( winOld, FALSE, T("use one of Split() functions instead") );
- wxCHECK_MSG( winNew, FALSE, T("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 )
{
}
else
{
- wxFAIL_MSG(T("splitter: attempt to replace a non-existent window"));
+ wxFAIL_MSG(wxT("splitter: attempt to replace a non-existent window"));
return FALSE;
}
void wxSplitterWindow::SetSashPosition(int position, bool redraw)
{
m_sashPosition = position;
+ AdjustSashPosition(m_sashPosition);
if ( redraw )
{
wxDELETE( m_hilightPen );
// Shadow colours
-#if defined(__WIN95__)
- wxColour faceColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+#ifndef __WIN16__
+ wxColour faceColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
m_facePen = new wxPen(faceColour, 1, wxSOLID);
m_faceBrush = new wxBrush(faceColour, wxSOLID);
- wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
+ wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
m_mediumShadowPen = new wxPen(mediumShadowColour, 1, wxSOLID);
- wxColour darkShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW));
+ wxColour darkShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW));
m_darkShadowPen = new wxPen(darkShadowColour, 1, wxSOLID);
- wxColour lightShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT));
+ wxColour lightShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT));
m_lightShadowPen = new wxPen(lightShadowColour, 1, wxSOLID);
- wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT));
+ wxColour hilightColour(wxSystemSettings::GetColour(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)
if ( !unsplit_scenario )
{
// If resultant pane would be too small, enlarge it
- if ( newSashPosition < m_minimumPaneSize )
- newSashPosition = m_minimumPaneSize;
- if ( newSashPosition > window_size - m_minimumPaneSize )
- newSashPosition = window_size - m_minimumPaneSize;
+ AdjustSashPosition(newSashPosition);
}
// If the result is out of bounds it means minimum size is too big,
// for compatibility, call the virtual function
OnDoubleClickSash(event.GetX(), event.GetY());
- if ( GetMinimumPaneSize() == 0
- || m_permitUnsplitAlways)
+ if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways )
{
Unsplit();
}
{
wxWindow *win = event.GetWindowBeingRemoved();
+ // do it before calling OnUnsplit() which may delete the window
+ win->Show(FALSE);
+
// for compatibility, call the virtual function
OnUnsplit(win);
+}
- win->Show(FALSE);
+#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
}
projects / wxWidgets.git / blobdiff