X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c73b439f80d84ce1a58d862835b3b8cc3fb96f5d..0cc1d4ff2a0c78666f35bbfa34fcc609d7862709:/include/wx/generic/wizard.h diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h index b6dd5fc467..43c01a90e6 100644 --- a/include/wx/generic/wizard.h +++ b/include/wx/generic/wizard.h @@ -6,14 +6,14 @@ // Created: 28.09.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ---------------------------------------------------------------------------- // wxWizard // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "wizardg.h" #endif @@ -47,7 +47,7 @@ public: virtual wxWizardPage *GetCurrentPage() const; virtual void SetPageSize(const wxSize& size); virtual wxSize GetPageSize() const; - virtual void Fit(const wxWizardPage *firstPage); + virtual void FitToPage(const wxWizardPage *firstPage); // implementation only from now on // ------------------------------- @@ -62,7 +62,7 @@ public: // do fill the dialog with controls // this is app-overridable to, for example, set help and tooltip text - void DoCreateControls(); + virtual void DoCreateControls(); private: // was the dialog really created? @@ -97,5 +97,6 @@ private: DECLARE_DYNAMIC_CLASS(wxWizard) DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxWizard) };