X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c09ae547a6aa18ed0442a7b805708408c744f43..442d08ce743780b40895848a7d07c083e327aa2f:/wxPython/src/gtk/windows2.cpp diff --git a/wxPython/src/gtk/windows2.cpp b/wxPython/src/gtk/windows2.cpp index f2d2b74483..848de6989a 100644 --- a/wxPython/src/gtk/windows2.cpp +++ b/wxPython/src/gtk/windows2.cpp @@ -61,6 +61,7 @@ extern PyObject *SWIG_newvarlink(void); #endif #include #include +#include #ifdef __WXMSW__ #include #endif @@ -111,7 +112,11 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } -static char* wxStringErrorMsg = "string type is required for parameter"; +#if PYTHON_API_VERSION >= 1009 + static char* wxStringErrorMsg = "String or Unicode type required"; +#else + static char* wxStringErrorMsg = "string type is required for parameter"; +#endif #ifdef __cplusplus extern "C" { #endif @@ -139,6 +144,14 @@ static void *SwigwxNotebookEventTowxEvent(void *ptr) { return (void *) dest; } +static void *SwigwxNotebookEventTowxObject(void *ptr) { + wxNotebookEvent *src; + wxObject *dest; + src = (wxNotebookEvent *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define wxNotebookEvent_GetSelection(_swigobj) (_swigobj->GetSelection()) static PyObject *_wrap_wxNotebookEvent_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -273,6 +286,14 @@ static void *SwigwxNotebookTowxEvtHandler(void *ptr) { return (void *) dest; } +static void *SwigwxNotebookTowxObject(void *ptr) { + wxNotebook *src; + wxObject *dest; + src = (wxNotebook *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define new_wxNotebook(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxNotebook(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -465,7 +486,7 @@ static PyObject *_wrap_wxNotebook_SetPageText(PyObject *self, PyObject *args, Py #if PYTHON_API_VERSION >= 1009 char* tmpPtr; int tmpSize; if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) { - PyErr_SetString(PyExc_TypeError, "String or Unicode type required"); + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); return NULL; } if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1) @@ -568,7 +589,6 @@ static PyObject *_wrap_wxNotebook_GetImageList(PyObject *self, PyObject *args, P wxNotebook * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetImageList",_kwnames,&_argo0)) @@ -585,13 +605,7 @@ static PyObject *_wrap_wxNotebook_GetImageList(PyObject *self, PyObject *args, P _result = (wxImageList *)wxNotebook_GetImageList(_arg0); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -867,7 +881,7 @@ static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args, PyObje #if PYTHON_API_VERSION >= 1009 char* tmpPtr; int tmpSize; if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) { - PyErr_SetString(PyExc_TypeError, "String or Unicode type required"); + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); return NULL; } if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1) @@ -931,7 +945,7 @@ static PyObject *_wrap_wxNotebook_InsertPage(PyObject *self, PyObject *args, PyO #if PYTHON_API_VERSION >= 1009 char* tmpPtr; int tmpSize; if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) { - PyErr_SetString(PyExc_TypeError, "String or Unicode type required"); + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); return NULL; } if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1) @@ -967,7 +981,6 @@ static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args, PyObje int _arg1; PyObject * _argo0 = 0; char *_kwnames[] = { "self","nPage", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPage",_kwnames,&_argo0,&_arg1)) @@ -984,13 +997,7 @@ static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args, PyObje _result = (wxWindow *)wxNotebook_GetPage(_arg0,_arg1); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -1040,6 +1047,14 @@ static void *SwigwxSplitterEventTowxEvent(void *ptr) { return (void *) dest; } +static void *SwigwxSplitterEventTowxObject(void *ptr) { + wxSplitterEvent *src; + wxObject *dest; + src = (wxSplitterEvent *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define wxSplitterEvent_GetSashPosition(_swigobj) (_swigobj->GetSashPosition()) static PyObject *_wrap_wxSplitterEvent_GetSashPosition(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1128,7 +1143,6 @@ static PyObject *_wrap_wxSplitterEvent_GetWindowBeingRemoved(PyObject *self, PyO wxSplitterEvent * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterEvent_GetWindowBeingRemoved",_kwnames,&_argo0)) @@ -1145,13 +1159,7 @@ static PyObject *_wrap_wxSplitterEvent_GetWindowBeingRemoved(PyObject *self, PyO _result = (wxWindow *)wxSplitterEvent_GetWindowBeingRemoved(_arg0); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -1199,6 +1207,14 @@ static void *SwigwxSplitterWindowTowxEvtHandler(void *ptr) { return (void *) dest; } +static void *SwigwxSplitterWindowTowxObject(void *ptr) { + wxSplitterWindow *src; + wxObject *dest; + src = (wxSplitterWindow *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define new_wxSplitterWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSplitterWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1396,7 +1412,6 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow1(PyObject *self, PyObject *arg wxSplitterWindow * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterWindow_GetWindow1",_kwnames,&_argo0)) @@ -1413,13 +1428,7 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow1(PyObject *self, PyObject *arg _result = (wxWindow *)wxSplitterWindow_GetWindow1(_arg0); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -1430,7 +1439,6 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow2(PyObject *self, PyObject *arg wxSplitterWindow * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterWindow_GetWindow2",_kwnames,&_argo0)) @@ -1447,13 +1455,7 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow2(PyObject *self, PyObject *arg _result = (wxWindow *)wxSplitterWindow_GetWindow2(_arg0); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -1951,8 +1953,18 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, { "_class_wxClipboard","_wxClipboard",0}, { "_class_wxGauge","_wxGauge",0}, + { "_wxGDIObject","_class_wxGDIObject",0}, { "_wxDC","_class_wxDC",0}, { "_class_wxBitmapDataObject","_wxBitmapDataObject",0}, + { "_class_wxObject","_class_wxSplitterWindow",SwigwxSplitterWindowTowxObject}, + { "_class_wxObject","_wxSplitterWindow",SwigwxSplitterWindowTowxObject}, + { "_class_wxObject","_class_wxSplitterEvent",SwigwxSplitterEventTowxObject}, + { "_class_wxObject","_wxSplitterEvent",SwigwxSplitterEventTowxObject}, + { "_class_wxObject","_class_wxNotebook",SwigwxNotebookTowxObject}, + { "_class_wxObject","_wxNotebook",SwigwxNotebookTowxObject}, + { "_class_wxObject","_class_wxNotebookEvent",SwigwxNotebookEventTowxObject}, + { "_class_wxObject","_wxNotebookEvent",SwigwxNotebookEventTowxObject}, + { "_class_wxObject","_wxObject",0}, { "_wxSpinEvent","_class_wxSpinEvent",0}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, @@ -1984,6 +1996,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxDataObject","_wxDataObject",0}, { "_wxStaticLine","_class_wxStaticLine",0}, { "_wxBrush","_class_wxBrush",0}, + { "_wxToggleButton","_class_wxToggleButton",0}, { "_class_wxNotebookEvent","_wxNotebookEvent",0}, { "_wxDataFormat","_class_wxDataFormat",0}, { "_class_wxDataObjectSimple","_wxDataObjectSimple",0}, @@ -2103,6 +2116,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0}, { "_wxClientDC","_class_wxClientDC",0}, { "_wxMouseEvent","_class_wxMouseEvent",0}, + { "_wxObject","_class_wxSplitterWindow",SwigwxSplitterWindowTowxObject}, + { "_wxObject","_wxSplitterWindow",SwigwxSplitterWindowTowxObject}, + { "_wxObject","_class_wxSplitterEvent",SwigwxSplitterEventTowxObject}, + { "_wxObject","_wxSplitterEvent",SwigwxSplitterEventTowxObject}, + { "_wxObject","_class_wxNotebook",SwigwxNotebookTowxObject}, + { "_wxObject","_wxNotebook",SwigwxNotebookTowxObject}, + { "_wxObject","_class_wxNotebookEvent",SwigwxNotebookEventTowxObject}, + { "_wxObject","_wxNotebookEvent",SwigwxNotebookEventTowxObject}, + { "_wxObject","_class_wxObject",0}, { "_class_wxPoint","_wxPoint",0}, { "_wxRealPoint","_class_wxRealPoint",0}, { "_class_wxRadioBox","_wxRadioBox",0}, @@ -2158,6 +2180,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowID","_int",0}, { "_wxWindowID","_signed_int",0}, { "_wxWindowID","_unsigned_int",0}, + { "_class_wxGDIObject","_wxGDIObject",0}, { "_class_wxScrollWinEvent","_wxScrollWinEvent",0}, { "_int","_wxCoord",0}, { "_int","_wxPrintQuality",0}, @@ -2214,6 +2237,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxEraseEvent","_class_wxEraseEvent",0}, { "_wxDataObjectComposite","_class_wxDataObjectComposite",0}, { "_class_wxJoystickEvent","_wxJoystickEvent",0}, + { "_class_wxToggleButton","_wxToggleButton",0}, { "_wxRegion","_class_wxRegion",0}, { "_class_wxSplitterWindow","_wxSplitterWindow",0}, { "_class_wxShowEvent","_wxShowEvent",0},