X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/479cd5de40ca8029c79e780170fa7c0af7ec0297..27fa32469f7f13b019b55ded2bf97636442624dc:/src/generic/splitter.cpp diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index 66878cda37..6950009cb0 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -162,8 +162,8 @@ void wxSplitterWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) { - wxCoord x = event.GetX(), - y = event.GetY(); + wxCoord x = (wxCoord)event.GetX(), + y = (wxCoord)event.GetY(); // reset the cursor #ifdef __WXMOTIF__ @@ -189,6 +189,15 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) m_oldX = x; m_oldY = y; + + if ( m_splitMode == wxSPLIT_VERTICAL ) + { + SetCursor(*m_sashCursorWE); + } + else + { + SetCursor(*m_sashCursorNS); + } return; } } @@ -282,6 +291,19 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) } else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) { +#ifdef __WXMSW__ + // Otherwise, the cursor sometimes reverts to the normal cursor + // during dragging. + if ( m_splitMode == wxSPLIT_VERTICAL ) + { + SetCursor(*m_sashCursorWE); + } + else + { + SetCursor(*m_sashCursorNS); + } +#endif + // Obtain window size. We are only interested in the dimension the sash // splits up int new_sash_position =