make wxSortedArrayString::Sort() and Insert() private in STL build (closes #10947)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -87,6 +87,17 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
int Index(const wxString& str, bool bCase = true, bool bFromEnd = false) const;
|
int Index(const wxString& str, bool bCase = true, bool bFromEnd = false) const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
void Insert()
|
||||||
|
{
|
||||||
|
wxFAIL_MSG( "wxSortedArrayString::Insert() is not to be used" );
|
||||||
|
}
|
||||||
|
|
||||||
|
void Sort()
|
||||||
|
{
|
||||||
|
wxFAIL_MSG( "wxSortedArrayString::Sort() is not to be used" );
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
#else // if !wxUSE_STL
|
#else // if !wxUSE_STL
|
||||||
|
@@ -310,6 +310,8 @@ public:
|
|||||||
@warning This function should not be used with sorted arrays because it
|
@warning This function should not be used with sorted arrays because it
|
||||||
could break the order of items and, for example, subsequent calls
|
could break the order of items and, for example, subsequent calls
|
||||||
to Index() would then not work!
|
to Index() would then not work!
|
||||||
|
|
||||||
|
@warning In STL mode, Insert is private and simply invokes wxFAIL_MSG.
|
||||||
*/
|
*/
|
||||||
void Insert(const wxString& str, size_t nIndex,
|
void Insert(const wxString& str, size_t nIndex,
|
||||||
size_t copies = 1);
|
size_t copies = 1);
|
||||||
@@ -320,6 +322,8 @@ public:
|
|||||||
break the order of items and, for example, subsequent calls to Index()
|
break the order of items and, for example, subsequent calls to Index()
|
||||||
would then not work! Also, sorting a wxSortedArrayString doesn't make
|
would then not work! Also, sorting a wxSortedArrayString doesn't make
|
||||||
sense because its elements are always already sorted.
|
sense because its elements are always already sorted.
|
||||||
|
|
||||||
|
@warning In STL mode, Sort is private and simply invokes wxFAIL_MSG.
|
||||||
*/
|
*/
|
||||||
void Sort(bool reverseOrder = false);
|
void Sort(bool reverseOrder = false);
|
||||||
void Sort(CompareFunction compareFunction);
|
void Sort(CompareFunction compareFunction);
|
||||||
|
Reference in New Issue
Block a user