SWIGged updates for wxMac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i
index 3cc45d7cf2e9c8090d1fa22033e5f2ef13ec603f..5bf1c4ed413c29c1582618e753cfdbb4dd274338 100644 (file)
--- a/wxPython/src/gdi.i
+++ b/wxPython/src/gdi.i
@@ -1049,7 +1049,9 @@ enum wxRegionContain {
 class wxRegion : public wxGDIObject {
 public:
     wxRegion(long x=0, long y=0, long width=0, long height=0);
 class wxRegion : public wxGDIObject {
 public:
     wxRegion(long x=0, long y=0, long width=0, long height=0);

+#ifndef __WXMAC__

     %name(wxRegionFromPoints)wxRegion(int PCOUNT, wxPoint* points, int fillStyle = wxWINDING_RULE);
     %name(wxRegionFromPoints)wxRegion(int PCOUNT, wxPoint* points, int fillStyle = wxWINDING_RULE);

+#endif

     ~wxRegion();
 
     void Clear();
     ~wxRegion();
 
     void Clear();

diff --git a/wxPython/src/mac/wizard.cpp b/wxPython/src/mac/wizard.cpp
index c98202a99722181b5e5c8433a84740d15323e153..c39551d22486793744c4c61738ec29e1ff5d2ff9 100644 (file)
--- a/wxPython/src/mac/wizard.cpp
+++ b/wxPython/src/mac/wizard.cpp
@@ -366,34 +366,6 @@ static PyObject *_wrap_wxWizardPage_Create(PyObject *self, PyObject *args, PyObj
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWizardPage_Init(_swigobj)  (_swigobj->Init())
-static PyObject *_wrap_wxWizardPage_Init(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxWizardPage * _arg0;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWizardPage_Init",_kwnames,&_argo0)) 
-        return NULL;
-    if (_argo0) {
-        if (_argo0 == Py_None) { _arg0 = NULL; }
-        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWizardPage_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWizardPage_Init. Expected _wxWizardPage_p.");
-        return NULL;
-        }
-    }
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxWizardPage_Init(_arg0);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-

 #define wxWizardPage_GetPrev(_swigobj)  (_swigobj->GetPrev())
 static PyObject *_wrap_wxWizardPage_GetPrev(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 #define wxWizardPage_GetPrev(_swigobj)  (_swigobj->GetPrev())
 static PyObject *_wrap_wxWizardPage_GetPrev(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;


@@ -1471,34 +1443,6 @@ static PyObject *_wrap_wxWizardPageSimple_Create(PyObject *self, PyObject *args,
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWizardPageSimple_Init(_swigobj)  (_swigobj->Init())
-static PyObject *_wrap_wxWizardPageSimple_Init(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxWizardPageSimple * _arg0;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWizardPageSimple_Init",_kwnames,&_argo0)) 
-        return NULL;
-    if (_argo0) {
-        if (_argo0 == Py_None) { _arg0 = NULL; }
-        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWizardPageSimple_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWizardPageSimple_Init. Expected _wxWizardPageSimple_p.");
-        return NULL;
-        }
-    }
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxWizardPageSimple_Init(_arg0);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-

 #define wxWizardPageSimple_SetPrev(_swigobj,_swigarg0)  (_swigobj->SetPrev(_swigarg0))
 static PyObject *_wrap_wxWizardPageSimple_SetPrev(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 #define wxWizardPageSimple_SetPrev(_swigobj,_swigarg0)  (_swigobj->SetPrev(_swigarg0))
 static PyObject *_wrap_wxWizardPageSimple_SetPrev(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;


@@ -2088,7 +2032,6 @@ static PyMethodDef wizardcMethods[] = {
         { "wxWizardPageSimple_Chain", (PyCFunction) _wrap_wxWizardPageSimple_Chain, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardPageSimple_SetNext", (PyCFunction) _wrap_wxWizardPageSimple_SetNext, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardPageSimple_SetPrev", (PyCFunction) _wrap_wxWizardPageSimple_SetPrev, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardPageSimple_Chain", (PyCFunction) _wrap_wxWizardPageSimple_Chain, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardPageSimple_SetNext", (PyCFunction) _wrap_wxWizardPageSimple_SetNext, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardPageSimple_SetPrev", (PyCFunction) _wrap_wxWizardPageSimple_SetPrev, METH_VARARGS | METH_KEYWORDS },

-        { "wxWizardPageSimple_Init", (PyCFunction) _wrap_wxWizardPageSimple_Init, METH_VARARGS | METH_KEYWORDS },

         { "wxWizardPageSimple_Create", (PyCFunction) _wrap_wxWizardPageSimple_Create, METH_VARARGS | METH_KEYWORDS },
         { "new_wxPreWizardPageSimple", (PyCFunction) _wrap_new_wxPreWizardPageSimple, METH_VARARGS | METH_KEYWORDS },
         { "new_wxWizardPageSimple", (PyCFunction) _wrap_new_wxWizardPageSimple, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardPageSimple_Create", (PyCFunction) _wrap_wxWizardPageSimple_Create, METH_VARARGS | METH_KEYWORDS },
         { "new_wxPreWizardPageSimple", (PyCFunction) _wrap_new_wxPreWizardPageSimple, METH_VARARGS | METH_KEYWORDS },
         { "new_wxWizardPageSimple", (PyCFunction) _wrap_new_wxWizardPageSimple, METH_VARARGS | METH_KEYWORDS },


@@ -2117,7 +2060,6 @@ static PyMethodDef wizardcMethods[] = {
         { "wxWizardPage_GetBitmap", (PyCFunction) _wrap_wxWizardPage_GetBitmap, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardPage_GetNext", (PyCFunction) _wrap_wxWizardPage_GetNext, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardPage_GetPrev", (PyCFunction) _wrap_wxWizardPage_GetPrev, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardPage_GetBitmap", (PyCFunction) _wrap_wxWizardPage_GetBitmap, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardPage_GetNext", (PyCFunction) _wrap_wxWizardPage_GetNext, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardPage_GetPrev", (PyCFunction) _wrap_wxWizardPage_GetPrev, METH_VARARGS | METH_KEYWORDS },

-        { "wxWizardPage_Init", (PyCFunction) _wrap_wxWizardPage_Init, METH_VARARGS | METH_KEYWORDS },

         { "wxWizardPage_Create", (PyCFunction) _wrap_wxWizardPage_Create, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardEvent_GetPage", (PyCFunction) _wrap_wxWizardEvent_GetPage, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardEvent_GetDirection", (PyCFunction) _wrap_wxWizardEvent_GetDirection, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardPage_Create", (PyCFunction) _wrap_wxWizardPage_Create, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardEvent_GetPage", (PyCFunction) _wrap_wxWizardEvent_GetPage, METH_VARARGS | METH_KEYWORDS },
         { "wxWizardEvent_GetDirection", (PyCFunction) _wrap_wxWizardEvent_GetDirection, METH_VARARGS | METH_KEYWORDS },

diff --git a/wxPython/src/mac/wizard.py b/wxPython/src/mac/wizard.py
index 3891696b44d2204226024e3c3139c4f1419c0dc1..391048f1938a16ec4428d52e7b8de3544beabf6f 100644 (file)
--- a/wxPython/src/mac/wizard.py
+++ b/wxPython/src/mac/wizard.py
@@ -60,9 +60,6 @@ class wxWizardPagePtr(wxPanelPtr):
     def Create(self, *_args, **_kwargs):
         val = apply(wizardc.wxWizardPage_Create,(self,) + _args, _kwargs)
         return val
     def Create(self, *_args, **_kwargs):
         val = apply(wizardc.wxWizardPage_Create,(self,) + _args, _kwargs)
         return val

-    def Init(self, *_args, **_kwargs):
-        val = apply(wizardc.wxWizardPage_Init,(self,) + _args, _kwargs)
-        return val

     def GetPrev(self, *_args, **_kwargs):
         val = apply(wizardc.wxWizardPage_GetPrev,(self,) + _args, _kwargs)
         return val
     def GetPrev(self, *_args, **_kwargs):
         val = apply(wizardc.wxWizardPage_GetPrev,(self,) + _args, _kwargs)
         return val


@@ -174,9 +171,6 @@ class wxWizardPageSimplePtr(wxWizardPagePtr):
     def Create(self, *_args, **_kwargs):
         val = apply(wizardc.wxWizardPageSimple_Create,(self,) + _args, _kwargs)
         return val
     def Create(self, *_args, **_kwargs):
         val = apply(wizardc.wxWizardPageSimple_Create,(self,) + _args, _kwargs)
         return val

-    def Init(self, *_args, **_kwargs):
-        val = apply(wizardc.wxWizardPageSimple_Init,(self,) + _args, _kwargs)
-        return val

     def SetPrev(self, *_args, **_kwargs):
         val = apply(wizardc.wxWizardPageSimple_SetPrev,(self,) + _args, _kwargs)
         return val
     def SetPrev(self, *_args, **_kwargs):
         val = apply(wizardc.wxWizardPageSimple_SetPrev,(self,) + _args, _kwargs)
         return val