Removed unnecessary code from utilsunx.cpp

[wxWidgets.git] / include / wx / treectrl.h

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 20a7bddcaea80c2d07bfa38d5c97318bd1405d36..278ea204f87a032e15d31f41c7554386ee431f68 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -33,14 +33,14 @@ static const int wxTREE_HITTEST_NOWHERE          = 0x0004;
 static const int wxTREE_HITTEST_ONITEMBUTTON     = 0x0008;
     // on the bitmap associated with an item.
 static const int wxTREE_HITTEST_ONITEMICON       = 0x0010;
 static const int wxTREE_HITTEST_ONITEMBUTTON     = 0x0008;
     // on the bitmap associated with an item.
 static const int wxTREE_HITTEST_ONITEMICON       = 0x0010;

-    // on the ident associated with an item.
-static const int wxTREE_HITTEST_ONITEMIDENT      = 0x0020;
+    // on the indent associated with an item.
+static const int wxTREE_HITTEST_ONITEMINDENT     = 0x0020;

     // on the label (string) associated with an item.
 static const int wxTREE_HITTEST_ONITEMLABEL      = 0x0040;
     // on the right of the label associated with an item.
 static const int wxTREE_HITTEST_ONITEMRIGHT      = 0x0080;
     // on the label (string) associated with an item.
     // on the label (string) associated with an item.
 static const int wxTREE_HITTEST_ONITEMLABEL      = 0x0040;
     // on the right of the label associated with an item.
 static const int wxTREE_HITTEST_ONITEMRIGHT      = 0x0080;
     // on the label (string) associated with an item.

-//static const int wxTREE_HITTEST_ONITEMSTATEICON  = 0x0100;
+static const int wxTREE_HITTEST_ONITEMSTATEICON  = 0x0100;

     // on the left of the wxTreeCtrl.
 static const int wxTREE_HITTEST_TOLEFT           = 0x0200;
     // on the right of the wxTreeCtrl.
     // on the left of the wxTreeCtrl.
 static const int wxTREE_HITTEST_TOLEFT           = 0x0200;
     // on the right of the wxTreeCtrl.


@@ -149,7 +149,7 @@ public:
     const wxString& GetLabel() const { return m_label; }
 
 private:
     const wxString& GetLabel() const { return m_label; }
 
 private:

-    // TODO we could save some space by using union here
+    // we could probably save some space by using union here

     int           m_code;
     wxTreeItemId  m_item,
                   m_itemOld;
     int           m_code;
     wxTreeItemId  m_item,
                   m_itemOld;


@@ -166,9 +166,16 @@ typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
 // ----------------------------------------------------------------------------
 
 // GetItem() returns the item being dragged, GetPoint() the mouse coords
 // ----------------------------------------------------------------------------
 
 // GetItem() returns the item being dragged, GetPoint() the mouse coords

+//
+// if you call event.Allow(), the drag operation will start and a
+// EVT_TREE_END_DRAG event will be sent when the drag is over.

 #define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
 #define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
 
 #define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
 #define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
 

+// GetItem() is the item on which the drop occured (if any) and GetPoint() the
+// current mouse coords
+#define EVT_TREE_END_DRAG(id, fn) { wxEVT_COMMAND_TREE_END_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, (wxObject *) NULL },
+

 // GetItem() returns the itme whose label is being edited, GetLabel() returns
 // the current item label for BEGIN and the would be new one for END.
 //
 // GetItem() returns the itme whose label is being edited, GetLabel() returns
 // the current item label for BEGIN and the would be new one for END.
 //