X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcb68102796280b3e54979ae95738089914ce842..0016bb3b1c6870a3c43b42b5be145c15fab56580:/docs/latex/wx/array.tex

diff --git a/docs/latex/wx/array.tex b/docs/latex/wx/array.tex
index dad60a8150..e9e4b6b5d3 100644
--- a/docs/latex/wx/array.tex
+++ b/docs/latex/wx/array.tex
@@ -1,7 +1,18 @@
-\section{\class{wxArray}}\label{wxarray}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Name:        array.tex
+%% Purpose:     wxArray
+%% Author:      wxWidgets Team
+%% Modified by:
+%% Created:
+%% RCS-ID:      $Id$
+%% Copyright:   (c) wxWidgets Team
+%% License:     wxWindows license
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{\class{wxArray<T>}}\label{wxarray}
 
 This section describes the so called {\it dynamic arrays}. This is a C
-array-like data structure i.e. the member access time is constant (and not
+array-like type safe data structure i.e. the member access time is constant (and not
 linear according to the number of container elements as for linked lists). However, these
 arrays are dynamic in the sense that they will automatically allocate more
 memory if there is not enough of it for adding a new element. They also perform
@@ -45,13 +56,12 @@ int, long and their unsigned variants) or pointers (of any kind). An attempt
 to use with objects of sizeof() greater than sizeof(long) will provoke a
 runtime assertion failure, however declaring a wxArray of floats will not (on
 the machines where sizeof(float) <= sizeof(long)), yet it will {\bf not} work,
-please use wxObjArray for storing floats and doubles (NB: a more efficient
-wxArrayDouble class is scheduled for the next release of wxWidgets).
+please use wxObjArray for storing floats and doubles.
 
 wxSortedArray is a wxArray variant which should be used when searching in the
 array is a frequently used operation. It requires you to define an additional
 function for comparing two elements of the array element type and always stores
