Return wxWindow* from wxDataViewCustomRenderer::CreateEditorCtrl().

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

diff --git a/include/wx/palmos/treectrl.h b/include/wx/palmos/treectrl.h
index bf7355d02723537f422060377ed16f40542218c7..32b5fc965618418f23e5de6e701ba7afbe4ba54b 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"


@@ -28,26 +24,9 @@
 #include "wx/hashmap.h"
 
 // fwd decl
 #include "wx/hashmap.h"
 
 // fwd decl

-class  WXDLLEXPORT wxImageList;
-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 `Expand(int action)'
-enum
-{
-    wxTREE_EXPAND_EXPAND,
-    wxTREE_EXPAND_COLLAPSE,
-    wxTREE_EXPAND_COLLAPSE_RESET,
-    wxTREE_EXPAND_TOGGLE
-};
-
-// 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
+class  WXDLLIMPEXP_CORE wxImageList;
+class  WXDLLIMPEXP_CORE wxDragImage;
+struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem;

 
 // 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);


@@ -56,7 +35,7 @@ WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
 // wxTreeCtrl
 // ----------------------------------------------------------------------------
 
 // wxTreeCtrl
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTreeCtrl : public wxControl
+class WXDLLIMPEXP_CORE wxTreeCtrl : public wxControl

 {
 public:
     // creation
 {
 public:
     // creation


@@ -86,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


@@ -318,7 +297,7 @@ public:
         // been before. textCtrlClass parameter allows you to create an edit
         // control of arbitrary user-defined class deriving from wxTextCtrl.
     wxTextCtrl* EditLabel(const wxTreeItemId& item,
         // been before. textCtrlClass parameter allows you to create an edit
         // control of arbitrary user-defined class deriving from wxTextCtrl.
     wxTextCtrl* EditLabel(const wxTreeItemId& item,

-                          wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl));
+                          wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl));

         // returns the same pointer as StartEdit() if the item is being edited,
         // NULL otherwise (it's assumed that no more than one item may be
         // edited simultaneously)
         // returns the same pointer as StartEdit() if the item is being edited,
         // NULL otherwise (it's assumed that no more than one item may be
         // edited simultaneously)


@@ -446,7 +425,7 @@ private:
     friend class wxTreeSortHelper;
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
     friend class wxTreeSortHelper;
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)

-    DECLARE_NO_COPY_CLASS(wxTreeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxTreeCtrl);

 };
 
 #endif // wxUSE_TREECTRL
 };
 
 #endif // wxUSE_TREECTRL