X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03966fcb3f5aeea7d8e6652d40e6804811a785d8..3017880eff92f202f26262fbcdf1744cb620e3e3:/include/wx/generic/treectlg.h

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 356e48de48..6a1a838e18 100644
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -120,6 +120,7 @@ public:
         return m_current;
     }
     virtual size_t GetSelections(wxArrayTreeItemIds&) const;
+    virtual wxTreeItemId GetFocusedItem() const { return m_current; }
 
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
     virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item,
@@ -154,6 +155,7 @@ public:
     virtual void Unselect();
     virtual void UnselectAll();
     virtual void SelectItem(const wxTreeItemId& item, bool select = true);
+    virtual void SelectChildren(const wxTreeItemId& parent);
 
     virtual void EnsureVisible(const wxTreeItemId& item);
     virtual void ScrollTo(const wxTreeItemId& item);
@@ -257,8 +259,13 @@ protected:
     wxCursor             m_oldCursor;  // cursor is changed while dragging
     wxGenericTreeItem   *m_oldSelection;
     wxGenericTreeItem   *m_underMouse; // for visual effects
+
+    enum { NoEffect, BorderEffect, AboveEffect, BelowEffect } m_dndEffect;
+    wxGenericTreeItem   *m_dndEffectItem;
+
     wxTreeTextCtrl      *m_textCtrl;
 
+
     wxTimer             *m_renameTimer;
 
     // incremental search data
@@ -270,7 +277,7 @@ protected:
     // the common part of all ctors
     void Init();
 
-    // overridden wxWindow methods 
+    // overridden wxWindow methods
     virtual void DoThaw();
 
     // misc helpers
@@ -315,7 +322,6 @@ protected:
 
     void CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y );
     void CalculatePositions();
-    void CalculateSize( wxGenericTreeItem *item, wxDC &dc );
 
     void RefreshSubtree( wxGenericTreeItem *item );
     void RefreshLine( wxGenericTreeItem *item );
@@ -344,7 +350,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)
-    DECLARE_NO_COPY_CLASS(wxGenericTreeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxGenericTreeCtrl);
 };
 
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)