-its items in the sorted order (according to this function). Thus, it is 
+its items in the sorted order (according to this function). Thus, it is
  \helpref{Index()}{wxarrayindex} function execution time is $O(log(N))$ instead of
 $O(N)$ for the usual arrays but the \helpref{Add()}{wxarrayadd} method is
 slower: it is $O(log(N))$ instead of constant time (neglecting time spent in
@@ -106,34 +116,50 @@ WX_DEFINE_OBJARRAY(ArrayOfDirectories);
 
 It is not as elegant as writing
 
-\begin{verbatim} 
+\begin{verbatim}
 typedef std::vector<MyDirectory> ArrayOfDirectories;
 \end{verbatim}
 
 but is not that complicated and allows the code to be compiled with any, however
 dumb, C++ compiler in the world.
 
+Remember to #include <wx/arrimpl.cpp> just before each WX\_DEFINE\_OBJARRAY 
+ocurrence in your code, even if you have several in the same file.
+
 Things are much simpler for wxArray and wxSortedArray however: it is enough
 just to write
 
-\begin{verbatim} 
-WX_DEFINE_ARRAY(int, ArrayOfDirectories);
-WX_DEFINE_SORTED_ARRAY(int, ArrayOfFiles);
+\begin{verbatim}
+WX_DEFINE_ARRAY_INT(int, ArrayOfInts);
+WX_DEFINE_SORTED_ARRAY_INT(int, ArrayOfSortedInts);
 \end{verbatim}
 
-i.e. there is only one {\tt DEFINE} macro and no need for separate 
-{\tt DECLARE} one.
+i.e. there is only one {\tt DEFINE} macro and no need for separate
+{\tt DECLARE} one. For the arrays of the primitive types, the macros 
+{\tt WX\_DEFINE\_ARRAY\_CHAR/SHORT/INT/SIZE\_T/LONG/DOUBLE} should be used
+depending on the sizeof of the values (notice that storing values of smaller
+type, e.g. shorts, in an array of larger one, e.g. {\tt ARRAY\_INT}, does
+\emph{not} work on all architectures!).
 
 
-\wxheading{See also:}
+\wxheading{See also}
 
-\helpref{Container classes overview}{wxcontaineroverview}, \helpref{wxList}{wxlist}
+\helpref{Container classes overview}{wxcontaineroverview}, 
+\helpref{wxList<T>}{wxlist},
+\helpref{wxVector<T>}{wxvector}
 
 \wxheading{Include files}
 
 <wx/dynarray.h> for wxArray and wxSortedArray and additionally <wx/arrimpl.cpp>
 for wxObjArray.
 
+\wxheading{Library}
+
+\helpref{wxBase}{librarieslist}
+
+
+
+
 \latexignore{\rtfignore{\wxheading{Function groups}}}
 
 \membersection{Macros for template array definition}\label{arraymacros}
@@ -159,18 +185,22 @@ WX\_DEFINE\_OBJARRAY macro.
 To slightly complicate the matters even further, the operator $->$ defined by
 default for the array iterators by these macros only makes sense if the array
 element type is not a pointer itself and, although it still works, this
-provokes warnings from some compilers and to avoid them you should use the 
+provokes warnings from some compilers and to avoid them you should use the
 {\tt \_PTR} versions of the macros above. For example, to define an array of
-pointers to {\tt double} you should use.
+pointers to {\tt double} you should use:
 
-If that isn't complicated enough, the above macros are generally only useful for 
-wxObject types.  There are seperate macros for declaring an array of a simple type, 
+\begin{verbatim}
+WX_DEFINE_ARRAY_PTR(double *, MyArrayOfDoublePointers);
+\end{verbatim}
+
+Note that the above macros are generally only useful for
+wxObject types.  There are separate macros for declaring an array of a simple type,
 such as an int.
 
-The following simple types are supported:
+The following simple types are supported:\\
 int\\
 long\\
-size_t\\
+size\_t\\
 double
 
 To create an array of a simple type, simply append the type you want in CAPS to
@@ -185,10 +215,6 @@ For example, for an integer array, you'd use one of the following variants:
 \helpref{WX\_DEFINE\_SORTED\_EXPORTED\_ARRAY\_INT}{wxdefinesortedarray}\\
 \helpref{WX\_DEFINE\_SORTED\_USER\_EXPORTED\_ARRAY\_INT}{wxdefinesortedarray}\\
 
-\begin{verbatim} 
-WX_DEFINE_ARRAY_PTR(double *, MyArrayOfDoublePointers);
-\end{verbatim}
-
 \membersection{Constructors and destructors}\label{arrayconstructorsdestructors}
 
 Array classes are 100\% C++ objects and as such they have the appropriate copy
@@ -214,7 +240,7 @@ amount, but no more than some maximal number which is defined by
 ARRAY\_MAXSIZE\_INCREMENT constant. Of course, this may lead to some memory
 being wasted (ARRAY\_MAXSIZE\_INCREMENT in the worst case, i.e. 4Kb in the
 current implementation), so the \helpref{Shrink()}{wxarrayshrink} function is
-provided to deallocate the extra memory. The \helpref{Alloc()}{wxarrayalloc} 
+provided to deallocate the extra memory. The \helpref{Alloc()}{wxarrayalloc}
 function can also be quite useful if you know in advance how many items you are
 going to put in the array and will prevent the array code from reallocating the
 memory more times than needed.
@@ -228,7 +254,6 @@ Functions in this section return the total number of array elements and allow to
 retrieve them - possibly using just the C array indexing $[]$ operator which
 does exactly the same as \helpref{Item()}{wxarrayitem} method.
 
-\helpref{Count}{wxarraycount}\\
 \helpref{GetCount}{wxarraygetcount}\\
 \helpref{IsEmpty}{wxarrayisempty}\\
 \helpref{Item}{wxarrayitem}\\
@@ -237,9 +262,11 @@ does exactly the same as \helpref{Item()}{wxarrayitem} method.
 \membersection{Adding items}\label{arrayadding}
 
 \helpref{Add}{wxarrayadd}\\
+\helpref{AddAt}{wxarrayaddat}\\
 \helpref{Insert}{wxarrayinsert}\\
 \helpref{SetCount}{wxarraysetcount}\\
-\helpref{WX\_APPEND\_ARRAY}{wxappendarray}
+\helpref{WX\_APPEND\_ARRAY}{wxappendarray}\\
+\helpref{WX\_PREPEND\_ARRAY}{wxprependarray}
 
 \membersection{Removing items}\label{arrayremoving}
 
@@ -252,6 +279,7 @@ does exactly the same as \helpref{Item()}{wxarrayitem} method.
 \membersection{Searching and sorting}\label{arraysearchingandsorting}
 
 \helpref{Index}{wxarrayindex}\\
+\helpref{IndexForInsert}{wxarrayindexforinsert}\\
 \helpref{Sort}{wxarraysort}
 
 %%%%% MEMBERS HERE %%%%%
@@ -277,14 +305,15 @@ needed for exporting an array from a user DLL.
 Example:
 
 \begin{verbatim}
-WX_DEFINE_ARRAY_INT(wxArrayInt);
+WX_DEFINE_ARRAY_INT(int, MyArrayInt);
 
 class MyClass;
-WX_DEFINE_ARRAY(MyClass *, wxArrayOfMyClass);
+WX_DEFINE_ARRAY(MyClass *, ArrayOfMyClass);
 \end{verbatim}
 
-Note that wxWidgets predefines the following standard array classes: wxArrayInt,
-wxArrayLong and wxArrayPtrVoid.
+Note that wxWidgets predefines the following standard array classes: {\bf wxArrayInt},
+{\bf wxArrayLong}, {\bf wxArrayShort}, {\bf wxArrayDouble},  {\bf wxArrayPtrVoid}.
+
 
 \membersection{WX\_DEFINE\_SORTED\_ARRAY}\label{wxdefinesortedarray}
 
@@ -302,10 +331,10 @@ needed for exporting an array from a user DLL.
 Example:
 
 \begin{verbatim}
-WX_DEFINE_SORTED_ARRAY_INT(wxSortedArrayInt);
+WX_DEFINE_SORTED_ARRAY_INT(int, MySortedArrayInt);
 
 class MyClass;
-WX_DEFINE_SORTED_ARRAY(MyClass *, wxArrayOfMyClass);
+WX_DEFINE_SORTED_ARRAY(MyClass *, ArrayOfMyClass);
 \end{verbatim}
 
 You will have to initialize the objects of this class by passing a comparison
@@ -317,7 +346,7 @@ int CompareInts(int n1, int n2)
     return n1 - n2;
 }
 
