Warning fix.

[wxWidgets.git] / include / wx / generic / treectlg.h

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index f22b42917a8d4bce04e356e3eaa91440cb22afbf..f72b8fc4656abb10f4e5191c281c1caba7881263 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -69,7 +69,7 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
-    virtual size_t GetCount() const;
+    virtual unsigned int GetCount() const;
 
     virtual unsigned int GetIndent() const { return m_indent; }
     virtual void SetIndent(unsigned int indent);
@@ -180,8 +180,6 @@ public:
 
     wxTreeItemId GetNext(const wxTreeItemId& item) const;
 
-    void ExpandAll(const wxTreeItemId& item);
-
 #if WXWIN_COMPATIBILITY_2_6
     // use EditLabel() instead
     void Edit( const wxTreeItemId& item ) { EditLabel(item); }
@@ -223,8 +221,6 @@ public:
     void OnGetToolTip( wxTreeEvent &event );
     void OnInternalIdle( );
 
-    virtual wxSize DoGetBestSize() const;
-
     virtual wxVisualAttributes GetDefaultAttributes() const
     {
         return GetClassDefaultAttributes(GetWindowVariant());
@@ -306,7 +302,7 @@ protected:
                                        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) const;
 
     // called by wxTextTreeCtrl when it marks itself for deletion
     void ResetTextControl();
@@ -379,4 +375,3 @@ public:
 #endif // wxUSE_TREECTRL
 
 #endif // _GENERIC_TREECTRL_H_
-