Applied patch [ 810585 ] wxTextCtrl::GetTextLine returns empty String

[wxWidgets.git] / include / wx / treebase.h

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index d4fb2c3d085de45e2d610036ae7908b2f75f3d89..3181b225d2ebab7c0dd667ca8f5381f24045df56 100644 (file)
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TREEBASE_H_
 #define _WX_TREEBASE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "treebase.h"
 #endif
 
@@ -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)
@@ -113,7 +114,7 @@ protected:
     wxTreeItemId m_pItem;
 };
 
-WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxTreeItemIdValue, wxArrayTreeItemIdsBase);
+WX_DEFINE_EXPORTED_ARRAY_PTR(wxTreeItemIdValue, wxArrayTreeItemIdsBase);
 
 class WXDLLEXPORT wxArrayTreeItemIds : public wxArrayTreeItemIdsBase
 {
@@ -290,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&);