From 49218ee6c94967e01555eac93558f52b106fa056 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 22 Aug 2002 00:04:36 +0000 Subject: [PATCH] SWIGged updates for wxMac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/mac/grid.cpp | 2 +- wxPython/src/mac/wizard.cpp | 39 +++++++------------------------------ wxPython/src/mac/wizard.py | 4 ---- 3 files changed, 8 insertions(+), 37 deletions(-) diff --git a/wxPython/src/mac/grid.cpp b/wxPython/src/mac/grid.cpp index 0735fca03e..58fd1002b2 100644 --- a/wxPython/src/mac/grid.cpp +++ b/wxPython/src/mac/grid.cpp @@ -425,7 +425,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) void CBNAME(int a, const wxString& c) { \ bool found; \ wxPyBeginBlockThreads(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* s = wx2PyString(c); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s)); \ Py_DECREF(s); \ diff --git a/wxPython/src/mac/wizard.cpp b/wxPython/src/mac/wizard.cpp index 089b6dd134..c98202a997 100644 --- a/wxPython/src/mac/wizard.cpp +++ b/wxPython/src/mac/wizard.cpp @@ -266,7 +266,6 @@ static PyObject *_wrap_wxWizardEvent_GetPage(PyObject *self, PyObject *args, PyO wxWizardEvent * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWizardEvent_GetPage",_kwnames,&_argo0)) @@ -284,13 +283,7 @@ static PyObject *_wrap_wxWizardEvent_GetPage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxWizardPage_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -408,7 +401,6 @@ static PyObject *_wrap_wxWizardPage_GetPrev(PyObject *self, PyObject *args, PyOb wxWizardPage * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWizardPage_GetPrev",_kwnames,&_argo0)) @@ -426,13 +418,7 @@ static PyObject *_wrap_wxWizardPage_GetPrev(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxWizardPage_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -443,7 +429,6 @@ static PyObject *_wrap_wxWizardPage_GetNext(PyObject *self, PyObject *args, PyOb wxWizardPage * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWizardPage_GetNext",_kwnames,&_argo0)) @@ -461,13 +446,7 @@ static PyObject *_wrap_wxWizardPage_GetNext(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxWizardPage_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -1902,7 +1881,6 @@ static PyObject *_wrap_wxWizard_GetCurrentPage(PyObject *self, PyObject *args, P wxWizard * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWizard_GetCurrentPage",_kwnames,&_argo0)) @@ -1920,13 +1898,7 @@ static PyObject *_wrap_wxWizard_GetCurrentPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxWizardPage_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -2292,6 +2264,9 @@ SWIGEXPORT(void) initwizardc() { PyDict_SetItemString(d,"wxEVT_WIZARD_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_WIZARD_PAGE_CHANGING)); PyDict_SetItemString(d,"wxEVT_WIZARD_CANCEL", PyInt_FromLong((long) wxEVT_WIZARD_CANCEL)); PyDict_SetItemString(d,"wxEVT_WIZARD_HELP", PyInt_FromLong((long) wxEVT_WIZARD_HELP)); + + wxClassInfo::CleanUpClasses(); + wxClassInfo::InitializeClasses(); { int i; for (i = 0; _swig_mapping[i].n1; i++) diff --git a/wxPython/src/mac/wizard.py b/wxPython/src/mac/wizard.py index 959bc00345..3891696b44 100644 --- a/wxPython/src/mac/wizard.py +++ b/wxPython/src/mac/wizard.py @@ -42,7 +42,6 @@ class wxWizardEventPtr(wxNotifyEventPtr): return val def GetPage(self, *_args, **_kwargs): val = apply(wizardc.wxWizardEvent_GetPage,(self,) + _args, _kwargs) - if val: val = wxWizardPagePtr(val) return val def __repr__(self): return "" % (self.this,) @@ -66,11 +65,9 @@ class wxWizardPagePtr(wxPanelPtr): return val def GetPrev(self, *_args, **_kwargs): val = apply(wizardc.wxWizardPage_GetPrev,(self,) + _args, _kwargs) - if val: val = wxWizardPagePtr(val) return val def GetNext(self, *_args, **_kwargs): val = apply(wizardc.wxWizardPage_GetNext,(self,) + _args, _kwargs) - if val: val = wxWizardPagePtr(val) return val def GetBitmap(self, *_args, **_kwargs): val = apply(wizardc.wxWizardPage_GetBitmap,(self,) + _args, _kwargs) @@ -218,7 +215,6 @@ class wxWizardPtr(wxDialogPtr): return val def GetCurrentPage(self, *_args, **_kwargs): val = apply(wizardc.wxWizard_GetCurrentPage,(self,) + _args, _kwargs) - if val: val = wxWizardPagePtr(val) return val def SetPageSize(self, *_args, **_kwargs): val = apply(wizardc.wxWizard_SetPageSize,(self,) + _args, _kwargs) -- 2.45.2