cursor problem in sash windows corrected

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index b079f5c250f70943f994e56f16918f2b99960a42..46a3e5f7ebdf9ceea06c8c761eff74af9da6ef8a 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -110,6 +110,9 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
 
     wxSashEdgePosition sashHit = SashHitTest(x, y);
 
 
     wxSashEdgePosition sashHit = SashHitTest(x, y);
 

+    // reset the cursor
+    SetCursor(wxCursor());
+

        if (event.LeftDown())
        {
         if ( sashHit != wxSASH_NONE )
        if (event.LeftDown())
        {
         if ( sashHit != wxSASH_NONE )


@@ -146,8 +149,6 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         wxScreenDC::EndDrawingOnTop();
         m_dragMode = wxSASH_DRAG_NONE;
         m_draggingEdge = wxSASH_NONE;
         wxScreenDC::EndDrawingOnTop();
         m_dragMode = wxSASH_DRAG_NONE;
         m_draggingEdge = wxSASH_NONE;

-
-        SetCursor(*wxSTANDARD_CURSOR);

     }
        else if (event.LeftUp() && m_dragMode == wxSASH_DRAG_DRAGGING)
        {
     }
        else if (event.LeftUp() && m_dragMode == wxSASH_DRAG_DRAGGING)
        {


@@ -239,10 +240,6 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
                        SetCursor(*m_sashCursorNS);
                 }
         }
                        SetCursor(*m_sashCursorNS);
                 }
         }

-        else
-        {
-           SetCursor(*wxSTANDARD_CURSOR);
-        }

        }
        else if ( event.Dragging() &&
               ((m_dragMode == wxSASH_DRAG_DRAGGING) || (m_dragMode == wxSASH_DRAG_LEFT_DOWN))
        }
        else if ( event.Dragging() &&
               ((m_dragMode == wxSASH_DRAG_DRAGGING) || (m_dragMode == wxSASH_DRAG_LEFT_DOWN))