// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "sashwin.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/settings.h"
#endif
-#include <math.h>
+#include "wx/math.h"
+
#include <stdlib.h>
#include "wx/dcscreen.h"
+#include "wx/dcclient.h"
#include "wx/sashwin.h"
#include "wx/laywin.h"
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
if (event.LeftDown())
{
CaptureMouse();
- m_mouseCaptured = TRUE;
+ m_mouseCaptured = true;
if ( sashHit != wxSASH_NONE )
{
// 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;
dragRect = wxRect(x, y, newWidth, newHeight);
- wxSashEvent event(GetId(), edge);
- event.SetEventObject(this);
- event.SetDragStatus(status);
- event.SetDragRect(dragRect);
- GetEventHandler()->ProcessEvent(event);
+ wxSashEvent eventSash(GetId(), edge);
+ eventSash.SetEventObject(this);
+ eventSash.SetDragStatus(status);
+ eventSash.SetDragRect(dragRect);
+ GetEventHandler()->ProcessEvent(eventSash);
}
else if ( event.LeftUp() )
{
if (m_mouseCaptured)
ReleaseMouse();
- m_mouseCaptured = FALSE;
+ m_mouseCaptured = false;
}
else if (event.Moving() && !event.Dragging())
{
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 )
{
void wxSashWindow::InitColours()
{
// Shadow colours
-#ifndef __WIN16__
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);
-#else
- m_faceColour = wxTheColourDatabase->Find("LIGHT GREY");
- m_mediumShadowColour = wxTheColourDatabase->Find("GREY");
- m_darkShadowColour = wxTheColourDatabase->Find("BLACK");
- m_lightShadowColour = wxTheColourDatabase->Find("LIGHT GREY");
- m_hilightColour = wxTheColourDatabase->Find("WHITE");
-#endif
}
void wxSashWindow::SetSashVisible(wxSashEdgePosition edge, bool sash)