Back to 'unsigned int' after reasearch of 'size_t' problems.

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

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index 645731106babe0ff0c54e31c8ec3d1070bec0840..59fa744586317b3a2cfe483f9adcfa529a36b67c 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -147,11 +147,6 @@ public:
     virtual wxTreeItemId AddRoot(const wxString& text,
                          int image = -1, int selectedImage = -1,
                          wxTreeItemData *data = NULL);
-    virtual wxTreeItemId InsertItem(const wxTreeItemId& parent,
-                                    const wxTreeItemId& idPrevious,
-                                    const wxString& text,
-                                    int image = -1, int selectedImage = -1,
-                                    wxTreeItemData *data = NULL);
 
     virtual void Delete(const wxTreeItemId& item);
     virtual void DeleteChildren(const wxTreeItemId& item);
@@ -196,14 +191,8 @@ public:
         // use Expand, Collapse, CollapseAndReset or Toggle
     wxDEPRECATED( void ExpandItem(const wxTreeItemId& item, int action) );
 
-        // use AddRoot, PrependItem or AppendItem
-    wxDEPRECATED( wxTreeItemId InsertItem(const wxTreeItemId& parent,
-                            const wxString& text,
-                            int image = -1, int selImage = -1,
-                            long insertAfter = wxTREE_INSERT_LAST) );
-
         // use Set/GetImageList and Set/GetStateImageList
-    wxDEPRECATED( wxImageList *GetImageList(int) const );
+        // Use base class GetImageList()
     wxDEPRECATED( void SetImageList(wxImageList *imageList, int) );
 
     // use Set/GetItemImage directly
@@ -262,21 +251,6 @@ protected:
     wxTextCtrl  *m_textCtrl;        // text control in which it is edited
     wxTreeItemId m_idEdited;        // the item being edited
 
-    wxImageList *m_imageListNormal, // images for tree elements
-                *m_imageListState;  // special images for app defined states
-    bool         m_ownsImageListNormal,
-                 m_ownsImageListState;
-
-private:
-    // the common part of all ctors
-    void Init();
-
-    // helper functions
-    inline bool DoGetItem(wxTreeViewItem *tvItem) const;
-    inline void DoSetItem(wxTreeViewItem *tvItem);
-
-    inline void DoExpand(const wxTreeItemId& item, int flag);
-
     virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent,
                                       size_t pos,
                                       const wxString& text,
@@ -287,7 +261,17 @@ private:
                                        const wxString& text,
                                        int image = -1, int selImage = -1,
                                        wxTreeItemData *data = NULL);
-    virtual wxTreeItemId DoHitTest(const wxPoint& point, int& flags);
+    virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags);
+
+private:
+    // the common part of all ctors
+    void Init();
+
+    // helper functions
+    inline bool DoGetItem(wxTreeViewItem *tvItem) const;
+    inline void DoSetItem(wxTreeViewItem *tvItem);
+
+    inline void DoExpand(const wxTreeItemId& item, int flag);
 
     int DoGetItemImageFromData(const wxTreeItemId& item,
                                wxTreeItemIcon which) const;