indentation cleanup, unused variables, constant expressions, etc

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

diff --git a/include/wx/os2/treectrl.h b/include/wx/os2/treectrl.h
index b14254085ada99f34edb0d9c2fb65bf610a49f0c..ae1ca33d0443a886e2d3ad67eb48b0eedc3f81f8 100644 (file)
--- a/include/wx/os2/treectrl.h
+++ b/include/wx/os2/treectrl.h
@@ -36,9 +36,11 @@ struct WXDLLEXPORT wxTreeViewItem;
 // they're equivalent
 class wxTreeItemData;
 
-// flags for deprecated InsertItem() variant
-#define wxTREE_INSERT_FIRST 0xFFFF0001
-#define wxTREE_INSERT_LAST  0xFFFF0002
+#if WXWIN_COMPATIBILITY_2_6
+    // flags for deprecated InsertItem() variant
+    #define wxTREE_INSERT_FIRST 0xFFFF0001
+    #define wxTREE_INSERT_LAST  0xFFFF0002
+#endif
 
 // hash storing attributes for our items
 WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
@@ -90,7 +92,7 @@ public:
     //
     // Get the total number of items in the control
     //
-    size_t GetCount(void) const;
+    virtual unsigned int GetCount(void) const;
 
     //
     // Indent is the number of pixels the children are indented relative to
@@ -504,70 +506,6 @@ public:
                          ,bool                bTextOnly = false
                         ) const;
 
-    //
-    // Deprecated
-    // ----------
-
-#if WXWIN_COMPATIBILITY_2_4
-    // These methods are deprecated and will be removed in future versions of
-    // wxWidgets, they're here for compatibility only, don't use them in new
-    // code (the comments indicate why these methods are now useless and how to
-    // replace them)
-    //
-
-    //
-    // Use Expand, Collapse, CollapseAndReset or Toggle
-    //
-    wxDEPRECATED( void ExpandItem( const wxTreeItemId& rItem
-                                  ,int                 nAction
-                                 ) );
-
-    //
-    // Use AddRoot, PrependItem or AppendItem
-    //
-    wxDEPRECATED( wxTreeItemId InsertItem( const wxTreeItemId& pParent
-                                          ,const wxString&     rsText
-                                          ,int                 nImage = -1
-                                          ,int                 nSelImage = -1
-                                          ,long                lInsertAfter = wxTREE_INSERT_LAST
-                                         ) );
-
-    //
-    // Use Set/GetImageList and Set/GetStateImageList
-    //
-    wxDEPRECATED( wxImageList* GetImageList(int nVal) const );
-    wxDEPRECATED( void SetImageList(wxImageList* pImageList, int nVal) );
-
-    //
-    // Use Set/GetItemImage directly
-    //
-    wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& rItem) const );
-    wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& rItem, int nImage) );
-
-    //
-    // For this enumeration function you must pass in a "cookie" parameter
-    // which is opaque for the application but is necessary for the library
-    // to make these functions reentrant (i.e. allow more than one
-    // enumeration on one and the same object simultaneously). Of course,
-    // the "cookie" passed to GetFirstChild() and GetNextChild() should be
-    // the same!
-    //
-
-    //
-    // Get the first child of this item
-    //
-    wxDEPRECATED( wxTreeItemId GetFirstChild( const wxTreeItemId& rItem
-                                             ,long&               rCookie
-                                            ) const );
-
-    //
-    // Get the next child
-    //
-    wxDEPRECATED( wxTreeItemId GetNextChild( const wxTreeItemId& rItem
-                                            ,long&               rCookie
-                                           ) const );
-#endif // WXWIN_COMPATIBILITY_2_4
-
     //
     // Implementation
     // --------------