Switched @NULL back to (the appropriate) @NUL and added NUL command to Doxygen.

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

diff --git a/docs/doxygen/Doxyfile_inc b/docs/doxygen/Doxyfile_inc
index eeacb0666f0f76357ec0b4649f3c2b53b1a1676e..8afbd597c60ae5a563dfe81ab1e394db6b3c348d 100644 (file)
--- a/docs/doxygen/Doxyfile_inc
+++ b/docs/doxygen/Doxyfile_inc
@@ -111,6 +111,7 @@ ALIASES += header{1}="Include file:\n \verbatim #include <\1> \endverbatim"
 ALIASES += true="<span class='literal'>true</span>"
 ALIASES += false="<span class='literal'>false</span>"
 ALIASES += NULL="<span class='literal'>NULL</span>"
+ALIASES += NUL="<span class='literal'>NUL</span>"
 
 # NOTE: these are important as you can't write in the docs
 #       just #ifdef since the # character is used by Doxygen

diff --git a/interface/wx/wxcrt.h b/interface/wx/wxcrt.h
index 155712f1e800f44cba0a5c9e615dcf8c536a0748..46539afb103c375b9bf1de0e9ded7fea951b070b 100644 (file)
--- a/interface/wx/wxcrt.h
+++ b/interface/wx/wxcrt.h
@@ -91,7 +91,7 @@ wxArrayString wxStringTokenize(const wxString& string,
 
     This function copies the source string @a src to the destination buffer @a
     dst of size @a n without overflowing the buffer and ensuring that it is
-    always @NULL-terminated.
+    always @NUL-terminated.
 
     Example of use:
     @code
@@ -121,7 +121,7 @@ wxArrayString wxStringTokenize(const wxString& string,
     @param dst
         Destination buffer of size (greater or) equal to @a n.
     @param src
-        @NULL-terminated source string.
+        @NUL-terminated source string.
     @param n
         The size of the destination buffer.
     @return