X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e38f59e899f48f2f4b282b191f580780dd9b5c5f..3cc305b2b4a0674c56c84d7088cfd70676b850f0:/docs/latex/wx/array.tex diff --git a/docs/latex/wx/array.tex b/docs/latex/wx/array.tex index dc2306e235..fd3065b141 100644 --- a/docs/latex/wx/array.tex +++ b/docs/latex/wx/array.tex @@ -56,8 +56,7 @@ 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 @@ -86,6 +85,10 @@ example: \begin{verbatim} #include +\wxheading{Library} + +\helpref{wxBase}{librarieslist} + // we must forward declare the array because it is used inside the class // declaration class MyDirectory; @@ -133,7 +136,11 @@ 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. +{\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:} @@ -239,7 +246,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}\\ @@ -295,8 +301,9 @@ class MyClass; 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} @@ -511,13 +518,6 @@ the existing contents of the array is not modified. 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}}