From 6f8b147bf61c22b27d722a8dc44c776c547158a1 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 19 Apr 2003 20:30:56 +0000 Subject: [PATCH] SWIGged updats for wxGTK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/html.cpp | 23 +++++++------ wxPython/src/gtk/windows.cpp | 67 ------------------------------------ wxPython/src/gtk/windows.py | 6 ---- 3 files changed, 13 insertions(+), 83 deletions(-) diff --git a/wxPython/src/gtk/html.cpp b/wxPython/src/gtk/html.cpp index 8280e57f85..fdac3a2069 100644 --- a/wxPython/src/gtk/html.cpp +++ b/wxPython/src/gtk/html.cpp @@ -3231,11 +3231,12 @@ static PyObject *_wrap_wxHtmlCell_AdjustPagebreak(PyObject *self, PyObject *args wxHtmlCell * _arg0; int * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","pagebreak", NULL }; + int temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","INOUT", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_AdjustPagebreak",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_AdjustPagebreak",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3244,13 +3245,10 @@ static PyObject *_wrap_wxHtmlCell_AdjustPagebreak(PyObject *self, PyObject *args return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_int_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_AdjustPagebreak. Expected _int_p."); - return NULL; - } - } +{ + temp = (int) PyInt_AsLong(_obj1); + _arg1 = &temp; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (bool )wxHtmlCell_AdjustPagebreak(_arg0,_arg1); @@ -3258,6 +3256,11 @@ static PyObject *_wrap_wxHtmlCell_AdjustPagebreak(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} return _resultobj; } diff --git a/wxPython/src/gtk/windows.cpp b/wxPython/src/gtk/windows.cpp index cc88263b6f..be97b5e797 100644 --- a/wxPython/src/gtk/windows.cpp +++ b/wxPython/src/gtk/windows.cpp @@ -9649,71 +9649,6 @@ static PyObject *_wrap_wxMenu_IsAttached(PyObject *self, PyObject *args, PyObjec return _resultobj; } -#define wxMenu_Attach(_swigobj,_swigarg0) (_swigobj->Attach(_swigarg0)) -static PyObject *_wrap_wxMenu_Attach(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxMenu * _arg0; - wxMenuBar * _arg1; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","menubar", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenu_Attach",_kwnames,&_argo0,&_argo1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Attach. Expected _wxMenu_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenuBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenu_Attach. Expected _wxMenuBar_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxMenu_Attach(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxMenu_Detach(_swigobj) (_swigobj->Detach()) -static PyObject *_wrap_wxMenu_Detach(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxMenu * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenu_Detach",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Detach. Expected _wxMenu_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxMenu_Detach(_arg0); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - #define wxMenu_SetParent(_swigobj,_swigarg0) (_swigobj->SetParent(_swigarg0)) static PyObject *_wrap_wxMenu_SetParent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -11532,8 +11467,6 @@ static PyMethodDef windowscMethods[] = { { "new_wxMenuBar", (PyCFunction) _wrap_new_wxMenuBar, METH_VARARGS | METH_KEYWORDS }, { "wxMenu_GetParent", (PyCFunction) _wrap_wxMenu_GetParent, METH_VARARGS | METH_KEYWORDS }, { "wxMenu_SetParent", (PyCFunction) _wrap_wxMenu_SetParent, METH_VARARGS | METH_KEYWORDS }, - { "wxMenu_Detach", (PyCFunction) _wrap_wxMenu_Detach, METH_VARARGS | METH_KEYWORDS }, - { "wxMenu_Attach", (PyCFunction) _wrap_wxMenu_Attach, METH_VARARGS | METH_KEYWORDS }, { "wxMenu_IsAttached", (PyCFunction) _wrap_wxMenu_IsAttached, METH_VARARGS | METH_KEYWORDS }, { "wxMenu_GetStyle", (PyCFunction) _wrap_wxMenu_GetStyle, METH_VARARGS | METH_KEYWORDS }, { "wxMenu_GetInvokingWindow", (PyCFunction) _wrap_wxMenu_GetInvokingWindow, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/gtk/windows.py b/wxPython/src/gtk/windows.py index 60e9e03a50..549216dc18 100644 --- a/wxPython/src/gtk/windows.py +++ b/wxPython/src/gtk/windows.py @@ -946,12 +946,6 @@ class wxMenuPtr(wxEvtHandlerPtr): def IsAttached(self, *_args, **_kwargs): val = windowsc.wxMenu_IsAttached(self, *_args, **_kwargs) return val - def Attach(self, *_args, **_kwargs): - val = windowsc.wxMenu_Attach(self, *_args, **_kwargs) - return val - def Detach(self, *_args, **_kwargs): - val = windowsc.wxMenu_Detach(self, *_args, **_kwargs) - return val def SetParent(self, *_args, **_kwargs): val = windowsc.wxMenu_SetParent(self, *_args, **_kwargs) return val