X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9b1708cf57d57bc91f4e870a4646efd1f174c3d..f377a3b58c509ceba8c9335dbe45d100cca615ad:/src/generic/sashwin.cpp

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index b079f5c250..bcc734ffd9 100644
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -8,7 +8,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -26,6 +26,10 @@
 #include "wx/wx.h"
 #endif
 
+#if !wxUSE_SASH
+    #error "Thisfile requires wxUSE_SASH to be defined."
+#endif // wxUSE_SASH
+
 #include <math.h>
 #include <stdlib.h>
 
@@ -110,6 +114,14 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
 
     wxSashEdgePosition sashHit = SashHitTest(x, y);
 
+    // reset the cursor
+#ifdef __WXMOTIF__
+    SetCursor(* wxSTANDARD_CURSOR);
+#endif
+#ifdef __WXMSW__
+    SetCursor(wxCursor());
+#endif
+
 	if (event.LeftDown())
 	{
         if ( sashHit != wxSASH_NONE )
@@ -146,8 +158,6 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         wxScreenDC::EndDrawingOnTop();
         m_dragMode = wxSASH_DRAG_NONE;
         m_draggingEdge = wxSASH_NONE;
-
-        SetCursor(*wxSTANDARD_CURSOR);
     }
 	else if (event.LeftUp() && m_dragMode == wxSASH_DRAG_DRAGGING)
 	{
@@ -239,10 +249,6 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
 	                SetCursor(*m_sashCursorNS);
                 }
         }
-        else
-        {
-    	    SetCursor(*wxSTANDARD_CURSOR);
-        }
 	}
 	else if ( event.Dragging() &&
               ((m_dragMode == wxSASH_DRAG_DRAGGING) || (m_dragMode == wxSASH_DRAG_LEFT_DOWN))
@@ -514,7 +520,7 @@ void wxSashWindow::DrawSashTracker(wxSashEdgePosition edge, int x, int y)
 
     wxPen sashTrackerPen(*wxBLACK, 2, wxSOLID);
 
-    screenDC.SetLogicalFunction(wxXOR);
+    screenDC.SetLogicalFunction(wxINVERT);
     screenDC.SetPen(sashTrackerPen);
     screenDC.SetBrush(*wxTRANSPARENT_BRUSH);