Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed @NULL,@true,@false tags from the function prototypes; fixed * and & displacing in the prototypes; changed @param as discussed on wx-dev; use @see instead of @sa; better indentation for @returns,@remarks,@see paragraphs; other misc fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-03-09 12:33:59 +00:00
parent 0aaf0255e4
commit 4cc4bfafe5
256 changed files with 8880 additions and 10701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
interface/wizard.h
View File

@@ -37,10 +37,9 @@ public:
wizard will resize and reposition the page anyhow.
@param parent
The parent wizard
The parent wizard
@param bitmap
The page-specific bitmap if different from the global one
The page-specific bitmap if different from the global one
*/
wxWizardPage(wxWizard* parent,
const wxBitmap& bitmap = wxNullBitmap);
@@ -49,10 +48,8 @@ public:
This method is called by wxWizard to get the bitmap to display alongside the
page. By default, @c m_bitmap member variable which was set in the
@ref wxwizardpage() constructor.
If the bitmap was not explicitly set (i.e. if @c wxNullBitmap is returned),
the default bitmap for the wizard should be used.
The only cases when you would want to override this function is if the page
bitmap depends dynamically on the user choices, i.e. almost never.
*/
@@ -64,7 +61,7 @@ public:
page of the wizard will usually return @NULL from here, but the others
will not.
@sa GetPrev()
@see GetPrev()
*/
wxWizardPage* GetNext();
@@ -74,7 +71,7 @@ public:
page of the wizard will usually return @NULL from here, but the others
will not.
@sa GetNext()
@see GetNext()
*/
wxWizardPage* GetPrev();
};
@@ -101,8 +98,8 @@ public:
Constructor. It is not normally used by the user code as the objects of this
type are constructed by wxWizard.
*/
wxWizardEvent(wxEventType type = wxEVT_@NULL, int id = -1,
bool direction = @true);
wxWizardEvent(wxEventType type = wxEVT_NULL, int id = -1,
bool direction = true);
/**
Return the direction in which the page is changing: for @c
@@ -148,14 +145,13 @@ public:
SetPrev() or
SetNext().
*/
wxWizardPageSimple(wxWizard* parent = @NULL,
wxWizardPage* prev = @NULL,
wxWizardPage* next = @NULL,
wxWizardPageSimple(wxWizard* parent = NULL,
wxWizardPage* prev = NULL,
wxWizardPage* next = NULL,
const wxBitmap& bitmap = wxNullBitmap);
/**
A convenience function to make the pages follow each other.
Example:
*/
static void Chain(wxWizardPageSimple* first,
@@ -221,31 +217,25 @@ public:
/**
Constructor which really creates the wizard -- if you use this constructor, you
shouldn't call Create().
Notice that unlike almost all other wxWidgets classes, there is no @e size
parameter in the wxWizard constructor because the wizard will have a predefined
default size by default. If you want to change this, you should use the
GetPageAreaSizer() function.
@param parent
The parent window, may be @NULL.
The parent window, may be @NULL.
@param id
The id of the dialog, will usually be just -1.
The id of the dialog, will usually be just -1.
@param title
The title of the dialog.
The title of the dialog.
@param bitmap
The default bitmap used in the left side of the wizard. See
also GetBitmap.
The default bitmap used in the left side of the wizard. See
also GetBitmap.
@param pos
The position of the dialog, it will be centered on the screen
by default.
The position of the dialog, it will be centered on the screen
by default.
@param style
Window style is passed to wxDialog.
Window style is passed to wxDialog.
*/
wxWizard();
wxWizard(wxWindow* parent, int id = -1,
@@ -258,31 +248,25 @@ public:
/**
Creates the wizard dialog. Must be called if the default constructor had been
used to create the object.
Notice that unlike almost all other wxWidgets classes, there is no @e size
parameter in the wxWizard constructor because the wizard will have a predefined
default size by default. If you want to change this, you should use the
GetPageAreaSizer() function.
@param parent
The parent window, may be @NULL.
The parent window, may be @NULL.
@param id
The id of the dialog, will usually be just -1.
The id of the dialog, will usually be just -1.
@param title
The title of the dialog.
The title of the dialog.
@param bitmap
The default bitmap used in the left side of the wizard. See
also GetBitmap.
The default bitmap used in the left side of the wizard. See
also GetBitmap.
@param pos
The position of the dialog, it will be centered on the screen
by default.
The position of the dialog, it will be centered on the screen
by default.
@param style
Window style is passed to wxDialog.
Window style is passed to wxDialog.
*/
bool Create(wxWindow* parent, int id = -1,
const wxString& title = wxEmptyString,
@@ -293,10 +277,8 @@ public:
/**
This method is obsolete, use
GetPageAreaSizer() instead.
Sets the page size to be big enough for all the pages accessible via the
given @e firstPage, i.e. this page, its next page and so on.
This method may be called more than once and it will only change the page size
if the size required by the new page is bigger than the previously set one.
This is useful if the decision about which pages to show is taken during
@@ -314,7 +296,6 @@ public:
Returns the colour that should be used to fill the area not taken up by the
wizard or page bitmap,
if a non-zero bitmap placement flag has been set.
See also SetBitmapPlacement().
*/
const wxColour GetBitmapBackgroundColour();
@@ -323,7 +304,6 @@ public:
Returns the flags indicating how the wizard or page bitmap should be expanded
and positioned to fit the
page height. By default, placement is 0 (no expansion is done).
See also SetBitmapPlacement() for the possible values.
*/
int GetBitmapPlacement();
@@ -338,7 +318,6 @@ public:
Returns the minimum width for the bitmap that will be constructed to contain
the actual wizard or page bitmap
if a non-zero bitmap placement flag has been set.
See also SetBitmapPlacement().
*/
int GetMinimumBitmapWidth();
@@ -348,7 +327,6 @@ public:
the page area sizer is the place-holder for the pages. All pages are resized
before
being shown to match the wizard page area.
Page area sizer has a minimal size that is the maximum of several values. First,
all pages (or other objects) added to the sizer. Second, all pages reachable
by repeatedly applying
@@ -359,19 +337,16 @@ public:
be increased to accommodate the bitmap height. Fifth and finally, wizards are
never smaller than some built-in minimal size to avoid wizards that are too
small.
The caller can use wxSizer::SetMinSize to enlarge it
beyond the minimal size. If @c wxRESIZE_BORDER was passed to constructor, user
can resize wizard and consequently the page area (but not make it smaller than
the
minimal size).
It is recommended to add the first page to the page area sizer. For simple
wizards,
this will enlarge the wizard to fit the biggest page. For non-linear wizards,
the first page of every separate chain should be added. Caller-specified size
can be accomplished using wxSizer::SetMinSize.
Adding pages to the page area sizer affects the default border width around page
area that can be altered with SetBorder().
*/
@@ -388,9 +363,9 @@ public:
@ref wxWizardPage::getnext page-GetNext but this could be undesirable if,
for example, the pages are created on demand only.
@sa HasPrevPage()
@see HasPrevPage()
*/
virtual bool HasNextPage(wxWizardPage * page);
virtual bool HasNextPage(wxWizardPage* page);
/**
Returns @true if this page is not the last one in the wizard. The base
@@ -398,13 +373,13 @@ public:
@ref wxWizardPage::getprev page-GetPrev but this could be undesirable if,
for example, the pages are created on demand only.
@sa HasNextPage()
@see HasNextPage()
*/
virtual bool HasPrevPage(wxWizardPage * page);
virtual bool HasPrevPage(wxWizardPage* page);
/**
Executes the wizard starting from the given page, returning @true if it was
successfully finished or @false if user cancelled it. The @e firstPage
successfully finished or @false if user cancelled it. The @a firstPage
can not be @NULL.
*/
bool RunWizard(wxWizardPage* firstPage);
@@ -418,7 +393,6 @@ public:
Sets the colour that should be used to fill the area not taken up by the wizard
or page bitmap,
if a non-zero bitmap placement flag has been set.
See also SetBitmapPlacement().
*/
void SetBitmapBackgroundColour(const wxColour& colour);
@@ -426,44 +400,37 @@ public:
/**
Sets the flags indicating how the wizard or page bitmap should be expanded and
positioned to fit the
page height. By default, placement is 0 (no expansion is done). @e placement is
page height. By default, placement is 0 (no expansion is done). @a placement is
a bitlist with the
following possible values:
@b wxWIZARD_VALIGN_TOP
Aligns the bitmap at the top.
@b wxWIZARD_VALIGN_CENTRE
Centres the bitmap vertically.
@b wxWIZARD_VALIGN_BOTTOM
Aligns the bitmap at the bottom.
@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
See also SetMinimumBitmapWidth().
*/
void SetBitmapPlacement(int placement);
@@ -472,7 +439,6 @@ public:
Sets width of border around page area. Default is zero. For backward
compatibility, if there are no pages in
GetPageAreaSizer(), the default is 5 pixels.
If there is a five point border around all controls in a page and the border
around
page area is left as zero, a five point white space along all dialog borders
@@ -488,7 +454,6 @@ public:
if a non-zero bitmap placement flag has been set. If this is not set when using
bitmap placement, the initial
layout may be incorrect.
See also SetBitmapPlacement().
*/
void SetMinimumBitmapWidth(int width);
@@ -496,11 +461,9 @@ public:
/**
This method is obsolete, use
GetPageAreaSizer() instead.
Sets the minimal size to be made available for the wizard pages. The wizard
will take into account the size of the bitmap (if any) itself. Also, the
wizard will never be smaller than the default size.
The recommended way to use this function is to lay out all wizard pages using
the sizers (even though the wizard is not resizeable) and then use
wxSizer::CalcMin in a loop to calculate the maximum