SWIGged updates for wxGTK

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

diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index 05c3842f1bace96f2030a005833ec637d7f5f000..b402cd5fea61a7692588ec59c7227124d9855555 100644 (file)
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -63,10 +63,10 @@ public:
     // cases - override this method if you want to create the bitmap to be used
     // dynamically or to do something even more fancy. It's ok to return
     // wxNullBitmap from here - the default one will be used then.
     // cases - override this method if you want to create the bitmap to be used
     // dynamically or to do something even more fancy. It's ok to return
     // wxNullBitmap from here - the default one will be used then.

-    virtual wxBitmap GetBitmap() const { return m_PageBitmap; }
+    virtual wxBitmap GetBitmap() const { return m_bitmap; }

 
 protected:
 
 protected:

-    wxBitmap m_PageBitmap;
+    wxBitmap m_bitmap;

 
 private:
     DECLARE_ABSTRACT_CLASS(wxWizardPage)
 
 private:
     DECLARE_ABSTRACT_CLASS(wxWizardPage)


@@ -212,7 +212,7 @@ typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&);
 #define EVT_WIZARD_CANCEL(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_CANCEL, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxWizardEventFunction) & fn, (wxObject *)NULL),
 
 // the user pressed "Help" button 
 #define EVT_WIZARD_CANCEL(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_CANCEL, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxWizardEventFunction) & fn, (wxObject *)NULL),
 
 // the user pressed "Help" button 

-#define EVT_WIZARD_HELP(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_HELP, id, -1, (wxObjectEventFunction) (wxEventFunction) wxWizardEventFunction) & fn, (wxObject *)NULL),
+#define EVT_WIZARD_HELP(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_HELP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxWizardEventFunction) & fn, (wxObject *)NULL),

 
 #endif // wxUSE_WIZARDDLG
 
 
 #endif // wxUSE_WIZARDDLG