diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 5923c48fbf..f78f14eb95 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -126,6 +126,10 @@ enum wxStockCursor
     wxCURSOR_MAX
 };
 
+#ifndef __WXGTK__
+    #define wxCURSOR_DEFAULT wxCURSOR_ARROW
+#endif
+
 // ---------------------------------------------------------------------------
 // macros
 // ---------------------------------------------------------------------------
diff --git a/include/wx/generic/treectrl.h b/include/wx/generic/treectrl.h
index 0ba451513c..7d1dd7e39d 100644
--- a/include/wx/generic/treectrl.h
+++ b/include/wx/generic/treectrl.h
@@ -403,6 +403,8 @@ protected:
     wxPoint              m_dragStart;
     bool                 m_isDragging; // true between BEGIN/END drag events
     wxGenericTreeItem   *m_dropTarget;
+    wxCursor             m_oldCursor;  // cursor is changed while dragging
+    wxGenericTreeItem   *m_oldSelection;
 
     wxTimer             *m_renameTimer;
     bool                 m_renameAccept;