* wxStream fixes (integer/line parsing).

[wxWidgets.git] / src / generic / sashwin.cpp

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 46a3e5f7ebdf9ceea06c8c761eff74af9da6ef8a..bcc734ffd91b5cde0944fa0c00db813da0c5e137 100644 (file)
--- 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>
 
@@ -111,7 +115,12 @@ 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())
        {
@@ -511,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);