diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index cd817ca091..37e106f5f2 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -125,7 +125,7 @@ protected: */ int Index(long lItem, bool bFromEnd = FALSE) const; /// search for an item using binary search in a sorted array - int Index(long lItem, CMPFUNC fnCompare); + int Index(long lItem, CMPFUNC fnCompare) const; /// add new element at the end void Add(long lItem); /// add item assuming the array is sorted with fnCompare function diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h index e499328236..4de3774132 100644 --- a/include/wx/fileconf.h +++ b/include/wx/fileconf.h @@ -231,7 +231,6 @@ public: void SetLine(LineList *pLine); }; -protected: class ConfigGroup { private: diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index b501686ae5..7ea0930aef 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -169,7 +169,7 @@ int wxBaseArray::Index(long lItem, bool bFromEnd) const } // search for an item in a sorted array (binary search) -int wxBaseArray::Index(long lItem, CMPFUNC fnCompare) +int wxBaseArray::Index(long lItem, CMPFUNC fnCompare) const { uint i, lo = 0,