X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0220cbc1695d01a55964f31987f2fe78cf212ca1..673ad11240bf326b7f74e2835ddaf7dc41a0813c:/wxPython/src/gtk/frames.cpp diff --git a/wxPython/src/gtk/frames.cpp b/wxPython/src/gtk/frames.cpp index b95c3bd079..e54e6a94cf 100644 --- a/wxPython/src/gtk/frames.cpp +++ b/wxPython/src/gtk/frames.cpp @@ -27,19 +27,21 @@ # define SWIGEXPORT(a) __declspec(dllexport) a # else # if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export +# define SWIGEXPORT(a) a _export # else -# define SWIGEXPORT(a) a +# define SWIGEXPORT(a) a # endif # endif #else -# define SWIGEXPORT(a) a +# define SWIGEXPORT(a) a #endif +#include "Python.h" + #ifdef __cplusplus extern "C" { #endif -#include "Python.h" + extern void SWIG_MakePtr(char *, void *, char *); extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *)); extern char *SWIG_GetPtr(char *, void **, char *); @@ -55,49 +57,29 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include -#include -static PyObject* l_output_helper(PyObject* target, PyObject* o) { - PyObject* o2; - if (!target) { - target = o; - } else if (target == Py_None) { - Py_DECREF(Py_None); - target = o; - } else { - if (!PyList_Check(target)) { - o2 = target; - target = PyList_New(0); - PyList_Append(target, o2); - Py_XDECREF(o2); - } - PyList_Append(target,o); - Py_XDECREF(o); - } - return target; -} static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyTuple_Check(target)) { o2 = target; target = PyTuple_New(1); PyTuple_SetItem(target, 0, o2); } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, o); o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); + target = PySequence_Concat(o2, o3); + Py_DECREF(o2); Py_DECREF(o3); } return target; @@ -490,18 +472,12 @@ static PyObject *_wrap_wxTopLevelWindow_GetIcon(PyObject *self, PyObject *args, } { wxPy_BEGIN_ALLOW_THREADS; - const wxIcon & _result_ref = wxTopLevelWindow_GetIcon(_arg0); - _result = (wxIcon *) &_result_ref; + _result = new wxIcon (wxTopLevelWindow_GetIcon(_arg0)); wxPy_END_ALLOW_THREADS; if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxIcon_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxIcon_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } @@ -1821,7 +1797,7 @@ static PyObject *_wrap_wxDialog_CreateTextSizer(PyObject *self, PyObject *args, wxPy_END_ALLOW_THREADS; if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +}{ _resultobj = wxPyMake_wxSizer(_result); } { if (_obj1) delete _arg1; @@ -1854,7 +1830,7 @@ static PyObject *_wrap_wxDialog_CreateButtonSizer(PyObject *self, PyObject *args wxPy_END_ALLOW_THREADS; if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +}{ _resultobj = wxPyMake_wxSizer(_result); } return _resultobj; } @@ -2086,108 +2062,7 @@ static PyObject *_wrap_wxMiniFrame_Create(PyObject *self, PyObject *args, PyObje return _resultobj; } -static void *SwigwxTipWindowTowxFrame(void *ptr) { - wxTipWindow *src; - wxFrame *dest; - src = (wxTipWindow *) ptr; - dest = (wxFrame *) src; - return (void *) dest; -} - -static void *SwigwxTipWindowTowxTopLevelWindow(void *ptr) { - wxTipWindow *src; - wxTopLevelWindow *dest; - src = (wxTipWindow *) ptr; - dest = (wxTopLevelWindow *) src; - return (void *) dest; -} - -static void *SwigwxTipWindowTowxWindow(void *ptr) { - wxTipWindow *src; - wxWindow *dest; - src = (wxTipWindow *) ptr; - dest = (wxWindow *) src; - return (void *) dest; -} - -static void *SwigwxTipWindowTowxEvtHandler(void *ptr) { - wxTipWindow *src; - wxEvtHandler *dest; - src = (wxTipWindow *) ptr; - dest = (wxEvtHandler *) src; - return (void *) dest; -} - -static void *SwigwxTipWindowTowxObject(void *ptr) { - wxTipWindow *src; - wxObject *dest; - src = (wxTipWindow *) ptr; - dest = (wxObject *) src; - return (void *) dest; -} - -#define new_wxTipWindow(_swigarg0,_swigarg1,_swigarg2) (new wxTipWindow(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_new_wxTipWindow(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxTipWindow * _result; - wxWindow * _arg0; - wxString * _arg1; - wxCoord _arg2 = (wxCoord ) 100; - PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "parent","text","maxLength", NULL }; - char _ptemp[128]; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:new_wxTipWindow",_kwnames,&_argo0,&_obj1,&_arg2)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxTipWindow. Expected _wxWindow_p."); - return NULL; - } - } -{ -#if PYTHON_API_VERSION >= 1009 - char* tmpPtr; int tmpSize; - if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1) - return NULL; - _arg1 = new wxString(tmpPtr, tmpSize); -#else - if (!PyString_Check(_obj1)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1)); -#endif -} -{ - wxPy_BEGIN_ALLOW_THREADS; - _result = (wxTipWindow *)new_wxTipWindow(_arg0,*_arg1,_arg2); - - wxPy_END_ALLOW_THREADS; - if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxTipWindow_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } -{ - if (_obj1) - delete _arg1; -} - return _resultobj; -} - static PyMethodDef framescMethods[] = { - { "new_wxTipWindow", (PyCFunction) _wrap_new_wxTipWindow, METH_VARARGS | METH_KEYWORDS }, { "wxMiniFrame_Create", (PyCFunction) _wrap_wxMiniFrame_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPreMiniFrame", (PyCFunction) _wrap_new_wxPreMiniFrame, METH_VARARGS | METH_KEYWORDS }, { "new_wxMiniFrame", (PyCFunction) _wrap_new_wxMiniFrame, METH_VARARGS | METH_KEYWORDS }, @@ -2252,29 +2127,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, - { "_class_wxEvtHandler","_class_wxTipWindow",SwigwxTipWindowTowxEvtHandler}, - { "_class_wxEvtHandler","_wxTipWindow",SwigwxTipWindowTowxEvtHandler}, - { "_class_wxEvtHandler","_class_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler}, - { "_class_wxEvtHandler","_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler}, - { "_class_wxEvtHandler","_class_wxDialog",SwigwxDialogTowxEvtHandler}, - { "_class_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler}, - { "_class_wxEvtHandler","_class_wxFrame",SwigwxFrameTowxEvtHandler}, - { "_class_wxEvtHandler","_wxFrame",SwigwxFrameTowxEvtHandler}, - { "_class_wxEvtHandler","_class_wxTopLevelWindow",SwigwxTopLevelWindowTowxEvtHandler}, - { "_class_wxEvtHandler","_wxTopLevelWindow",SwigwxTopLevelWindowTowxEvtHandler}, { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, - { "_class_wxObject","_class_wxTipWindow",SwigwxTipWindowTowxObject}, - { "_class_wxObject","_wxTipWindow",SwigwxTipWindowTowxObject}, - { "_class_wxObject","_class_wxMiniFrame",SwigwxMiniFrameTowxObject}, - { "_class_wxObject","_wxMiniFrame",SwigwxMiniFrameTowxObject}, - { "_class_wxObject","_class_wxDialog",SwigwxDialogTowxObject}, - { "_class_wxObject","_wxDialog",SwigwxDialogTowxObject}, - { "_class_wxObject","_class_wxFrame",SwigwxFrameTowxObject}, - { "_class_wxObject","_wxFrame",SwigwxFrameTowxObject}, - { "_class_wxObject","_class_wxTopLevelWindow",SwigwxTopLevelWindowTowxObject}, - { "_class_wxObject","_wxTopLevelWindow",SwigwxTopLevelWindowTowxObject}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -2282,13 +2137,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, - { "_wxTopLevelWindow","_class_wxTipWindow",SwigwxTipWindowTowxTopLevelWindow}, - { "_wxTopLevelWindow","_wxTipWindow",SwigwxTipWindowTowxTopLevelWindow}, - { "_wxTopLevelWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxTopLevelWindow}, { "_wxTopLevelWindow","_wxMiniFrame",SwigwxMiniFrameTowxTopLevelWindow}, - { "_wxTopLevelWindow","_class_wxDialog",SwigwxDialogTowxTopLevelWindow}, { "_wxTopLevelWindow","_wxDialog",SwigwxDialogTowxTopLevelWindow}, - { "_wxTopLevelWindow","_class_wxFrame",SwigwxFrameTowxTopLevelWindow}, { "_wxTopLevelWindow","_wxFrame",SwigwxFrameTowxTopLevelWindow}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, @@ -2312,38 +2162,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_signed_int","_EBool",0}, { "_signed_int","_wxWindowID",0}, { "_signed_int","_int",0}, - { "_class_wxTopLevelWindow","_class_wxTipWindow",SwigwxTipWindowTowxTopLevelWindow}, - { "_class_wxTopLevelWindow","_wxTipWindow",SwigwxTipWindowTowxTopLevelWindow}, - { "_class_wxTopLevelWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxTopLevelWindow}, - { "_class_wxTopLevelWindow","_wxMiniFrame",SwigwxMiniFrameTowxTopLevelWindow}, - { "_class_wxTopLevelWindow","_class_wxDialog",SwigwxDialogTowxTopLevelWindow}, - { "_class_wxTopLevelWindow","_wxDialog",SwigwxDialogTowxTopLevelWindow}, - { "_class_wxTopLevelWindow","_class_wxFrame",SwigwxFrameTowxTopLevelWindow}, - { "_class_wxTopLevelWindow","_wxFrame",SwigwxFrameTowxTopLevelWindow}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, - { "_class_wxWindow","_class_wxTipWindow",SwigwxTipWindowTowxWindow}, - { "_class_wxWindow","_wxTipWindow",SwigwxTipWindowTowxWindow}, - { "_class_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow}, - { "_class_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow}, - { "_class_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow}, - { "_class_wxWindow","_wxDialog",SwigwxDialogTowxWindow}, - { "_class_wxWindow","_class_wxFrame",SwigwxFrameTowxWindow}, - { "_class_wxWindow","_wxFrame",SwigwxFrameTowxWindow}, - { "_class_wxWindow","_class_wxTopLevelWindow",SwigwxTopLevelWindowTowxWindow}, - { "_class_wxWindow","_wxTopLevelWindow",SwigwxTopLevelWindowTowxWindow}, - { "_wxObject","_class_wxTipWindow",SwigwxTipWindowTowxObject}, - { "_wxObject","_wxTipWindow",SwigwxTipWindowTowxObject}, - { "_wxObject","_class_wxMiniFrame",SwigwxMiniFrameTowxObject}, { "_wxObject","_wxMiniFrame",SwigwxMiniFrameTowxObject}, - { "_wxObject","_class_wxDialog",SwigwxDialogTowxObject}, { "_wxObject","_wxDialog",SwigwxDialogTowxObject}, - { "_wxObject","_class_wxFrame",SwigwxFrameTowxObject}, { "_wxObject","_wxFrame",SwigwxFrameTowxObject}, - { "_wxObject","_class_wxTopLevelWindow",SwigwxTopLevelWindowTowxObject}, { "_wxObject","_wxTopLevelWindow",SwigwxTopLevelWindowTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, @@ -2358,9 +2184,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_short","_WXTYPE",0}, { "_short","_unsigned_short",0}, { "_short","_signed_short",0}, - { "_wxFrame","_class_wxTipWindow",SwigwxTipWindowTowxFrame}, - { "_wxFrame","_wxTipWindow",SwigwxTipWindowTowxFrame}, - { "_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame}, { "_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, @@ -2396,30 +2219,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, - { "_wxEvtHandler","_class_wxTipWindow",SwigwxTipWindowTowxEvtHandler}, - { "_wxEvtHandler","_wxTipWindow",SwigwxTipWindowTowxEvtHandler}, - { "_wxEvtHandler","_class_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler}, { "_wxEvtHandler","_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler}, - { "_wxEvtHandler","_class_wxDialog",SwigwxDialogTowxEvtHandler}, { "_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler}, - { "_wxEvtHandler","_class_wxFrame",SwigwxFrameTowxEvtHandler}, { "_wxEvtHandler","_wxFrame",SwigwxFrameTowxEvtHandler}, - { "_wxEvtHandler","_class_wxTopLevelWindow",SwigwxTopLevelWindowTowxEvtHandler}, { "_wxEvtHandler","_wxTopLevelWindow",SwigwxTopLevelWindowTowxEvtHandler}, - { "_wxWindow","_class_wxTipWindow",SwigwxTipWindowTowxWindow}, - { "_wxWindow","_wxTipWindow",SwigwxTipWindowTowxWindow}, - { "_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow}, { "_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow}, - { "_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow}, { "_wxWindow","_wxDialog",SwigwxDialogTowxWindow}, - { "_wxWindow","_class_wxFrame",SwigwxFrameTowxWindow}, { "_wxWindow","_wxFrame",SwigwxFrameTowxWindow}, - { "_wxWindow","_class_wxTopLevelWindow",SwigwxTopLevelWindowTowxWindow}, { "_wxWindow","_wxTopLevelWindow",SwigwxTopLevelWindowTowxWindow}, - { "_class_wxFrame","_class_wxTipWindow",SwigwxTipWindowTowxFrame}, - { "_class_wxFrame","_wxTipWindow",SwigwxTipWindowTowxFrame}, - { "_class_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame}, - { "_class_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame}, {0,0,0}}; static PyObject *SWIG_globals;