Changed char* to wxChar*

[wxWidgets.git] / include / wx / generic / wizard.h

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index f16fe894f25d9e220697a16d4171e40fb5eeac4a..68362e06ec8a499d6ca07c5939f55d26bccd5d35 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -13,7 +13,7 @@
 // wxWizard
 // ----------------------------------------------------------------------------
 
 // wxWizard
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "wizardg.h"
 #endif
 
     #pragma interface "wizardg.h"
 #endif
 


@@ -47,6 +47,7 @@ public:
     virtual wxWizardPage *GetCurrentPage() const;
     virtual void SetPageSize(const wxSize& size);
     virtual wxSize GetPageSize() const;
     virtual wxWizardPage *GetCurrentPage() const;
     virtual void SetPageSize(const wxSize& size);
     virtual wxSize GetPageSize() const;

+    virtual void FitToPage(const wxWizardPage *firstPage);

 
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------


@@ -61,7 +62,7 @@ public:
 
     // do fill the dialog with controls
     // this is app-overridable to, for example, set help and tooltip text
 
     // 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?
 
 private:
     // was the dialog really created?