More warning and error fixes (work in progress with Tinderbox).

[wxWidgets.git] / docs / latex / wx / arrstrng.tex

diff --git a/docs/latex/wx/arrstrng.tex b/docs/latex/wx/arrstrng.tex
index 62f1f245e6c65125495bcd0071432a2a6826635c..68cc81814315236a8915b81912db32309e6edc7d 100644 (file)
--- a/docs/latex/wx/arrstrng.tex
+++ b/docs/latex/wx/arrstrng.tex
@@ -26,14 +26,14 @@ array elements may be modified in place like this
     array.Last().MakeUpper();
 \end{verbatim}
 
     array.Last().MakeUpper();
 \end{verbatim}
 

-There is also a varian of wxArrayString called wxSortedArrayString which has
+There is also a variant of wxArrayString called wxSortedArrayString which has

 exactly the same methods as wxArrayString, but which always keeps the string
 in it in (alphabetical) order. wxSortedArrayString uses binary search in its 
 exactly the same methods as wxArrayString, but which always keeps the string
 in it in (alphabetical) order. wxSortedArrayString uses binary search in its 

-\helpref{Index}{wxarraystringindex} function (insteadf of linear search for
+\helpref{Index}{wxarraystringindex} function (instead of linear search for

 wxArrayString::Index) which makes it much more efficient if you add strings to
 the array rarely (because, of course, you have to pay for Index() efficiency
 by having Add() be slower) but search for them often. Several methods should
 wxArrayString::Index) which makes it much more efficient if you add strings to
 the array rarely (because, of course, you have to pay for Index() efficiency
 by having Add() be slower) but search for them often. Several methods should

-not be used with sorted array (basicly, all which break the order of items)
+not be used with sorted array (basically, all which break the order of items)

 which is mentioned in their description.
 
 Final word: none of the methods of wxArrayString is virtual including its
 which is mentioned in their description.
 
 Final word: none of the methods of wxArrayString is virtual including its


@@ -48,7 +48,7 @@ functions.
 
 \wxheading{Include files}
 
 
 \wxheading{Include files}
 

-<wx/string.h>
+<wx/arrstr.h>

 
 \wxheading{See also}
 
 
 \wxheading{See also}
 


@@ -60,13 +60,21 @@ functions.
 
 \func{}{wxArrayString}{\void}
 
 
 \func{}{wxArrayString}{\void}
 

-\func{}{wxArrayString}{\param{const wxArrayString\&}{ array}}
+Default constructor.

 
 

-Default and copy constructors.
+\func{}{wxArrayString}{\param{const wxArrayString\&}{ array}}

 
 

-Note that when an array is assigned to a sorted array, its contents is
+Copy constructor. Note that when an array is assigned to a sorted array, its contents is

 automatically sorted during construction.
 
 automatically sorted during construction.
 

+\func{}{wxArrayString}{\param{size\_t}{ sz}, \param{const wxChar**}{ arr}}
+
+Constructor from a C string array. Pass a size {\it sz} and array {\it arr}.
+
+\func{}{wxArrayString}{\param{size\_t}{ sz}, \param{const wxString*}{ arr}}
+
+Constructor from a wxString array. Pass a size {\it sz} and array {\it arr}.
+

 \membersection{wxArrayString::\destruct{wxArrayString}}\label{wxarraystringdtor}
 
 \func{}{\destruct{wxArrayString}}{}
 \membersection{wxArrayString::\destruct{wxArrayString}}\label{wxarraystringdtor}
 
 \func{}{\destruct{wxArrayString}}{}


@@ -80,6 +88,20 @@ reasons it is not virtual, so this class should not be derived from.
 
 Assignment operator.
 
 
 Assignment operator.
 

+\membersection{wxArrayString::operator==}\label{wxarraystringoperatorequal}
+
+\constfunc{bool}{operator $==$}{\param{const wxArrayString\&}{ array}}
+
+Compares 2 arrays respecting the case. Returns true only if the arrays have
+the same number of elements and the same strings in the same order.
+
+\membersection{wxArrayString::operator!=}\label{wxarraystringoperatornotequal}
+
+\constfunc{bool}{operator $!=$}{\param{const wxArrayString\&}{ array}}
+
+Compares 2 arrays respecting the case. Returns true if the arrays have
+different number of elements or if the elements don't match pairwise.
+

 \membersection{wxArrayString::operator[]}\label{wxarraystringoperatorindex}
 
 \func{wxString\&}{operator[]}{\param{size\_t }{nIndex}}
 \membersection{wxArrayString::operator[]}\label{wxarraystringoperatorindex}
 
 \func{wxString\&}{operator[]}{\param{size\_t }{nIndex}}


