minor fixes
cursor fix for splitter window git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -153,6 +153,16 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
|
||||
SetCursor(wxCursor());
|
||||
#endif
|
||||
|
||||
// under wxGTK the method above causes the mouse
|
||||
// to flicker so we set the standard cursor only
|
||||
// when leaving the window and when moving over
|
||||
// non-sash parts of the window. this should work
|
||||
// on the other platforms as well, but who knows.
|
||||
#ifdef __WXGTK__
|
||||
if (event.Leaving())
|
||||
SetCursor(* wxSTANDARD_CURSOR);
|
||||
#endif
|
||||
|
||||
if (event.LeftDown())
|
||||
{
|
||||
if ( SashHitTest(x, y) )
|
||||
@@ -173,9 +183,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
|
||||
m_dragMode = wxSPLIT_DRAG_NONE;
|
||||
ReleaseMouse();
|
||||
|
||||
#ifdef __WXGTK__
|
||||
SetCursor(* wxSTANDARD_CURSOR);
|
||||
#endif
|
||||
// Erase old tracker
|
||||
DrawSashTracker(m_oldX, m_oldY);
|
||||
|
||||
@@ -253,6 +260,13 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
|
||||
SetCursor(*m_sashCursorNS);
|
||||
}
|
||||
}
|
||||
#ifdef __WXGTK__
|
||||
else
|
||||
{
|
||||
// where else do we unset the cursor?
|
||||
SetCursor(* wxSTANDARD_CURSOR);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))
|
||||
{
|
||||
|
Reference in New Issue
Block a user