X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/564a150b1f7c63a060c1b205a7cd50035031cd4b..f51723055aa4334a355a19e87bb2b478b4204d15:/src/generic/sashwin.cpp diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp index f026ed1b74..aab0b33b90 100644 --- a/src/generic/sashwin.cpp +++ b/src/generic/sashwin.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sashwin.cpp +// Name: src/generic/sashwin.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. @@ -11,33 +11,31 @@ // 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__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_SASH +#include "wx/sashwin.h" + #ifndef WX_PRECOMP #include "wx/dialog.h" #include "wx/frame.h" #include "wx/settings.h" + #include "wx/dcclient.h" + #include "wx/dcscreen.h" + #include "wx/math.h" #endif -#include #include -#include "wx/dcscreen.h" -#include "wx/sashwin.h" #include "wx/laywin.h" -DEFINE_EVENT_TYPE(wxEVT_SASH_DRAGGED) +wxDEFINE_EVENT( wxEVT_SASH_DRAGGED, wxSashEvent ); IMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxSashEvent, wxCommandEvent) @@ -48,7 +46,7 @@ BEGIN_EVENT_TABLE(wxSashWindow, wxWindow) EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent) #if defined( __WXMSW__ ) || defined( __WXMAC__) EVT_SET_CURSOR(wxSashWindow::OnSetCursor) -#endif // wxMSW +#endif // __WXMSW__ || __WXMAC__ END_EVENT_TABLE() @@ -80,7 +78,7 @@ void wxSashWindow::Init() 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 @@ -97,7 +95,7 @@ void wxSashWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) void wxSashWindow::OnMouseEvent(wxMouseEvent& event) { - wxCoord x, y; + wxCoord x = 0, y = 0; event.GetPosition(&x, &y); wxSashEdgePosition sashHit = SashHitTest(x, y); @@ -105,7 +103,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event) if (event.LeftDown()) { CaptureMouse(); - m_mouseCaptured = TRUE; + m_mouseCaptured = true; if ( sashHit != wxSASH_NONE ) { @@ -154,7 +152,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event) // Wasn't a proper drag if (m_mouseCaptured) ReleaseMouse(); - m_mouseCaptured = FALSE; + m_mouseCaptured = false; wxScreenDC::EndDrawingOnTop(); m_dragMode = wxSASH_DRAG_NONE; @@ -166,7 +164,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event) 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); @@ -187,8 +185,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 - 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 @@ -253,7 +251,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event) break; } - if ( newHeight == -1 ) + if ( newHeight == wxDefaultCoord ) { // didn't change newHeight = h; @@ -265,7 +263,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event) newHeight = wxMin(newHeight, m_maximumPaneSizeY); } - if ( newWidth == -1 ) + if ( newWidth == wxDefaultCoord ) { // didn't change newWidth = w; @@ -279,19 +277,19 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event) 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()) + else if ((event.Moving() || event.Leaving()) && !event.Dragging()) { // Just change the cursor if required if ( sashHit != wxSASH_NONE ) @@ -428,10 +426,10 @@ void wxSashWindow::DrawBorders(wxDC& dc) int w, h; GetClientSize(&w, &h); - wxPen mediumShadowPen(m_mediumShadowColour, 1, wxSOLID); - wxPen darkShadowPen(m_darkShadowColour, 1, wxSOLID); - wxPen lightShadowPen(m_lightShadowColour, 1, wxSOLID); - wxPen hilightPen(m_hilightColour, 1, wxSOLID); + wxPen mediumShadowPen(m_mediumShadowColour, 1, wxPENSTYLE_SOLID); + wxPen darkShadowPen(m_darkShadowColour, 1, wxPENSTYLE_SOLID); + wxPen lightShadowPen(m_lightShadowColour, 1, wxPENSTYLE_SOLID); + wxPen hilightPen(m_hilightColour, 1, wxPENSTYLE_SOLID); if ( GetWindowStyleFlag() & wxSW_3DBORDER ) { @@ -477,14 +475,16 @@ void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc) int w, h; GetClientSize(&w, &h); - wxPen facePen(m_faceColour, 1, wxSOLID); - wxBrush faceBrush(m_faceColour, wxSOLID); - wxPen mediumShadowPen(m_mediumShadowColour, 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); + wxPen facePen(m_faceColour, 1, wxPENSTYLE_SOLID); + wxBrush faceBrush(m_faceColour, wxBRUSHSTYLE_SOLID); + wxPen mediumShadowPen(m_mediumShadowColour, 1, wxPENSTYLE_SOLID); + wxPen darkShadowPen(m_darkShadowColour, 1, wxPENSTYLE_SOLID); + wxPen lightShadowPen(m_lightShadowColour, 1, wxPENSTYLE_SOLID); + wxPen hilightPen(m_hilightColour, 1, wxPENSTYLE_SOLID); + wxColour blackClr(0, 0, 0); + wxColour whiteClr(255, 255, 255); + wxPen blackPen(blackClr, 1, wxPENSTYLE_SOLID); + wxPen whitePen(whiteClr, 1, wxPENSTYLE_SOLID); if ( edge == wxSASH_LEFT || edge == wxSASH_RIGHT ) { @@ -587,7 +587,7 @@ void wxSashWindow::DrawSashTracker(wxSashEdgePosition edge, int x, int y) ClientToScreen(&x1, &y1); ClientToScreen(&x2, &y2); - wxPen sashTrackerPen(*wxBLACK, 2, wxSOLID); + wxPen sashTrackerPen(*wxBLACK, 2, wxPENSTYLE_SOLID); screenDC.SetLogicalFunction(wxINVERT); screenDC.SetPen(sashTrackerPen); @@ -670,19 +670,11 @@ void wxSashWindow::SizeWindows() 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) @@ -711,6 +703,6 @@ void wxSashWindow::OnSetCursor(wxSetCursorEvent& event) //else: do nothing, in particular, don't call Skip() } -#endif // wxMSW +#endif // __WXMSW__ || __WXMAC__ #endif // wxUSE_SASH