X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76e9224eb2edea8afe45faa6a1cd1b2894d245c2..4fde860eb3996917bd018bfed624d04553e2c2c4:/interface/wx/dynarray.h diff --git a/interface/wx/dynarray.h b/interface/wx/dynarray.h index dc427b171d..4046bc5230 100644 --- a/interface/wx/dynarray.h +++ b/interface/wx/dynarray.h @@ -197,6 +197,18 @@ - WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_INT() + @section array_predef Predefined array types + + wxWidgets defines the following dynamic array types: + - wxArrayShort + - wxArrayInt + - wxArrayDouble + - wxArrayLong + - wxArrayPtrVoid + + To use them you don't need any macro; you just need to include @c dynarray.h. + + @library{wxbase} @category{containers} @@ -632,17 +644,17 @@ public: /** - This macro may be used to append all elements of the @a other array to the - @a array. The two arrays must be of the same type. + This macro may be used to append all elements of the @a wxArray_arrayToBeAppended + array to the @a wxArray_arrayToModify. The two arrays must be of the same type. */ -#define WX_APPEND_ARRAY(wxArray& array, wxArray& other) +#define WX_APPEND_ARRAY(wxArray_arrayToModify, wxArray_arrayToBeAppended) /** This macro may be used to delete all elements of the array before emptying it. It can not be used with wxObjArrays - but they will delete their elements anyway when you call Empty(). */ -#define WX_CLEAR_ARRAY(wxArray& array) +#define WX_CLEAR_ARRAY(wxArray_arrayToBeCleared) //@{ /** @@ -777,8 +789,8 @@ public: //@} /** - This macro may be used to prepend all elements of the @a other array to the - @a array. The two arrays must be of the same type. + This macro may be used to prepend all elements of the @a wxArray_arrayToBePrepended + array to the @a wxArray_arrayToModify. The two arrays must be of the same type. */ -#define WX_PREPEND_ARRAY(wxArray& array, wxArray& other) +#define WX_PREPEND_ARRAY(wxArray_arrayToModify, wxArray_arrayToBePrepended)