X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9711a4deb97504db860a136df11077fbc56eeee..199fbd7093daca4902bb42c9791574ad91d12565:/include/wx/treebase.h diff --git a/include/wx/treebase.h b/include/wx/treebase.h index b9331b92a6..6cc27b33d2 100644 --- a/include/wx/treebase.h +++ b/include/wx/treebase.h @@ -52,6 +52,8 @@ public: // accessors // is this a valid tree item? bool IsOk() const { return m_pItem != 0; } + // return true if this item is not valid + bool operator!() const { return !IsOk(); } // operations // invalidate the item @@ -61,12 +63,11 @@ public: // deprecated: only for compatibility, don't work on 64 bit archs wxTreeItemId(long item) { m_pItem = (wxTreeItemIdValue)item; } operator long() const { return (long)m_pItem; } -#endif // WXWIN_COMPATIBILITY_2_4 - - wxTreeItemIdValue m_pItem; - bool operator!() const { return !IsOk(); } +#else // !WXWIN_COMPATIBILITY_2_4 operator bool() const { return IsOk(); } +#endif // WXWIN_COMPATIBILITY_2_4/!WXWIN_COMPATIBILITY_2_4 + wxTreeItemIdValue m_pItem; }; inline bool operator==(const wxTreeItemId& i1, const wxTreeItemId& i2) @@ -74,6 +75,11 @@ inline bool operator==(const wxTreeItemId& i1, const wxTreeItemId& i2) return i1.m_pItem == i2.m_pItem; } +inline bool operator!=(const wxTreeItemId& i1, const wxTreeItemId& i2) +{ + return i1.m_pItem != i2.m_pItem; +} + // ---------------------------------------------------------------------------- // wxTreeItemData is some (arbitrary) user class associated with some item. The // main advantage of having this class (compared to old untyped interface) is @@ -285,7 +291,7 @@ private: friend class WXDLLEXPORT wxTreeCtrl; friend class WXDLLEXPORT wxGenericTreeCtrl; - DECLARE_DYNAMIC_CLASS(wxTreeEvent); + DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreeEvent) }; typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);