Minor modifications...

Vadim skipped some mistakes due to wxTreeItemId on msw == long

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/treectrl.h b/include/wx/gtk/treectrl.h
index afdd14c5cce4bf52d91807d5ff1b755716c69729..9714fa6d3f3ec5a5857597234a2dec7ebe8755ae 100644 (file)
--- a/include/wx/gtk/treectrl.h
+++ b/include/wx/gtk/treectrl.h
@@ -108,6 +108,7 @@ public:
   // for wxTreeCtrl usage only
   wxTreeItemId(GtkTreeItem *itemId) { m_itemId = itemId; }
   operator GtkTreeItem *() const { return m_itemId; }
+  void operator =(GtkTreeItem *item) { m_itemId = item; }
 
 protected:
   GtkTreeItem *m_itemId;
@@ -126,25 +127,18 @@ protected:
 // Because the objects of this class are deleted by the tree, they should
 // always be allocated on the heap!
 // ----------------------------------------------------------------------------
-class WXDLLEXPORT wxTreeItemData {
-friend class wxTreeCtrl;
+class WXDLLEXPORT wxTreeItemData : private wxTreeItemId {
 public:
-  // creation/destruction
-  // --------------------
-      // default ctor
-  wxTreeItemData() { }
+    // default ctor/copy ctor/assignment operator are ok
 
-      // default copy ctor/assignment operator are ok
-      // dtor is virtual and all the items are deleted by the tree control
-      // when it's deleted, so you normally don't have to care about freeing
-      // memory allocated in your wxTreeItemData-derived class
-  virtual ~wxTreeItemData() { }
+    // dtor is virtual and all the items are deleted by the tree control when
+    // it's deleted, so you normally don't have to care about freeing memory
+    // allocated in your wxTreeItemData-derived class
+    virtual ~wxTreeItemData() { }
 
-  // accessor: get the item associated with us
-  const wxTreeItemId& GetItemId() const { return m_itemId; }
-
-protected:
-  wxTreeItemId m_itemId;
+    // accessors: set/get the item associated with this node
+    void SetId(const wxTreeItemId& id) { m_itemId = id; }
+    const wxTreeItemId& GetId() const { return (wxTreeItemId&) m_itemId; }
 };
 
 class WXDLLEXPORT wxTreeCtrl: public wxControl {

diff --git a/include/wx/gtk1/treectrl.h b/include/wx/gtk1/treectrl.h
index afdd14c5cce4bf52d91807d5ff1b755716c69729..9714fa6d3f3ec5a5857597234a2dec7ebe8755ae 100644 (file)
--- a/include/wx/gtk1/treectrl.h
+++ b/include/wx/gtk1/treectrl.h
@@ -108,6 +108,7 @@ public:
   // for wxTreeCtrl usage only
   wxTreeItemId(GtkTreeItem *itemId) { m_itemId = itemId; }
   operator GtkTreeItem *() const { return m_itemId; }
+  void operator =(GtkTreeItem *item) { m_itemId = item; }
 
 protected:
   GtkTreeItem *m_itemId;
@@ -126,25 +127,18 @@ protected:
 // Because the objects of this class are deleted by the tree, they should
 // always be allocated on the heap!
 // ----------------------------------------------------------------------------
-class WXDLLEXPORT wxTreeItemData {
-friend class wxTreeCtrl;
+class WXDLLEXPORT wxTreeItemData : private wxTreeItemId {
 public:
-  // creation/destruction
-  // --------------------
-      // default ctor
-  wxTreeItemData() { }
+    // default ctor/copy ctor/assignment operator are ok
 
-      // default copy ctor/assignment operator are ok
-      // dtor is virtual and all the items are deleted by the tree control
-      // when it's deleted, so you normally don't have to care about freeing
-      // memory allocated in your wxTreeItemData-derived class
-  virtual ~wxTreeItemData() { }
+    // dtor is virtual and all the items are deleted by the tree control when
+    // it's deleted, so you normally don't have to care about freeing memory
+    // allocated in your wxTreeItemData-derived class
+    virtual ~wxTreeItemData() { }
 
-  // accessor: get the item associated with us
-  const wxTreeItemId& GetItemId() const { return m_itemId; }
-
-protected:
-  wxTreeItemId m_itemId;
+    // accessors: set/get the item associated with this node
+    void SetId(const wxTreeItemId& id) { m_itemId = id; }
+    const wxTreeItemId& GetId() const { return (wxTreeItemId&) m_itemId; }
 };
 
 class WXDLLEXPORT wxTreeCtrl: public wxControl {

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 8c3e7ba0fa8962b3d903705b4cad57d8bbf8af00..de810677b1d17586ad7a5ee83c88f91ceb132bd1 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -195,7 +195,7 @@ void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent,
 void MyTreeCtrl::AddTestItemsToTree(size_t numChildren,
                                     size_t depth)
 {
-  long rootId = AddRoot("Root",
+  wxTreeItemId rootId = AddRoot("Root",
                         TreeCtrlIcon_Folder, TreeCtrlIcon_Folder,
                         new MyTreeItemData("Root item"));