Commented out call that breaks metal style setting before Create

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

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index b19b5ba4f68ddddbed13ed43449f6e3368b66eb7..59fa744586317b3a2cfe483f9adcfa529a36b67c 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -192,7 +192,7 @@ public:
     wxDEPRECATED( void ExpandItem(const wxTreeItemId& item, int action) );
 
         // use Set/GetImageList and Set/GetStateImageList
     wxDEPRECATED( void ExpandItem(const wxTreeItemId& item, int action) );
 
         // 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
     wxDEPRECATED( void SetImageList(wxImageList *imageList, int) );
 
     // use Set/GetItemImage directly


@@ -251,16 +251,6 @@ protected:
     wxTextCtrl  *m_textCtrl;        // text control in which it is edited
     wxTreeItemId m_idEdited;        // the item being edited
 
     wxTextCtrl  *m_textCtrl;        // text control in which it is edited
     wxTreeItemId m_idEdited;        // the item being edited
 

-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,
     virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent,
                                       size_t pos,
                                       const wxString& text,


@@ -273,6 +263,16 @@ private:
                                        wxTreeItemData *data = NULL);
     virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags);
 
                                        wxTreeItemData *data = NULL);
     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;
     void DoSetItemImageFromData(const wxTreeItemId& item,
     int DoGetItemImageFromData(const wxTreeItemId& item,
                                wxTreeItemIcon which) const;
     void DoSetItemImageFromData(const wxTreeItemId& item,