From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 21 Mar 2001 14:04:19 +0000 (+0000)
Subject: fixed (?) problems with assignment operator in wxTreeItemId
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2f3dcbbf2095254b4d649efac93f5e99559d9ddc

fixed (?) problems with assignment operator in wxTreeItemId


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

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index 74dfe87157..6d50ea37da 100644
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -28,8 +28,9 @@
 
 // ----------------------------------------------------------------------------
 // wxTreeItemId identifies an element of the tree. In this implementation, it's
-// just a trivial wrapper around Win32 HTREEITEM. It's opaque for the
-// application.
+// just a trivial wrapper around Win32 HTREEITEM or a pointer to some private
+// data structure in the generic version. It's opaque for the application and
+// the only method which can be used by user code is IsOk().
 // ----------------------------------------------------------------------------
 
 // Using this typedef removes an ambiguity when calling Remove()
@@ -37,14 +38,17 @@ typedef unsigned long wxTreeItemIdValue;
 
 class WXDLLEXPORT wxTreeItemId
 {
-friend class WXDLLEXPORT wxTreeCtrl;
-friend class WXDLLEXPORT wxGenericTreeCtrl;
-friend class WXDLLEXPORT wxTreeEvent;
 public:
     // ctors
         // 0 is invalid value for HTREEITEM
     wxTreeItemId() { m_pItem = 0; }
 
+        // this one is used in the generic version
+    wxTreeItemId(void *pItem) { m_pItem = (long) pItem; }
+
+        // and this one under MSW
+    wxTreeItemId(long lItem) { m_pItem = lItem; }
+
         // default copy ctor/assignment operator are ok for us
 
     // accessors
@@ -52,14 +56,8 @@ public:
     bool IsOk() const { return m_pItem != 0; }
 
     // deprecated: only for compatibility
-    wxTreeItemId(long itemId) { m_pItem = itemId; }
-    //operator long() const { return m_pItem; }
     operator wxTreeItemIdValue() const { return m_pItem; }
 
-    void operator=(long item) { m_pItem = item; }
-
-    wxTreeItemId(void *pItem) { m_pItem = (long) pItem; }
-
     wxTreeItemIdValue m_pItem;
 };