// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "sashwin.h"
#endif
#include "wx/settings.h"
#endif
-#include <math.h>
+#include "wx/math.h"
+
#include <stdlib.h>
#include "wx/dcscreen.h"
EVT_PAINT(wxSashWindow::OnPaint)
EVT_SIZE(wxSashWindow::OnSize)
EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)
+#if defined( __WXMSW__ ) || defined( __WXMAC__)
+ EVT_SET_CURSOR(wxSashWindow::OnSetCursor)
+#endif // wxMSW
+
END_EVENT_TABLE()
bool wxSashWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
m_maximumPaneSizeY = 10000;
m_sashCursorWE = new wxCursor(wxCURSOR_SIZEWE);
m_sashCursorNS = new wxCursor(wxCURSOR_SIZENS);
- m_mouseCaptured = FALSE;
+ m_mouseCaptured = false;
+ m_currentCursor = NULL;
// Eventually, we'll respond to colour change messages
InitColours();
{
wxPaintDC dc(this);
- // if ( m_borderSize > 0 )
DrawBorders(dc);
-
DrawSashes(dc);
}
wxSashEdgePosition sashHit = SashHitTest(x, y);
- // reset the cursor
-#if defined(__WXMOTIF__) || defined(__WXGTK__)
- // Not necessary and in fact inhibits proper cursor setting (JACS 8/2000)
- //SetCursor(* wxSTANDARD_CURSOR);
-#endif
-#ifdef __WXMSW__
- SetCursor(wxNullCursor);
-#endif
-
if (event.LeftDown())
{
CaptureMouse();
- m_mouseCaptured = TRUE;
+ m_mouseCaptured = true;
if ( sashHit != wxSASH_NONE )
{
if ( (sashHit == wxSASH_LEFT) || (sashHit == wxSASH_RIGHT) )
{
- SetCursor(*m_sashCursorWE);
+ if (m_currentCursor != m_sashCursorWE)
+ {
+ SetCursor(*m_sashCursorWE);
+ }
+ m_currentCursor = m_sashCursorWE;
}
else
{
- SetCursor(*m_sashCursorNS);
+ if (m_currentCursor != m_sashCursorNS)
+ {
+ SetCursor(*m_sashCursorNS);
+ }
+ m_currentCursor = m_sashCursorNS;
}
}
}
// Wasn't a proper drag
if (m_mouseCaptured)
ReleaseMouse();
- m_mouseCaptured = FALSE;
+ m_mouseCaptured = false;
wxScreenDC::EndDrawingOnTop();
m_dragMode = wxSASH_DRAG_NONE;
m_dragMode = wxSASH_DRAG_NONE;
if (m_mouseCaptured)
ReleaseMouse();
- m_mouseCaptured = FALSE;
+ m_mouseCaptured = false;
// Erase old tracker
DrawSashTracker(m_draggingEdge, m_oldX, m_oldY);
wxSashDragStatus status = wxSASH_STATUS_OK;
// the new height and width of the window - if -1, it didn't change
- int newHeight = -1,
- newWidth = -1;
+ int newHeight = wxDefaultCoord,
+ newWidth = wxDefaultCoord;
// 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
break;
}
- if ( newHeight == -1 )
+ if ( newHeight == wxDefaultCoord )
{
// didn't change
newHeight = h;
newHeight = wxMin(newHeight, m_maximumPaneSizeY);
}
- if ( newWidth == -1 )
+ if ( newWidth == wxDefaultCoord )
{
// didn't change
newWidth = w;
{
if (m_mouseCaptured)
ReleaseMouse();
- m_mouseCaptured = FALSE;
+ m_mouseCaptured = false;
}
else if (event.Moving() && !event.Dragging())
{
{
if ( (sashHit == wxSASH_LEFT) || (sashHit == wxSASH_RIGHT) )
{
- SetCursor(*m_sashCursorWE);
+ if (m_currentCursor != m_sashCursorWE)
+ {
+ SetCursor(*m_sashCursorWE);
+ }
+ m_currentCursor = m_sashCursorWE;
}
else
{
- SetCursor(*m_sashCursorNS);
+ if (m_currentCursor != m_sashCursorNS)
+ {
+ SetCursor(*m_sashCursorNS);
+ }
+ m_currentCursor = m_sashCursorNS;
}
}
else
{
SetCursor(wxNullCursor);
+ m_currentCursor = NULL;
}
}
else if ( event.Dragging() &&
{
if ( (m_draggingEdge == wxSASH_LEFT) || (m_draggingEdge == wxSASH_RIGHT) )
{
- SetCursor(*m_sashCursorWE);
+ if (m_currentCursor != m_sashCursorWE)
+ {
+ SetCursor(*m_sashCursorWE);
+ }
+ m_currentCursor = m_sashCursorWE;
}
else
{
- SetCursor(*m_sashCursorNS);
+ if (m_currentCursor != m_sashCursorNS)
+ {
+ SetCursor(*m_sashCursorNS);
+ }
+ m_currentCursor = m_sashCursorNS;
}
if (m_dragMode == wxSASH_DRAG_LEFT_DOWN)
wxPen darkShadowPen(m_darkShadowColour, 1, wxSOLID);
wxPen lightShadowPen(m_lightShadowColour, 1, wxSOLID);
wxPen hilightPen(m_hilightColour, 1, wxSOLID);
- wxPen blackPen(wxColour(0, 0, 0), 1, wxSOLID);
- wxPen whitePen(wxColour(255, 255, 255), 1, wxSOLID);
+ wxColour blackClr(0, 0, 0);
+ wxColour whiteClr(255, 255, 255);
+ wxPen blackPen(blackClr, 1, wxSOLID);
+ wxPen whitePen(whiteClr, 1, wxSOLID);
if ( edge == wxSASH_LEFT || edge == wxSASH_RIGHT )
{
- int sashPosition = 0;
- if (edge == wxSASH_LEFT)
- sashPosition = 0;
- else
- sashPosition = w - GetEdgeMargin(edge);
+ int sashPosition = (edge == wxSASH_LEFT) ? 0 : ( w - GetEdgeMargin(edge) );
dc.SetPen(facePen);
dc.SetBrush(faceBrush);
}
else // top or bottom
{
- int sashPosition = 0;
- if (edge == wxSASH_TOP)
- sashPosition = 0;
- else
- sashPosition = h - GetEdgeMargin(edge);
+ int sashPosition = (edge == wxSASH_TOP) ? 0 : ( h - GetEdgeMargin(edge) );
dc.SetPen(facePen);
dc.SetBrush(faceBrush);
int cw, ch;
GetClientSize(&cw, &ch);
- if (GetChildren().Number() == 1)
+ if (GetChildren().GetCount() == 1)
{
- wxWindow* child = (wxWindow*) (GetChildren().First()->Data());
+ wxWindow* child = GetChildren().GetFirst()->GetData();
int x = 0;
int y = 0;
child->SetSize(x, y, width, height);
}
- else if (GetChildren().Number() > 1)
+ else if (GetChildren().GetCount() > 1)
{
// Perhaps multiple children are themselves sash windows.
// TODO: this doesn't really work because the subwindows sizes/positions
void wxSashWindow::InitColours()
{
// Shadow colours
-#ifndef __WIN16__
- m_faceColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
- m_mediumShadowColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW);
- m_darkShadowColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW);
- m_lightShadowColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT);
- m_hilightColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT);
-#else
- m_faceColour = *(wxTheColourDatabase->FindColour("LIGHT GREY"));
- m_mediumShadowColour = *(wxTheColourDatabase->FindColour("GREY"));
- m_darkShadowColour = *(wxTheColourDatabase->FindColour("BLACK"));
- m_lightShadowColour = *(wxTheColourDatabase->FindColour("LIGHT GREY"));
- m_hilightColour = *(wxTheColourDatabase->FindColour("WHITE"));
-#endif
+ m_faceColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+ m_mediumShadowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
+ m_darkShadowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW);
+ m_lightShadowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
+ m_hilightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT);
}
void wxSashWindow::SetSashVisible(wxSashEdgePosition edge, bool sash)
m_sashes[edge].m_margin = 0;
}
+#if defined( __WXMSW__ ) || defined( __WXMAC__)
+
+// this is currently called (and needed) under MSW only...
+void wxSashWindow::OnSetCursor(wxSetCursorEvent& event)
+{
+ // 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()) != wxSASH_NONE)
+ {
+ // default processing is ok
+ event.Skip();
+ }
+ //else: do nothing, in particular, don't call Skip()
+}
+
+#endif // wxMSW
+
#endif // wxUSE_SASH
projects / wxWidgets.git / blobdiff