-wxSortedArrayInt sorted(CompareInts);
+MySortedArrayInt sorted(CompareInts);
 
 int CompareMyClassObjects(MyClass *item1, MyClass *item2)
 {
@@ -325,7 +354,7 @@ int CompareMyClassObjects(MyClass *item1, MyClass *item2)
     return Stricmp(item1->GetAddress(), item2->GetAddress());
 }
 
-wxArrayOfMyClass another(CompareMyClassObjects);
+ArrayOfMyClass another(CompareMyClassObjects);
 \end{verbatim}
 
 \membersection{WX\_DECLARE\_OBJARRAY}\label{wxdeclareobjarray}
@@ -359,10 +388,10 @@ the array class - otherwise you would get link errors.
 
 \func{}{WX\_DEFINE\_USER\_EXPORTED\_OBJARRAY}{\param{}{name}}
 
-This macro defines the methods of the array class {\it name} not defined by the 
+This macro defines the methods of the array class {\it name} not defined by the
 \helpref{WX\_DECLARE\_OBJARRAY()}{wxdeclareobjarray} macro. You must include the
 file <wx/arrimpl.cpp> before using this macro and you must have the full
-declaration of the class of array elements in scope! If you forget to do the 
+declaration of the class of array elements in scope! If you forget to do the
 first, the error will be caught by the compiler, but, unfortunately, many
 compilers will not give any warnings if you forget to do the second - but the
 objects of the class will not be copied correctly and their real destructor will
@@ -391,7 +420,14 @@ WX_DEFINE_OBJARRAY(wxArrayOfMyClass);
 
 \func{void}{WX\_APPEND\_ARRAY}{\param{wxArray\& }{array}, \param{wxArray\& }{other}}
 
