wxDropSource should have def ctor

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 6f45254813e16188c000d716f43d8d4ecae62391..f806238232c59104802fade4d575b2c43acd3750 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -32,6 +32,7 @@
 #include "wx/splitter.h"
 #include "wx/dcscreen.h"
 #include "wx/settings.h"
+#include "wx/log.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent)
@@ -283,9 +284,15 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                     SetCursor(*m_sashCursorNS);
                 }
         }
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMSW__)
         else
         {
+            // We must set the normal cursor in MSW, because
+            // if the child window doesn't have a cursor, the
+            // parent's (splitter window) will be used, and this
+            // must be the standard cursor.
+            wxLogDebug("wxSplitterWindow: Setting to standard cursor");
+
             // where else do we unset the cursor?
             SetCursor(* wxSTANDARD_CURSOR);
         }