Use "import wx". wxPython.wx now has backwards compatible DC's and so

[wxWidgets.git] / wxPython / src / msw / wizard_wrap.cpp

diff --git a/wxPython/src/msw/wizard_wrap.cpp b/wxPython/src/msw/wizard_wrap.cpp
index 0e71e0426227fd772a4e2d397f66a6594ff7dcd8..78588189d1a01e484efa014fb1f1c485ebb5be03 100644 (file)
--- a/wxPython/src/msw/wizard_wrap.cpp
+++ b/wxPython/src/msw/wizard_wrap.cpp
@@ -246,8 +246,8 @@ static swig_type_info *swig_types[20];
 
 #include <wx/wizard.h>
     
 
 #include <wx/wizard.h>
     

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

 
 

+ static const wxString wxPyEmptyString(wxEmptyString); 

 bool wxWizardPage_Create(wxWizardPage *self,wxWizard *parent,wxBitmap const &bitmap,wxString const &resource){
             wxChar* res = NULL;
             if (resource.Length())
 bool wxWizardPage_Create(wxWizardPage *self,wxWizard *parent,wxBitmap const &bitmap,wxString const &resource){
             wxChar* res = NULL;
             if (resource.Length())


@@ -615,6 +615,7 @@ static PyObject *_wrap_new_PyWizardPage(PyObject *self, PyObject *args, PyObject
     wxBitmap *arg2 = (wxBitmap *) &wxNullBitmap ;
     wxString *arg3 = (wxString *) &wxPyEmptyString ;
     wxPyWizardPage *result;
     wxBitmap *arg2 = (wxBitmap *) &wxNullBitmap ;
     wxString *arg3 = (wxString *) &wxPyEmptyString ;
     wxPyWizardPage *result;

+    bool temp3 = False ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;


@@ -628,7 +629,11 @@ static PyObject *_wrap_new_PyWizardPage(PyObject *self, PyObject *args, PyObject
         if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     }
     if (obj2) {
         if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     }
     if (obj2) {

-        if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        {
+            arg3 = wxString_in_helper(obj2);
+            if (arg3 == NULL) SWIG_fail;
+            temp3 = True;
+        }

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -638,8 +643,16 @@ static PyObject *_wrap_new_PyWizardPage(PyObject *self, PyObject *args, PyObject
         if (PyErr_Occurred()) SWIG_fail;
     }
     resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyWizardPage, 1);
         if (PyErr_Occurred()) SWIG_fail;
     }
     resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyWizardPage, 1);

+    {
+        if (temp3)
+        delete arg3;
+    }

     return resultobj;
     fail:
     return resultobj;
     fail:

+    {
+        if (temp3)
+        delete arg3;
+    }

     return NULL;
 }
 
     return NULL;
 }
 


@@ -1489,7 +1502,7 @@ static PyObject *_wrap_new_Wizard(PyObject *self, PyObject *args, PyObject *kwar
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;

-    wxString const &arg3_defvalue = wxEmptyString ;
+    wxString const &arg3_defvalue = wxPyEmptyString ;

     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxBitmap const &arg4_defvalue = wxNullBitmap ;
     wxBitmap *arg4 = (wxBitmap *) &arg4_defvalue ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxBitmap const &arg4_defvalue = wxNullBitmap ;
     wxBitmap *arg4 = (wxBitmap *) &arg4_defvalue ;


@@ -1577,7 +1590,7 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
     int arg3 = (int) -1 ;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
     int arg3 = (int) -1 ;

-    wxString const &arg4_defvalue = wxEmptyString ;
+    wxString const &arg4_defvalue = wxPyEmptyString ;

     wxString *arg4 = (wxString *) &arg4_defvalue ;
     wxBitmap const &arg5_defvalue = wxNullBitmap ;
     wxBitmap *arg5 = (wxBitmap *) &arg5_defvalue ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     wxBitmap const &arg5_defvalue = wxNullBitmap ;
     wxBitmap *arg5 = (wxBitmap *) &arg5_defvalue ;