added wxCURSOR_DEFAULT to others (not GTK only), hide the current selection in

the tree ctrl during dnd

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 5923c48fbfa2417983877678c6942280cd4df223..f78f14eb95d92e423c9857203bd590ff8e5b4bd9 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -126,6 +126,10 @@ enum wxStockCursor
     wxCURSOR_MAX
 };
 
     wxCURSOR_MAX
 };
 

+#ifndef __WXGTK__
+    #define wxCURSOR_DEFAULT wxCURSOR_ARROW
+#endif
+

 // ---------------------------------------------------------------------------
 // macros
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // macros
 // ---------------------------------------------------------------------------

diff --git a/include/wx/generic/treectrl.h b/include/wx/generic/treectrl.h
index 0ba451513cf491ab7fb74a5bd891a5366bcbabc2..7d1dd7e39de669a3c05071135d9366d5e602eaa2 100644 (file)
--- 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;
     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;
 
     wxTimer             *m_renameTimer;
     bool                 m_renameAccept;