X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b38a20c1539dbbdc7cd1c43268d5f6e15bdd8fda..e1db4c1290af151b0d85c4dcad7cbb2414e0d474:/interface/wx/wizard.h diff --git a/interface/wx/wizard.h b/interface/wx/wizard.h index 50c20e823f..9244c18aca 100644 --- a/interface/wx/wizard.h +++ b/interface/wx/wizard.h @@ -3,7 +3,7 @@ // Purpose: interface of wxWizardPage, wxWizardEvent, // Author: wxWidgets team // RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /** @@ -95,9 +95,11 @@ public: @beginEventTable{wxWizardEvent} @event{EVT_WIZARD_PAGE_CHANGED(id, func)} - The page has been just changed (this event can not be vetoed). + The page has been just changed (this event cannot be vetoed). @event{EVT_WIZARD_PAGE_CHANGING(id, func)} The page is being changed (this event can be vetoed). + @event{EVT_WIZARD_PAGE_SHOWN(id, func)} + The page was shown and laid out (this event cannot be vetoed). @event{EVT_WIZARD_CANCEL(id, func)} The user attempted to cancel the wizard (this event may also be vetoed). @event{EVT_WIZARD_HELP(id, func)} @@ -223,12 +225,14 @@ public: wxDialog::EnableLayoutAdaptation() or per dialog with wxDialog::SetLayoutAdaptationMode(). For more about layout adaptation, see @ref overview_dialog_autoscrolling. - @beginEventTable{wxWizardEvent} + @beginEventEmissionTable{wxWizardEvent} For some events, Veto() can be called to prevent the event from happening. @event{EVT_WIZARD_PAGE_CHANGED(id, func)} The page has just been changed (this event cannot be vetoed). @event{EVT_WIZARD_PAGE_CHANGING(id, func)} The page is being changed (this event can be vetoed). + @event{EVT_WIZARD_PAGE_SHOWN(id, func)} + The page was shown and laid out (this event cannot be vetoed). @event{EVT_WIZARD_CANCEL(id, func)} The user attempted to cancel the wizard (this event may also be vetoed). @event{EVT_WIZARD_HELP(id, func)} @@ -428,7 +432,7 @@ public: /** Executes the wizard starting from the given page, returning @true if it was successfully finished or @false if user cancelled it. - The @a firstPage can not be @NULL. + The @a firstPage cannot be @NULL. */ virtual bool RunWizard(wxWizardPage* firstPage); @@ -491,7 +495,7 @@ public: 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 + using the sizers (even though the wizard is not resizable) and then use wxSizer::CalcMin() in a loop to calculate the maximum of minimal sizes of the pages and pass it to SetPageSize(). */