X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/408a83cbe93bed87c1fe74df03476cfcaca28210..de2b67e6996decc38233075cb803cce0cfe80168:/docs/tech/tn0003.txt diff --git a/docs/tech/tn0003.txt b/docs/tech/tn0003.txt index 8965f44405..f9f142bd0b 100644 --- a/docs/tech/tn0003.txt +++ b/docs/tech/tn0003.txt @@ -1,101 +1,94 @@ - Adding wxWindows class documentation + Adding wxWidgets class documentation ==================================== This note is aimed at people wishing to add documentation for a -class to either the main wxWindows manual, or to their own +class to either the main wxWidgets manual, or to their own manual. -wxWindows uses Tex2RTF to process Latex-like input files (.tex) -and output in HTML, WinHelp RTF and Word RTF. Tex2RTF is provided -in the wxWindows distribution and in the CVS archive, under -utils/tex2rtf. Please start by perusing the Tex2RTF manual. +wxWidgets uses Doxygen to process header input files with embedded +documentation in the form of C++ comments and output in HTML, and XML +(Doxygen itself can also output Latex, manpages, RTF, PDF etc). +See http://www.doxygen.org for more info about Doxygen. -If adding to the existing manual in docs/latex/wx, you need to -create a new .tex file, e.g. myclass.tex, and add it to the -list of classes in classes.tex (in strict alphabetical order). -You may also want to write a separate topic file, e.g. tmyclass.tex, -and add the entry to topics.tex. Also, if applicable, and an entry -to category.tex. +If you want to add documentation of a new class/function to the +existing manual in docs/doxygen, you need to create a new .h file, +e.g. myclass.h, under the interface folder, which contains the public +interface of the new class/function in C++ syntax. +The documentation can then be added in form of Doxygen comments to +the header file. -If compiling a separate manual, copy an existing set of files from the -wxWindows manual or a contribution. Contribution documentation -normally goes in the contrib/docs hierarchy, with the source -going in a latex/mycontrib subdirectory. +You may also want to write a separate topic file, +e.g. docs/doxygen/overviews/myclass.h, and add the entry to +docs/doxygen/mainpages/topics.h. -You can generate a first pass at the myclass.tex file by -compiling and running HelpGen (utils/helpgen). +If applicable, also add an entry to docs/doxygen/mainpages/categories.h. -Running Tex2RTF -=============== - -See the Tex2RTF documentation, but here are some forms: - -For HTML: +You can generate a first raw version of myclass.h simply taking its +"real" header and removing all the private and protected sections and +in general removing everything the user "shouldn't know": i.e. all things +which are implementation details. - tex2rtf manual.tex manual.htm -html -twice -Use of -twice allows Tex2RTF to resolve references. Note that -if both filenames are given (first two parameters on the command -line) then Tex2RTF will run in non-interactive mode. +Running Doxygen +=============== -For WinHelp RTF: +First, make sure you have a recent version of Doxygen installed in your system. - tex2rtf manual.tex manual.rtf -winhelp -twice +For HTML: -For Word RTF: + 1) cd wxWidgets/docs/doxygen + 2) run ./regen.sh [Unix] or regen.bat [Windows] - tex2rtf manual.tex manual.rtf -rtf -twice +[TODO: istructions for generation of other formats] -If you wish to have a GUI display show the status of what is happening -as the conversion is happening, use the '-interactive' command line -parameter, and then choose FILE|GO from the menu. For example: - tex2rtf manual.tex manual.rtf -rtf -twice -interactive +Important Dos and Don'ts +======================== -NOTE: You must be using the latest tex2rtf which was released with -v2.2.0 of wxWindows to use the -interactive switch +DO: -If you wish to generate documentation for wxHTML Help Viewer -(or Windows HTML Help), set htmlWorkshopFiles to true in your -tex2rtf.ini file. See also the wxHTML Notes section in the -wxWindows manual. To futher speed-up HTML help books loading -in your application, you may use hhp2cached (utils/hhp2cached). +- Doxygen supports both commands in the form \command and @command; + all wxWidgets documentation uses the @command form. -src/msw/makefile.vc contains targets for generating various -formats of documentation. You may like to do something similar if -writing your own manual. +- strive to use dedicated Doxygen commands for e.g. notes, lists, + sections, etc. The "Special commands" page: + http://www.stack.nl/~dimitri/doxygen/commands.html + is your friend! + It's also very important to make a consistent use of the ALIASES + defined by wxWidgets' Doxyfile. Open that file for more info. -Important Dos and Don'ts -======================== +- when you write true, false and NULL with their C++ semantic meaning, + then use the @true, @false and @NULL commands. -DO: +- separe different paragraphs with an empty comment line. + This is important otherwise Doxygen puts everything in the same + paragraph making the result less readable. -- put a space (or \rtfsp) at the end of a line or start of a line where - a command ends or starts the line. Otherwise, spaces will be - omitted in Word or WinHelp RTF. For example: +- leave a blank comment line between a @section, @subsection, @page + and the next paragraph. - See \helpref{wxBitmap::wxBitmap}{wxbitmapconstr}\rtfsp - for a list of possible values. +- test your changes, both reading the generated HTML docs and by looking + at the "doxygen.log" file produced (which will warn you about any + eventual mistake found in the comments). -- leave a blank line at the end of the class file. This is - important, or the Word RTF table of contents will be messed up. +- quote all the following characters prefixing them with a "@" char: -- leave a blank line between a heading and the next paragraph. + @ $ \ & < > # % -- test your changes, preferably converting the manual to WinHelp - format and running through the Windows help compiler to check - for missing labels, etc. + unless they appear inside a @code or @verbatim section. -- quote all '_' characters with a '\' character (e.g. "MY\_PROGRAM" - unless the '_' is inside a comment or a \begin{verbatim} ... - \end{verbatim} block +- when using a Doxygen alias like @itemdef{}, you need to escape the + comma characters which appear on the first argument, otherwise Doxygen + will interpret them as the marker of the end of the first argument and + the beginning of the second argument's text. -- check that your changes/additions to any TEX documentation - compiles before checking it in! Use the '-checkcurleybrace' - and '-checksyntax' commandline parameters (or the OPTIONS menu - if running in GUI mode) to check for some of the more common - mistakes. See TROUBLESHOOTING below for more details + E.g. if you want to define the item "wxEVT_MACRO(id, func)" you need to + write: + @itemdef{wxEVT_MACRO(id\, func), This is the description of the macro} + Also note that you need to escape only the commas of the first argument's text; + second argument can have up to 10 commas unescaped (see the Doxyfile for the + trick used to implement this). DON'T: @@ -103,168 +96,170 @@ DON'T: The manual is intended to be a fluent, English document and not a collection of rough notes. -- use non-alphanumeric characters in labels. - -- use incompatible Latex syntax, such as {\it \bf word} (use a pair - of braces for each formatting command). - -- leave multiple consecutive blank lines, or blank lines between - \items in a list. +- use non-alphanumeric characters in link anchors. -- use \verb$....$ syntax. Instead use \tt{....} syntax +- use Doxygen @b @c @e commands when referring to more than a single word; + in that case you need to use the ..., ..., ... + HTML-style tags instead -- add the following tokens anywhere except on a line by themselves: - \begin{verbatim} - \begin{toocomplex} - \end{verbatim} - \end{toocomplex} - \verb - \begin{comment} - \end{comment} - \verbatiminput - \par - \input - \helpinput - \include - +- use HTML style tags for creation of tables or lists. + Use wx aliases instead like @beginTable, @row2col, @row3col, @endTable and + @beginDefList, @itemdef, @endDefList, etc. + See the Doxyfile for more info. -Troubleshooting -=============== -Please see the troubleshooting section in the Tex2RTF manual, but -here is one important tip: - - If you get a "Macro not found: \end{document}" error, - this is a spurious side-effect of an earlier error, usually an - incorrect number of arguments to a command. The location of the - true error is then anywhere in the document. - - To home in on the error, try putting \begin{comment}...\end{comment} - around much of the document, and then move the \begin{comment} - line down until the error manifests itself again. Note that - you can abort Tex2RTF after the syntax error stage by clicking - on the close button, so you don't have to wait while the whole - document is processed. - - Before looking at a file in detail, you can comment out the - \input{myclass.tex} line in classes.tex using the single - line comment character (%) to see whether it was that file that - caused the problem. - - When making changes/additions to the documentation, always use - the '-checkcurleybraces' and '-checksyntax' commandline parameters - (or turn these options on in the GUI version via the OPTIONS menu - choice), BEFORE checking in your changes. These two debugging - options will catch many of the more common mistakes that are made - while writing documents, plus they will catch some of the uses - of TeX that are correct syntax-wise, but that tex2rtf cannot - handle properly, and report the problems (usually along with - a filename and line number that they occur in!) in the programs - output window (GUI mode). - -Elements in a class file -======================== +Documentation comment for a class +================================= Start off with: -\section{\class{wxMyClass}}\label{wxmyclass} - -(note that labels can only go on sections such as \chapter, -\section, \subsection, \membersection, but not on \wxheading, for -example.) - -Describe the class briefly. - -Then there are several \wxheading sections: - -\wxheading{Derived from} - -List the base classes, with line breaks following each one (\\) -except the last. +/** + * @class wxMyClass + * @headerfile wx/myclass.h + * + * ...here goes the description... + * + * @beginEventTable + * @event{EVT_SOME_EVENT(id, func)}: + * Description for EVT_SOME_EVENT. + * @endEventTable + * + * @beginStyleTable + * @style{wxSOME_STYLE}: + * Description for wxSOME_STYLE. + * ... + * @endStyleTable + * + * @beginExtraStyleTable + * @style{wxSOME_EXTRA_STYLE}: + * Description for wxSOME_EXTRA_STYLE. + * ... + * @endExtraStyleTable + * + * @library{wxbase} + * @stdobjects + * ...here goes the list of predefined instances... + * + * @seealso + * ...here goes the see-also list... + * you can make references to topic overviews or other + * manual pages using the @ref command + */ + +Note that the events, styles and extra-styles tables as +well as @stdobjects and @seealso lists are optional. + +Also note that you shouldn't use the Doxygen builtin @sa command +for the see-also list but rather the wxWidgets' alias @seealso +in this case. + + +Documentation comment for a function +==================================== -\wxheading{Include files} - -List the relevant include files, for example: - - - -\wxheading{Predefined objects} - -List any predefined objects, such as: - -{\bf wxNullMyClass} - -\wxheading{See also} +Start off with: -List any relevant classes or topics, using \helpref. +/** + * ...here goes the description of the function.... + * + * @param param1 + * ...here goes the description for the first parameter of this function + * @param param2 + * ...here goes the description for the second parameter of this function + * ... + * + * @return + * ...here goes the description of what the function returns... + * + * @note ...here go any eventual notes about this function... + * + * @remarks ...here go any eventual remarks about this function... + * + * @sa ...here goes the see-also list... + */ -\latexignore{\rtfignore{\wxheading{Members}}} +Note that the @return, @note, @remarks, @sa commands are optional. -This generates the required heading for the member definitions. -Put the constructors first, then in alphabetical order, the other -members. +Also note that unlike for class' description, you should use the doxygen +builtin @sa command here for see-also lists. -Here's an example of documentation for a member function: +The @param command has an optional attribute specifying the direction of +the attribute. Possible values are "in" and "out". E.g. - --------------------:x----------------------- +/** + * Copies bytes from a source memory area to a destination memory area, + * where both areas may not overlap. + * @param[out] dest The memory area to copy to. + * @param[in] src The memory area to copy from. + * @param[in] n The number of bytes to copy. + * @param[in,out] pmisc Used both as input and as output. + */ +void func(void *dest, const void *src, size_t n, void *pmisc); -\membersection{wxBitmap::Create}\label{wxbitmapcreate} -\func{virtual bool}{Create}{\param{int}{ width}, \param{int}{ height}, - \param{int}{ depth = -1}} +Documentation comment for a topic overview +========================================== -Creates a fresh bitmap. If the final argument is omitted, the display depth of -the screen is used. +Topic overviews are stored inside the docs/doxygen/overviews folder +and are completely placed inside a single comment block in the form of: -\func{virtual bool}{Create}{\param{void*}{ data}, \param{int}{ type}, - \param{int}{ width}, \param{int}{ height}, \param{int}{ depth = -1}} +/*! -Creates a bitmap from the given data, which can be of arbitrary type. + @page overview_tname wxSomeStuff overview -\wxheading{Parameters} + This page provides an overview of the wxSomeStuff and related classes. + .... -\docparam{width}{The width of the bitmap in pixels.} + @li @ref overview_tname_intro + @li @ref overview_tname_details + ... -\docparam{height}{The height of the bitmap in pixels.} +
-\docparam{depth}{The depth of the bitmap in pixels. If this is -1, the screen depth is used.} -\docparam{data}{Data whose type depends on the value of {\it type}.} + @section overview_tname_intro Introduction -\docparam{type}{A bitmap type identifier - see \helpref{wxBitmap::wxBitmap}{wxbitmapconstr} for a list -of possible values.} + ...here goes the introduction to this topic... -\wxheading{Return value} -TRUE if the call succeeded, FALSE otherwise. + @section overview_tname_details Details -\wxheading{Remarks} + ...here go the details to this topic... -The first form works on all platforms. The portability of the second form depends on the -type of data. +*/ -\wxheading{See also} +Note that there is a convention in the anchor link names. +Doxygen in fact requires that for each @page, @section, @subsection, etc tag, +there is a corresponding link anchor. -\helpref{wxBitmap::wxBitmap}{wxbitmapconstr} +The following conventions are used in wxWidgets doxygen comments: - --------------------:x----------------------- +1) all "main" pages of the manual (those which are placed in docs/doxygen/mainpages) + have link anchors which begin with "page_" -Note the use of \docparam to document parameters; and the fact -that several overloaded forms of the same member function are -documented within the same \membersection. +2) all topic overviews (those which are placed in docs/doxygen/overviews) have link + anchors which begin with "overview_" +3) all @section, @subsection, @subsubsection tags should have as link anchor name + the name of the parent section plus a specific word separed with an underscore; e.g.: -Special forms: +/*! -- for a const member function use \constfunc{} instead of \const + @page overview_tname wxSomeStuff overview -- for a function without parameters use \func{...}{Function}{\void} + @section overview_tname_intro Introduction + @subsection overview_tname_intro_firstpart First part + @subsection overview_tname_intro_secondpart Second part + @subsubsection overview_tname_intro_secondpart_sub Second part subsection + @subsection overview_tname_intro_thirdpart Third part -- but do NOT use \void for functions without return value, just "void" + @section overview_tname_details Details + ... -- for a virtual/static member function use \func{virtual/static ...} +*/ -- omit the return type for constructors: \func{}{MyClass}{...} -- use \destruct macro for the destructors \func{}{\destruct{MyClass}}{\void} +=== EOF === +Author: FM (under the lines of the previous technote about tex2rtf) +Version: $Id$