-This macro may be used to append all elements of the {\it other} array to the 
+This macro may be used to append all elements of the {\it other} array to the
+{\it array}. The two arrays must be of the same type.
+
+\membersection{WX\_PREPEND\_ARRAY}\label{wxprependarray}
+
+\func{void}{WX\_PREPEND\_ARRAY}{\param{wxArray\& }{array}, \param{wxArray\& }{other}}
+
+This macro may be used to prepend all elements of the {\it other} array to the
 {\it array}. The two arrays must be of the same type.
 
 \membersection{WX\_CLEAR\_ARRAY}\label{wxcleararray}
@@ -446,13 +482,15 @@ the array element are copied too) for wxObjArray.
 \func{}{\destruct{wxObjArray}}{\void}
 
 The wxObjArray destructor deletes all the items owned by the array. This is not
-done by wxArray and wxSortedArray versions - you may use 
+done by wxArray and wxSortedArray versions - you may use
 \helpref{WX\_CLEAR\_ARRAY}{wxcleararray} macro for this.
 
 \membersection{wxArray::Add}\label{wxarrayadd}
 
 \func{void}{Add}{\param{T }{item}, \param{size\_t}{ copies = $1$}}
 
+\func{size\_t}{Add}{\param{T }{item}}
+
 \func{void}{Add}{\param{T *}{item}}
 
 \func{void}{Add}{\param{T \&}{item}, \param{size\_t}{ copies = $1$}}
@@ -460,8 +498,9 @@ done by wxArray and wxSortedArray versions - you may use
 Appends the given number of {\it copies} of the {\it item} to the array
 consisting of the elements of type {\it T}.
 
-The first version is used with wxArray and wxSortedArray. The second and the
-third are used with wxObjArray. There is an important difference between
+The first version is used with wxArray. The second is used with wxSortedArray,
+returning the index where {\it item} is stored. The third and the
+fourth ones are used with wxObjArray. There is an important difference between
 them: if you give a pointer to the array, it will take ownership of it, i.e.
 will delete it when the item is deleted from the array. If you give a reference
 to the array, however, the array will make a copy of the item and will not take
@@ -471,10 +510,24 @@ that you cannot append more than one pointer as reusing it would lead to
 deleting it twice (or more) and hence to a crash.
 
 You may also use \helpref{WX\_APPEND\_ARRAY}{wxappendarray} macro to append all
-elements of one array to another one but it is more efficient to use 
+elements of one array to another one but it is more efficient to use
 {\it copies} parameter and modify the elements in place later if you plan to
 append a lot of items.
 
+\membersection{wxSortedArray::AddAt}\label{wxarrayaddat}
+
+\func{void}{AddAt}{\param{T }{item}, \param{size\_t}{ index}}
+
+Inserts the given {\it item} into the array in the specified {\it index}
+ position.
+
+Be aware that you will set out the order of the array if you give a wrong
+ position.
+
+This function is useful in conjunction with 
+\helpref{IndexForInsert}{wxarrayindexforinsert} for a common operation
+of "insert only if not found".
+
 \membersection{wxArray::Alloc}\label{wxarrayalloc}
 
 \func{void}{Alloc}{\param{size\_t }{count}}
@@ -482,7 +535,8 @@ append a lot of items.
 Preallocates memory for a given number of array elements. It is worth calling
 when the number of items which are going to be added to the array is known in
 advance because it will save unneeded memory reallocation. If the array already
-has enough memory for the given number of items, nothing happens.
+has enough memory for the given number of items, nothing happens. In any case,
+the existing contents of the array is not modified.
 
 \membersection{wxArray::Clear}\label{wxarrayclear}
 
@@ -491,18 +545,11 @@ has enough memory for the given number of items, nothing happens.
 This function does the same as \helpref{Empty()}{wxarrayempty} and additionally
 frees the memory allocated to the array.
 
-\membersection{wxArray::Count}\label{wxarraycount}
-
-\constfunc{size\_t}{Count}{\void}
-
-Same as \helpref{GetCount()}{wxarraygetcount}. This function is deprecated -
-it exists only for compatibility.
-
 \membersection{wxObjArray::Detach}\label{wxobjarraydetach}
 
 \func{T *}{Detach}{\param{size\_t }{index}}
 
-Removes the element from the array, but, unlike, 
+Removes the element from the array, but, unlike,
 \helpref{Remove()}{wxarrayremove} doesn't delete it. The function returns the
 pointer to the removed element.
 
