X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..329b53d8ff1fdd322af046f9b93f3a9b7f0befa1:/include/wx/dynarray.h diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index ef2f64518a..c7d94ac6d4 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -19,8 +19,6 @@ #include "wx/defs.h" #include "wx/utils.h" -typedef bool Bool; - /** @name Dynamic arrays and lists @memo Arrays which grow on demand and do range checking (only in debug) */ @@ -100,7 +98,7 @@ public: /// number of elements in the array uint Count() const { return m_uiCount; } /// is it empty? - Bool IsEmpty() const { return m_uiCount == 0; } + bool IsEmpty() const { return m_uiCount == 0; } //@} protected: @@ -125,7 +123,7 @@ protected: @return index of the first item matched or NOT_FOUND @see NOT_FOUND */ - int Index (long lItem, Bool bFromEnd = FALSE) const; + int Index (long lItem, bool bFromEnd = FALSE) const; /// add new element at the end void Add (long lItem); /// add new element at given position @@ -175,7 +173,7 @@ public: \ T& Item(uint uiIndex) const \ { return (T&)(wxBaseArray::Item(uiIndex)); } \ \ - int Index(T Item, Bool bFromEnd = FALSE) const \ + int Index(T Item, bool bFromEnd = FALSE) const \ { return wxBaseArray::Index((long)Item, bFromEnd); } \ \ void Add(T Item) \ @@ -211,7 +209,7 @@ public: \ T& Item(uint uiIndex) const \ { return *(T*)wxBaseArray::Item(uiIndex); } \ \ - int Index(const T& Item, Bool bFromEnd = FALSE) const; \ + int Index(const T& Item, bool bFromEnd = FALSE) const; \ \ void Add(const T& Item); \ void Add(const T* pItem) \