projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid an assert if no alignment style is specified
[wxWidgets.git]
/
src
/
generic
/
sashwin.cpp
diff --git
a/src/generic/sashwin.cpp
b/src/generic/sashwin.cpp
index f026ed1b74840cad7508f69c155a841b11ee38ee..3a4e2b6d9700b39cb9c56f7e58dcf5dff1d495af 100644
(file)
--- a/
src/generic/sashwin.cpp
+++ b/
src/generic/sashwin.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: sashwin.cpp
+// Name: s
rc/generic/s
ashwin.cpp
// Purpose: wxSashWindow implementation. A sash window has an optional
// sash on each edge, allowing it to be dragged. An event
// is generated when the sash is released.
// Purpose: wxSashWindow implementation. A sash window has an optional
// sash on each edge, allowing it to be dragged. An event
// is generated when the sash is released.
@@
-11,30
+11,29
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// 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"
#ifdef __BORLANDC__
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+
#pragma hdrstop
#endif
#if wxUSE_SASH
#endif
#if wxUSE_SASH
+#include "wx/sashwin.h"
+
#ifndef WX_PRECOMP
#include "wx/dialog.h"
#include "wx/frame.h"
#include "wx/settings.h"
#ifndef WX_PRECOMP
#include "wx/dialog.h"
#include "wx/frame.h"
#include "wx/settings.h"
+ #include "wx/dcclient.h"
+ #include "wx/dcscreen.h"
#endif
#endif
-#include <math.h>
+#include "wx/math.h"
+
#include <stdlib.h>
#include <stdlib.h>
-#include "wx/dcscreen.h"
-#include "wx/sashwin.h"
#include "wx/laywin.h"
DEFINE_EVENT_TYPE(wxEVT_SASH_DRAGGED)
#include "wx/laywin.h"
DEFINE_EVENT_TYPE(wxEVT_SASH_DRAGGED)
@@
-48,7
+47,7
@@
BEGIN_EVENT_TABLE(wxSashWindow, wxWindow)
EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)
#if defined( __WXMSW__ ) || defined( __WXMAC__)
EVT_SET_CURSOR(wxSashWindow::OnSetCursor)
EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)
#if defined( __WXMSW__ ) || defined( __WXMAC__)
EVT_SET_CURSOR(wxSashWindow::OnSetCursor)
-#endif //
wxMSW
+#endif //
__WXMSW__ || __WXMAC__
END_EVENT_TABLE()
END_EVENT_TABLE()
@@
-80,7
+79,7
@@
void wxSashWindow::Init()
m_maximumPaneSizeY = 10000;
m_sashCursorWE = new wxCursor(wxCURSOR_SIZEWE);
m_sashCursorNS = new wxCursor(wxCURSOR_SIZENS);
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
m_currentCursor = NULL;
// Eventually, we'll respond to colour change messages
@@
-97,7
+96,7
@@
void wxSashWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
{
void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
{
- wxCoord x
, y
;
+ wxCoord x
= 0, y = 0
;
event.GetPosition(&x, &y);
wxSashEdgePosition sashHit = SashHitTest(x, y);
event.GetPosition(&x, &y);
wxSashEdgePosition sashHit = SashHitTest(x, y);
@@
-105,7
+104,7
@@
void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
if (event.LeftDown())
{
CaptureMouse();
if (event.LeftDown())
{
CaptureMouse();
- m_mouseCaptured =
TRUE
;
+ m_mouseCaptured =
true
;
if ( sashHit != wxSASH_NONE )
{
if ( sashHit != wxSASH_NONE )
{
@@
-154,7
+153,7
@@
void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
// Wasn't a proper drag
if (m_mouseCaptured)
ReleaseMouse();
// Wasn't a proper drag
if (m_mouseCaptured)
ReleaseMouse();
- m_mouseCaptured =
FALSE
;
+ m_mouseCaptured =
false
;
wxScreenDC::EndDrawingOnTop();
m_dragMode = wxSASH_DRAG_NONE;
wxScreenDC::EndDrawingOnTop();
m_dragMode = wxSASH_DRAG_NONE;
@@
-166,7
+165,7
@@
void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
m_dragMode = wxSASH_DRAG_NONE;
if (m_mouseCaptured)
ReleaseMouse();
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);
// Erase old tracker
DrawSashTracker(m_draggingEdge, m_oldX, m_oldY);
@@
-187,8
+186,8
@@
void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
wxSashDragStatus status = wxSASH_STATUS_OK;
// the new height and width of the window - if -1, it didn't change
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
// 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
@@
-253,7
+252,7
@@
void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
break;
}
break;
}
- if ( newHeight ==
-1
)
+ if ( newHeight ==
wxDefaultCoord
)
{
// didn't change
newHeight = h;
{
// didn't change
newHeight = h;
@@
-265,7
+264,7
@@
void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
newHeight = wxMin(newHeight, m_maximumPaneSizeY);
}
newHeight = wxMin(newHeight, m_maximumPaneSizeY);
}
- if ( newWidth ==
-1
)
+ if ( newWidth ==
wxDefaultCoord
)
{
// didn't change
newWidth = w;
{
// didn't change
newWidth = w;
@@
-279,17
+278,17
@@
void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
dragRect = wxRect(x, y, newWidth, newHeight);
dragRect = wxRect(x, y, newWidth, newHeight);
- wxSashEvent event(GetId(), edge);
- event.SetEventObject(this);
- event.SetDragStatus(status);
- event.SetDragRect(dragRect);
- GetEventHandler()->ProcessEvent(event);
+ wxSashEvent event
Sash
(GetId(), edge);
+ event
Sash
.SetEventObject(this);
+ event
Sash
.SetDragStatus(status);
+ event
Sash
.SetDragRect(dragRect);
+ GetEventHandler()->ProcessEvent(event
Sash
);
}
else if ( event.LeftUp() )
{
if (m_mouseCaptured)
ReleaseMouse();
}
else if ( event.LeftUp() )
{
if (m_mouseCaptured)
ReleaseMouse();
- m_mouseCaptured =
FALSE
;
+ m_mouseCaptured =
false
;
}
else if (event.Moving() && !event.Dragging())
{
}
else if (event.Moving() && !event.Dragging())
{
@@
-483,8
+482,10
@@
void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc)
wxPen darkShadowPen(m_darkShadowColour, 1, wxSOLID);
wxPen lightShadowPen(m_lightShadowColour, 1, wxSOLID);
wxPen hilightPen(m_hilightColour, 1, wxSOLID);
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 )
{
if ( edge == wxSASH_LEFT || edge == wxSASH_RIGHT )
{
@@
-670,19
+671,11
@@
void wxSashWindow::SizeWindows()
void wxSashWindow::InitColours()
{
// Shadow colours
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);
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)
}
void wxSashWindow::SetSashVisible(wxSashEdgePosition edge, bool sash)
@@
-711,6
+704,6
@@
void wxSashWindow::OnSetCursor(wxSetCursorEvent& event)
//else: do nothing, in particular, don't call Skip()
}
//else: do nothing, in particular, don't call Skip()
}
-#endif //
wxMSW
+#endif //
__WXMSW__ || __WXMAC__
#endif // wxUSE_SASH
#endif // wxUSE_SASH