@@ -512,7 +559,7 @@ pointer to the removed element.
 
 Empties the array. For wxObjArray classes, this destroys all of the array
 elements. For wxArray and wxSortedArray this does nothing except marking the
-array of being empty - this function does not free the allocated memory, use 
+array of being empty - this function does not free the allocated memory, use
 \helpref{Clear()}{wxarrayclear} for this.
 
 \membersection{wxArray::GetCount}\label{wxarraygetcount}
@@ -523,15 +570,15 @@ Return the number of items in the array.
 
 \membersection{wxArray::Index}\label{wxarrayindex}
 
-\func{int}{Index}{\param{T\& }{item}, \param{bool }{searchFromEnd = false}}
+\constfunc{int}{Index}{\param{T\& }{item}, \param{bool }{searchFromEnd = false}}
 
-\func{int}{Index}{\param{T\& }{item}}
+\constfunc{int}{Index}{\param{T\& }{item}}
 
 The first version of the function is for wxArray and wxObjArray, the second is
 for wxSortedArray only.
 
 Searches the element in the array, starting from either beginning or the end
-depending on the value of {\it searchFromEnd} parameter. wxNOT\_FOUND is
+depending on the value of {\it searchFromEnd} parameter. {\tt wxNOT\_FOUND} is
 returned if the element is not found, otherwise the index of the element is
 returned.
 
@@ -545,6 +592,20 @@ element in the array and so will only succeed if this element had been
 previously added to the array, but fail even if another, identical, element is
 in the array.
 
+\membersection{wxSortedArray::IndexForInsert}\label{wxarrayindexforinsert}
+
+\constfunc{size\_t}{IndexForInsert}{\param{T }{item}}
+
+Search for a place to insert {\it item} into the sorted array (binary search).
+The index returned is just before the first existing item that is greater or equal
+(according to the compare function) to the given {\it item}.
+
+You have to do extra work to know if the {\it item} already exists in array.
+
+This function is useful in conjunction with 
+\helpref{AddAt}{wxarrayaddat} for a common operation
+of "insert only if not found".
+
 \membersection{wxArray::Insert}\label{wxarrayinsert}
 
 \func{void}{Insert}{\param{T }{item}, \param{size\_t }{n}, \param{size\_t }{copies = $1$}}
@@ -557,6 +618,9 @@ Insert the given number of {\it copies} of the {\it item} into the array before
 the existing item {\it n} - thus, {\it Insert(something, 0u)} will insert an
 item in such way that it will become the first array element.
 
+wxSortedArray doesn't have this function because inserting in wrong place
+would break its sorted condition.
+
 Please see \helpref{Add()}{wxarrayadd} for explanation of the differences
 between the overloaded versions of this function.
 
@@ -595,7 +659,7 @@ Removes an element from the array by value: the first item of the
 array equal to {\it item} is removed, an assert failure will result from an
 attempt to remove an item which doesn't exist in the array.
 
-When an element is removed from wxObjArray it is deleted by the array - use 
+When an element is removed from wxObjArray it is deleted by the array - use
 \helpref{Detach()}{wxobjarraydetach} if you don't want this to happen. On the
 other hand, when an object is removed from a wxArray nothing happens - you
 should delete it manually if required:
@@ -632,8 +696,8 @@ elements of a wxArray (supposed to contain pointers).
 
 \func{void}{SetCount}{\param{size\_t }{count}, \param{T }{defval = T($0$)}}
 
-This function ensures that the number of array elements is at least 
-{\it count}. If the array has already {\it count} or mroe items, nothing is
+This function ensures that the number of array elements is at least
+{\it count}. If the array has already {\it count} or more items, nothing is
 done. Otherwise, {\tt count - GetCount()} elements are added and initialized to
 the value {\it defval}.
 
@@ -660,7 +724,7 @@ The notation CMPFUNC<T> should be read as if we had the following declaration:
 template int CMPFUNC(T *first, T *second);
 \end{verbatim}
 
-where {\it T} is the type of the array elements. I.e. it is a function returning 
+where {\it T} is the type of the array elements. I.e. it is a function returning
 {\it int} which is passed two arguments of type {\it T *}.
 
 Sorts the array using the specified compare function: this function should
