replaced untyped hash with a typed one; 64 bit fixes (don't cast pointers to long...)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-19 21:06:59 +00:00
parent 46674ada08
commit ee4b272189
6 changed files with 227 additions and 169 deletions

View File

@@ -34,7 +34,7 @@
// ----------------------------------------------------------------------------
// Using this typedef removes an ambiguity when calling Remove()
typedef unsigned long wxTreeItemIdValue;
typedef void *wxTreeItemIdValue;
class WXDLLEXPORT wxTreeItemId
{
@@ -43,11 +43,8 @@ public:
// 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; }
// construct wxTreeItemId from the native item id
wxTreeItemId(void *pItem) { m_pItem = pItem; }
// default copy ctor/assignment operator are ok for us
@@ -95,7 +92,7 @@ protected:
wxTreeItemId m_pItem;
};
WX_DEFINE_EXPORTED_ARRAY_LONG(wxTreeItemId, wxArrayTreeItemIds);
WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxTreeItemId, wxArrayTreeItemIds);
// ----------------------------------------------------------------------------
// constants