@@ -92,9 +114,10 @@ This is the operator version of \helpref{Item}{wxarraystringitem} method.
 
 \membersection{wxArrayString::Add}\label{wxarraystringadd}
 
 
 \membersection{wxArrayString::Add}\label{wxarraystringadd}
 

-\func{void}{Add}{\param{const wxString\& }{str}}
+\func{size\_t}{Add}{\param{const wxString\& }{str}, \param{size\_t}{ copies = $1$}}

 
 

-Appends a new item to the array.
+Appends the given number of {\it copies} of the new item {\it str} to the
+array and returns the index of the first new item in the array.

 
 {\bf Warning:} For sorted arrays, the index of the inserted item will not be,
 in general, equal to \helpref{GetCount()}{wxarraystringgetcount} - 1 because
 
 {\bf Warning:} For sorted arrays, the index of the inserted item will not be,
 in general, equal to \helpref{GetCount()}{wxarraystringgetcount} - 1 because


@@ -148,41 +171,41 @@ Returns the number of items in the array.
 
 \membersection{wxArrayString::Index}\label{wxarraystringindex}
 
 
 \membersection{wxArrayString::Index}\label{wxarraystringindex}
 

-\func{int}{Index}{\param{const char *}{ sz}, \param{bool}{ bCase = TRUE}, \param{bool}{ bFromEnd = FALSE}}
+\func{int}{Index}{\param{const char *}{ sz}, \param{bool}{ bCase = true}, \param{bool}{ bFromEnd = false}}

 
 Search the element in the array, starting from the beginning if
 
 Search the element in the array, starting from the beginning if

-{\it bFromEnd} is FALSE or from end otherwise. If {\it bCase}, comparison is
+{\it bFromEnd} is false or from end otherwise. If {\it bCase}, comparison is

 case sensitive (default), otherwise the case is ignored.
 
 This function uses linear search for wxArrayString and binary search for
 wxSortedArrayString, but it ignores the {\it bCase} and {\it bFromEnd} 
 parameters in the latter case.
 
 case sensitive (default), otherwise the case is ignored.
 
 This function uses linear search for wxArrayString and binary search for
 wxSortedArrayString, but it ignores the {\it bCase} and {\it bFromEnd} 
 parameters in the latter case.
 

-Returns index of the first item matched or wxNOT\_FOUND if there is no match.
+Returns index of the first item matched or {\tt wxNOT\_FOUND} if there is no match.

 
 \membersection{wxArrayString::Insert}\label{wxarraystringinsert}
 
 
 \membersection{wxArrayString::Insert}\label{wxarraystringinsert}
 

-\func{void}{Insert}{\param{const wxString\& }{str}, \param{size\_t}{ nIndex}}
+\func{void}{Insert}{\param{const wxString\& }{str}, \param{size\_t}{ nIndex}, \param{size\_t }{copies = $1$}}

 
 

-Insert a new element in the array before the position {\it nIndex}. Thus, for
+Insert the given number of {\it copies} of the new element in the array before the position {\it nIndex}. Thus, for

 example, to insert the string in the beginning of the array you would write
 
 \begin{verbatim}
 Insert("foo", 0);
 \end{verbatim}
 
 example, to insert the string in the beginning of the array you would write
 
 \begin{verbatim}
 Insert("foo", 0);
 \end{verbatim}
 

-If {\it nIndex} is equal to {\it GetCount() + 1} this function behaves as 
+If {\it nIndex} is equal to {\it GetCount()} this function behaves as 

 \helpref{Add}{wxarraystringadd}.
 
 \helpref{Add}{wxarraystringadd}.
 

-{\bf Warning:} this function should not be used with sorted array because it
+{\bf Warning:} this function should not be used with sorted arrays because it

 could break the order of items and, for example, subsequent calls to 
 could break the order of items and, for example, subsequent calls to 

-\helpref{Index()}{wxarraystringindex} would not work then!
+\helpref{Index()}{wxarraystringindex} would then not work!

 
 \membersection{wxArrayString::IsEmpty}\label{wxarraystringisempty}
 
 
 \membersection{wxArrayString::IsEmpty}\label{wxarraystringisempty}
 

-\func{}{IsEmpty}{}
+\func{bool}{IsEmpty}{}

 
 

-Returns TRUE if the array is empty, FALSE otherwise. This function returns the
+Returns true if the array is empty, false otherwise. This function returns the

 same result as {\it GetCount() == 0} but is probably easier to read.
 
 \membersection{wxArrayString::Item}\label{wxarraystringitem}
 same result as {\it GetCount() == 0} but is probably easier to read.
 
 \membersection{wxArrayString::Item}\label{wxarraystringitem}


