X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ad5e06b4aefdcef8a1ec2ec563540e055462e66..e296ac9f3d5fb224e0717b2ff410b913905f6b5f:/src/generic/splitter.cpp diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index d43a1244d3..0288be3808 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -6,23 +6,22 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "splitter.h" -// #pragma interface + #pragma implementation "splitter.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/wx.h" + #include "wx/wx.h" #endif #include @@ -146,6 +145,14 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) long x, y; event.Position(&x, &y); + // reset the cursor +#ifdef __WXMOTIF__ + SetCursor(* wxSTANDARD_CURSOR); +#endif +#ifdef __WXMSW__ + SetCursor(wxCursor()); +#endif + if (event.LeftDown()) { if ( SashHitTest(x, y) ) @@ -153,11 +160,11 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) CaptureMouse(); m_dragMode = wxSPLIT_DRAG_DRAGGING; - + DrawSashTracker(x, y); m_oldX = x; m_oldY = y; - return; + return; } } else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING) @@ -243,10 +250,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) SetCursor(*m_sashCursorNS); } } - else - { - SetCursor(*wxSTANDARD_CURSOR); - } } else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) {