X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e6e514739bdd157966d2bd2726118f1054dd1c1..90a77e64841dfcaf37103b6411987402739baa0b:/include/wx/generic/treectlg.h?ds=sidebyside

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index b4c3e11e79..8af90003f4 100644
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -185,21 +185,6 @@ public:
     void Edit( const wxTreeItemId& item ) { EditLabel(item); }
 #endif // WXWIN_COMPATIBILITY_2_6
 
-#if WXWIN_COMPATIBILITY_2_4
-    // deprecated functions: use Set/GetItemImage directly
-    wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& item) const );
-    wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& item, int image) );
-
-    // use the versions taking wxTreeItemIdValue cookies (note that
-    // GetNextChild() is not inside wxDEPRECATED on purpose, as otherwise we
-    // get twice as many warnings without any added benefit: it is always used
-    // with GetFirstChild() anyhow)
-    wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item,
-                                             long& cookie) const );
-    wxTreeItemId GetNextChild(const wxTreeItemId& item,
-                              long& cookie) const;
-#endif // WXWIN_COMPATIBILITY_2_4
-
     // implementation only from now on
 
     // overridden base class virtuals
@@ -220,6 +205,7 @@ public:
     void OnChar( wxKeyEvent &event );
     void OnMouse( wxMouseEvent &event );
     void OnGetToolTip( wxTreeEvent &event );
+    void OnSize( wxSizeEvent &event );
     void OnInternalIdle( );
 
     virtual wxVisualAttributes GetDefaultAttributes() const
@@ -344,6 +330,8 @@ protected:
 
     void DoDirtyProcessing();
 
+    virtual wxSize DoGetBestSize() const;
+
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)