note about WX_DEFIN_EOBJARRAY added

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/array.tex b/docs/latex/wx/array.tex
index 7f16a2a273c4474f6942beb218b4077f8acb2930..8d4fd6f665c9c2bcc3bddcd9203ae38dd6dd8352 100644 (file)
--- a/docs/latex/wx/array.tex
+++ b/docs/latex/wx/array.tex
@@ -95,7 +95,9 @@ class MyDirectory
 ...
 
 // now that we have MyDirectory declaration in scope we may finish the
 ...
 
 // now that we have MyDirectory declaration in scope we may finish the

-// definition of ArrayOfDirectories
+// definition of ArrayOfDirectories -- note that this expands into some C++
+// code and so should only be compiled once (i.e., don't put this in the
+// header, but into a source file or you will get linkin errors)

 #include <wx/arrimpl.cpp> // this is a magic incantation which must be done!
 WX_DEFINE_OBJARRAY(ArrayOfDirectories);
 
 #include <wx/arrimpl.cpp> // this is a magic incantation which must be done!
 WX_DEFINE_OBJARRAY(ArrayOfDirectories);
 


@@ -237,7 +239,7 @@ This macro defines a new sorted array class named {\it name} and containing
 the elements of type {\it T}. Example:
 
 \begin{verbatim}
 the elements of type {\it T}. Example:
 
 \begin{verbatim}

-WX_DEFINE_SORTED_ARRAY(int, wxArrayInt);
+WX_DEFINE_SORTED_ARRAY(int, wxSortedArrayInt);

 
 class MyClass;
 WX_DEFINE_SORTED_ARRAY(MyClass *, wxArrayOfMyClass);
 
 class MyClass;
 WX_DEFINE_SORTED_ARRAY(MyClass *, wxArrayOfMyClass);


@@ -251,7 +253,7 @@ int CompareInts(int n1, int n2)
     return n1 - n2;
 }
 
     return n1 - n2;
 }
 

-wxArrayInt sorted(CompareInts);
+wxSortedArrayInt sorted(CompareInts);

 
 int CompareMyClassObjects(MyClass *item1, MyClass *item2)
 {
 
 int CompareMyClassObjects(MyClass *item1, MyClass *item2)
 {