only define operator bool() if operator long() is not defined

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

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index d4fb2c3d085de45e2d610036ae7908b2f75f3d89..b74c64b52044244b8d0824275367b0f3b97cf425 100644 (file)
--- 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; }
     // 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
 
     // 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; }
     // 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(); }
     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)
 };
 
 inline bool operator==(const wxTreeItemId& i1, const wxTreeItemId& i2)