diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index 6187f35e06..f097a08c9e 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -54,7 +54,7 @@ while __WINDOWS__ should be used for the platform tests.} There are two wxWidgets ports to Mac OS X. One of them, wxOSX is the successor of the venerable wxMac, it currently exists in three versions: Carbon and Cocoa for the -desktop and a very early iPhone port. And there is the Cocoa port named wxCocoa +desktop and a very early iPhone port. And there is the Cocoa port named wxCocoa which has not been updated very actively since beginning 2008. To summarize: @li If you want to test for wxOSX on the desktop, use @@ -141,7 +141,7 @@ compiler used. @c 1020 for @c 4.2 (the first supported version), @c 1100 for @c 5.0, @c 1200 for @c 6.0 and so on. For convenience, the symbols __VISUALCn__ are also defined for each major compiler version from - 5 to 12, i.e. you can use tests such as #ifdef \_\_VISUALC7\_\_ + 5 to 12, i.e. you can use tests such as \#ifdef \_\_VISUALC7\_\_ to test for compiler version being precisely 7.} @itemdef{__XLC__, AIX compiler} @itemdef{__WATCOMC__, Watcom C++. The value of this macro corresponds to @@ -260,7 +260,7 @@ configuration. includes a number of wxWidgets headers thus making it unnecessary to include them explicitly. However if this is not defined, you do need to include them and so the usual idiom which allows to support both cases is to first include - @c wx/wxprec.h} and then, inside #ifndef WX_PRECOMP, individual + @c wx/wxprec.h} and then, inside \#ifndef WX_PRECOMP, individual headers you need.} @itemdef{_UNICODE and UNICODE, both are defined if wxUSE_UNICODE is set to @c 1} @itemdef{wxUSE_GUI, diff --git a/interface/wx/wizard.h b/interface/wx/wizard.h index 6ad183e372..53b66e201b 100644 --- a/interface/wx/wizard.h +++ b/interface/wx/wizard.h @@ -53,7 +53,7 @@ public: Default constructor. */ wxWizardPage(); - + /** Constructor accepts an optional bitmap which will be used for this page instead of the default one for this wizard (note that all bitmaps used should @@ -206,7 +206,7 @@ public: Default constructor. */ wxWizardPageSimple(); - + /** Constructor takes the previous and next pages. They may be modified later by SetPrev() or SetNext(). @@ -220,7 +220,7 @@ public: Creates the wizard page. Must be called if the default constructor had been used to create the object. */ - bool Create(wxWizard *parent = NULL, + bool Create(wxWizard *parent = NULL, wxWizardPage *prev = NULL, wxWizardPage *next = NULL, const wxBitmap& bitmap = wxNullBitmap); @@ -546,7 +546,7 @@ public: - @b wxWIZARD_HALIGN_LEFT: Left-aligns the bitmap. - @b wxWIZARD_HALIGN_CENTRE: Centres the bitmap horizontally. - @b wxWIZARD_HALIGN_RIGHT: Right-aligns the bitmap. - - @b wxWIZARD_TILE: @todo describe this + - @b wxWIZARD_TILE: The bitmap will be tiled to fit available space. See also SetMinimumBitmapWidth(). */ @@ -585,4 +585,3 @@ public: */ virtual void SetPageSize(const wxSize& sizePage); }; -