@@ -198,28 +221,26 @@ version.
 
 \membersection{wxArrayString::Last}\label{wxarraystringlast}
 
 
 \membersection{wxArrayString::Last}\label{wxarraystringlast}
 

-\func{}{Last}{}
+\func{wxString&}{Last}{}

 
 Returns the last element of the array. Attempt to access the last element of
 an empty array will result in assert failure in debug build, however no checks
 are done in release mode.
 
 
 Returns the last element of the array. Attempt to access the last element of
 an empty array will result in assert failure in debug build, however no checks
 are done in release mode.
 

-\membersection{wxArrayString::Remove (by value)}\label{wxarraystringremoveval}
+\membersection{wxArrayString::Remove}\label{wxarraystringremove}

 
 \func{void}{Remove}{\param{const char *}{ sz}}
 
 Removes the first item matching this value. An assert failure is provoked by
 an attempt to remove an element which does not exist in debug build.
 
 
 \func{void}{Remove}{\param{const char *}{ sz}}
 
 Removes the first item matching this value. An assert failure is provoked by
 an attempt to remove an element which does not exist in debug build.
 

-See also: \helpref{Index}{wxarraystringindex}, \helpref{Remove}{wxarraystringremove}
+See also: \helpref{Index}{wxarraystringindex}

 
 

-\membersection{wxArrayString::Remove (by index)}\label{wxarraystringremove}
+\membersection{wxArrayString::RemoveAt}\label{wxarraystringremoveat}

 
 

-\func{void}{Remove}{\param{size\_t }{nIndex}}
+\func{void}{RemoveAt}{\param{size\_t }{nIndex}, \param{size\_t }{count = $1$}}

 
 

-Removes the item at given position.
-
-See also: \helpref{Remove}{wxarraystringremoveval}
+Removes {\it count} items starting at position {\it nIndex} from the array.

 
 \membersection{wxArrayString::Shrink}\label{wxarraystringshrink}
 
 
 \membersection{wxArrayString::Shrink}\label{wxarraystringshrink}
 


@@ -230,26 +251,22 @@ minimize the array memory consumption.
 
 See also: \helpref{Alloc}{wxarraystringalloc}, \helpref{Dynamic array memory management}{wxarraymemorymanagement}
 
 
 See also: \helpref{Alloc}{wxarraystringalloc}, \helpref{Dynamic array memory management}{wxarraymemorymanagement}
 

-\membersection{wxArrayString::Sort (alphabetically)}\label{wxarraystringsort}
+\membersection{wxArrayString::Sort}\label{wxarraystringsort}

 
 

-\func{void}{Sort}{\param{bool}{ reverseOrder = FALSE}}
+\func{void}{Sort}{\param{bool}{ reverseOrder = false}}

 
 

-Sorts the array in alphabetical order or in reverse alphabetical order if
-{\it reverseOrder} is TRUE.
+Sorts the array in alphabetical order or in reverse alphabetical order if 
+{\it reverseOrder} is true. The sort is case-sensitive.

 
 {\bf Warning:} this function should not be used with sorted array because it
 could break the order of items and, for example, subsequent calls to 
 
 {\bf Warning:} this function should not be used with sorted array because it
 could break the order of items and, for example, subsequent calls to 

-\helpref{Index()}{wxarraystringindex} would not work then!
-
-See also: \helpref{Sort}{wxarraystringsortcallback}
-
-\membersection{wxArrayString::Sort (user defined)}\label{wxarraystringsortcallback}
+\helpref{Index()}{wxarraystringindex} would then not work!

 
 \func{void}{Sort}{\param{CompareFunction }{compareFunction}}
 
 Sorts the array using the specified {\it compareFunction} for item comparison.
 {\it CompareFunction} is defined as a function taking two {\it const
 
 \func{void}{Sort}{\param{CompareFunction }{compareFunction}}
 
 Sorts the array using the specified {\it compareFunction} for item comparison.
 {\it CompareFunction} is defined as a function taking two {\it const

-wxString\&} parameters and returning {\it int} value less than, equal to or
+wxString\&} parameters and returning an {\it int} value less than, equal to or

 greater than 0 if the first string is less than, equal to or greater than the
 second one.
 
 greater than 0 if the first string is less than, equal to or greater than the
 second one.
 


@@ -277,7 +294,5 @@ array.Sort(CompareStringLen);
 
 {\bf Warning:} this function should not be used with sorted array because it
 could break the order of items and, for example, subsequent calls to 
 
 {\bf Warning:} this function should not be used with sorted array because it
 could break the order of items and, for example, subsequent calls to 

-\helpref{Index()}{wxarraystringindex} would not work then!
-
-See also: \helpref{Sort}{wxarraystringsort}
+\helpref{Index()}{wxarraystringindex} would then not work!