Updated Scintilla to 1.52 (on the trunk this time too)

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

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index 6c9b35b860de461da9c46643598b67c4871f994d..43c01a90e6e8d336d3b3ae97d358a178048e682c 100644 (file)
--- 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 <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 // wxWizard
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "wizardg.h"
 #endif
 
@@ -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)
 };