Applied patch to add n bitmaps at once to an image

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

diff --git a/include/wx/palmos/treectrl.h b/include/wx/palmos/treectrl.h
index 54fa685ae1ef46e95c3f26f3cc508f0aa92e6a8a..c56ea51238353a85f1d63d7cfbf64ac0c8778485 100644 (file)
--- a/include/wx/palmos/treectrl.h
+++ b/include/wx/palmos/treectrl.h
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "treectrl.h"
-#endif
-

 #if wxUSE_TREECTRL
 
 #include "wx/textctrl.h"
 #if wxUSE_TREECTRL
 
 #include "wx/textctrl.h"


@@ -32,14 +28,6 @@ class  WXDLLEXPORT wxImageList;
 class  WXDLLEXPORT wxDragImage;
 struct WXDLLEXPORT wxTreeViewItem;
 
 class  WXDLLEXPORT wxDragImage;
 struct WXDLLEXPORT wxTreeViewItem;
 

-// NB: all the following flags are for compatbility only and will be removed in the
-//     next versions
-
-// flags for deprecated InsertItem() variant (their values are the same as of
-// TVI_FIRST and TVI_LAST)
-#define wxTREE_INSERT_FIRST 0xFFFF0001
-#define wxTREE_INSERT_LAST  0xFFFF0002
-

 // hash storing attributes for our items
 WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
 
 // hash storing attributes for our items
 WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
 


@@ -77,7 +65,7 @@ public:
     // ---------
 
         // get the total number of items in the control
     // ---------
 
         // get the total number of items in the control

-    size_t GetCount() const;
+    virtual unsigned int GetCount() const;

 
         // indent is the number of pixels the children are indented relative to
         // the parents position. SetIndent() also redraws the control
 
         // indent is the number of pixels the children are indented relative to
         // the parents position. SetIndent() also redraws the control