Patches from KevinO that work around issues where the widget isn't

[wxWidgets.git] / wxPython / src / wizard.i

diff --git a/wxPython/src/wizard.i b/wxPython/src/wizard.i
index b7e7653bbdb162f451f9f81c894f661c8103e057..309da8bac3a6e46628de591cbb384a929f119bc8 100644 (file)
--- a/wxPython/src/wizard.i
+++ b/wxPython/src/wizard.i
@@ -19,16 +19,17 @@
 
 #include <wx/wizard.h>
     
 
 #include <wx/wizard.h>
     

-    static const wxString wxPyEmptyString(wxT(""));

 %}
 
 //----------------------------------------------------------------------
 
 %import windows.i
 %}
 
 //----------------------------------------------------------------------
 
 %import windows.i

-%pythoncode { wx = core }
+%pythoncode { wx = _core }

 
 %include _wizard_rename.i
 
 
 %include _wizard_rename.i
 

+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+

 //----------------------------------------------------------------------
 
 enum {
 //----------------------------------------------------------------------
 
 enum {


@@ -195,8 +196,8 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWizardPage, wxWizardPage, RemoveChild);
 class wxPyWizardPage : public wxWizardPage {
 public:
 
 class wxPyWizardPage : public wxWizardPage {
 public:
 

-    %addtofunc wxPyWizardPage   "self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)"
-    %addtofunc wxPyWizardPage() ""
+    %pythonAppend wxPyWizardPage   "self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)"
+    %pythonAppend wxPyWizardPage() ""

     
     // ctor accepts an optional bitmap which will be used for this page instead
     // of the default one for this wizard (should be of the same size). Notice
     
     // ctor accepts an optional bitmap which will be used for this page instead
     // of the default one for this wizard (should be of the same size). Notice


@@ -273,8 +274,8 @@ class wxWizardPageSimple : public wxWizardPage
 {
 public:
 
 {
 public:
 

-    %addtofunc wxWizardPageSimple   "self._setOORInfo(self)"
-    %addtofunc wxWizardPageSimple() ""
+    %pythonAppend wxWizardPageSimple   "self._setOORInfo(self)"
+    %pythonAppend wxWizardPageSimple() ""

     
     // ctor takes the previous and next pages
     wxWizardPageSimple(wxWizard *parent,
     
     // ctor takes the previous and next pages
     wxWizardPageSimple(wxWizard *parent,


@@ -304,13 +305,13 @@ public:
 class  wxWizard : public wxDialog
 {
 public:
 class  wxWizard : public wxDialog
 {
 public:

-    %addtofunc wxWizard   "self._setOORInfo(self)"
-    %addtofunc wxWizard() ""
+    %pythonAppend wxWizard   "self._setOORInfo(self)"
+    %pythonAppend wxWizard() ""

     
     // ctor
     wxWizard(wxWindow *parent,
              int id = -1,
     
     // ctor
     wxWizard(wxWindow *parent,
              int id = -1,

-             const wxString& title = wxEmptyString,
+             const wxString& title = wxPyEmptyString,

              const wxBitmap& bitmap = wxNullBitmap,
              const wxPoint& pos = wxDefaultPosition,
              long style = wxDEFAULT_DIALOG_STYLE);
              const wxBitmap& bitmap = wxNullBitmap,
              const wxPoint& pos = wxDefaultPosition,
              long style = wxDEFAULT_DIALOG_STYLE);


@@ -318,7 +319,7 @@ public:
 
     bool Create(wxWindow *parent,
              int id = -1,
 
     bool Create(wxWindow *parent,
              int id = -1,

-             const wxString& title = wxEmptyString,
+             const wxString& title = wxPyEmptyString,

              const wxBitmap& bitmap = wxNullBitmap,
              const wxPoint& pos = wxDefaultPosition);
 
              const wxBitmap& bitmap = wxNullBitmap,
              const wxPoint& pos = wxDefaultPosition);