X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0220cbc1695d01a55964f31987f2fe78cf212ca1..a92b0cfd2bd0bef75b43c071df0b0e028f360d8e:/wxPython/src/gtk/sizers.cpp diff --git a/wxPython/src/gtk/sizers.cpp b/wxPython/src/gtk/sizers.cpp index 959e7a355e..db5d4d424c 100644 --- a/wxPython/src/gtk/sizers.cpp +++ b/wxPython/src/gtk/sizers.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 *); @@ -57,47 +59,28 @@ extern PyObject *SWIG_newvarlink(void); #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; @@ -135,6 +118,34 @@ static void *SwigwxSizerItemTowxObject(void *ptr) { return (void *) dest; } +#define wxSizerItem_DeleteWindows(_swigobj) (_swigobj->DeleteWindows()) +static PyObject *_wrap_wxSizerItem_DeleteWindows(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_DeleteWindows",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_DeleteWindows. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizerItem_DeleteWindows(_arg0); + + wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxSizerItem_GetPosition(_swigobj) (_swigobj->GetPosition()) static PyObject *_wrap_wxSizerItem_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -565,7 +576,7 @@ static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *self, PyObject *args, PyOb wxPy_END_ALLOW_THREADS; if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +}{ _resultobj = wxPyMake_wxSizer(_result); } return _resultobj; } @@ -854,6 +865,41 @@ static void *SwigwxSizerTowxObject(void *ptr) { return (void *) dest; } +static void wxSizer__setOORInfo(wxSizer *self,PyObject * _self) { + self->SetClientObject(new wxPyClientData(_self)); + } +static PyObject *_wrap_wxSizer__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + PyObject * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","_self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer__setOORInfo",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer__setOORInfo. Expected _wxSizer_p."); + return NULL; + } + } +{ + _arg1 = _obj1; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer__setOORInfo(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void wxSizer_Destroy(wxSizer *self) { delete self; } static PyObject *_wrap_wxSizer_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1786,6 +1832,65 @@ static PyObject *_wrap_wxSizer_SetSizeHints(PyObject *self, PyObject *args, PyOb return _resultobj; } +#define wxSizer_Clear(_swigobj,_swigarg0) (_swigobj->Clear(_swigarg0)) +static PyObject *_wrap_wxSizer_Clear(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + bool _arg1 = (bool ) FALSE; + PyObject * _argo0 = 0; + int tempbool1 = (int) FALSE; + char *_kwnames[] = { "self","delete_windows", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxSizer_Clear",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_Clear. Expected _wxSizer_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_Clear(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizer_DeleteWindows(_swigobj) (_swigobj->DeleteWindows()) +static PyObject *_wrap_wxSizer_DeleteWindows(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizer_DeleteWindows",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_DeleteWindows. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_DeleteWindows(_arg0); + + wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static PyObject * wxSizer_GetChildren(wxSizer *self) { wxList& list = self->GetChildren(); return wxPy_ConvertList(&list, "wxSizerItem"); @@ -2905,6 +3010,8 @@ static PyMethodDef sizerscMethods[] = { { "wxPySizer__setCallbackInfo", (PyCFunction) _wrap_wxPySizer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, { "new_wxPySizer", (PyCFunction) _wrap_new_wxPySizer, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_GetChildren", (PyCFunction) _wrap_wxSizer_GetChildren, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_DeleteWindows", (PyCFunction) _wrap_wxSizer_DeleteWindows, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_Clear", (PyCFunction) _wrap_wxSizer_Clear, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_SetSizeHints", (PyCFunction) _wrap_wxSizer_SetSizeHints, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_Fit", (PyCFunction) _wrap_wxSizer_Fit, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_Layout", (PyCFunction) _wrap_wxSizer_Layout, METH_VARARGS | METH_KEYWORDS }, @@ -2929,6 +3036,7 @@ static PyMethodDef sizerscMethods[] = { { "wxSizer_AddSizer", (PyCFunction) _wrap_wxSizer_AddSizer, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_AddWindow", (PyCFunction) _wrap_wxSizer_AddWindow, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_Destroy", (PyCFunction) _wrap_wxSizer_Destroy, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer__setOORInfo", (PyCFunction) _wrap_wxSizer__setOORInfo, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetUserData", (PyCFunction) _wrap_wxSizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_SetBorder", (PyCFunction) _wrap_wxSizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_SetFlag", (PyCFunction) _wrap_wxSizerItem_SetFlag, METH_VARARGS | METH_KEYWORDS }, @@ -2952,6 +3060,7 @@ static PyMethodDef sizerscMethods[] = { { "wxSizerItem_CalcMin", (PyCFunction) _wrap_wxSizerItem_CalcMin, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetSize", (PyCFunction) _wrap_wxSizerItem_GetSize, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetPosition", (PyCFunction) _wrap_wxSizerItem_GetPosition, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_DeleteWindows", (PyCFunction) _wrap_wxSizerItem_DeleteWindows, METH_VARARGS | METH_KEYWORDS }, { NULL, NULL } }; #ifdef __cplusplus @@ -2974,36 +3083,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, - { "_class_wxSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer}, - { "_class_wxSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer}, - { "_class_wxSizer","_class_wxGridSizer",SwigwxGridSizerTowxSizer}, - { "_class_wxSizer","_wxGridSizer",SwigwxGridSizerTowxSizer}, - { "_class_wxSizer","_class_wxNotebookSizer",SwigwxNotebookSizerTowxSizer}, - { "_class_wxSizer","_wxNotebookSizer",SwigwxNotebookSizerTowxSizer}, - { "_class_wxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer}, - { "_class_wxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer}, - { "_class_wxSizer","_class_wxBoxSizer",SwigwxBoxSizerTowxSizer}, - { "_class_wxSizer","_wxBoxSizer",SwigwxBoxSizerTowxSizer}, - { "_class_wxSizer","_class_wxPySizer",SwigwxPySizerTowxSizer}, - { "_class_wxSizer","_wxPySizer",SwigwxPySizerTowxSizer}, - { "_wxGridSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer}, { "_wxGridSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer}, - { "_class_wxObject","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject}, - { "_class_wxObject","_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject}, - { "_class_wxObject","_class_wxGridSizer",SwigwxGridSizerTowxObject}, - { "_class_wxObject","_wxGridSizer",SwigwxGridSizerTowxObject}, - { "_class_wxObject","_class_wxNotebookSizer",SwigwxNotebookSizerTowxObject}, - { "_class_wxObject","_wxNotebookSizer",SwigwxNotebookSizerTowxObject}, - { "_class_wxObject","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject}, - { "_class_wxObject","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject}, - { "_class_wxObject","_class_wxBoxSizer",SwigwxBoxSizerTowxObject}, - { "_class_wxObject","_wxBoxSizer",SwigwxBoxSizerTowxObject}, - { "_class_wxObject","_class_wxPySizer",SwigwxPySizerTowxObject}, - { "_class_wxObject","_wxPySizer",SwigwxPySizerTowxObject}, - { "_class_wxObject","_class_wxSizer",SwigwxSizerTowxObject}, - { "_class_wxObject","_wxSizer",SwigwxSizerTowxObject}, - { "_class_wxObject","_class_wxSizerItem",SwigwxSizerItemTowxObject}, - { "_class_wxObject","_wxSizerItem",SwigwxSizerItemTowxObject}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -3019,7 +3099,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_int",0}, { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, - { "_wxBoxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer}, { "_wxBoxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer}, { "_char","_wxChar",0}, { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, @@ -3040,24 +3119,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_WXTYPE","_unsigned_short",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, - { "_wxObject","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject}, { "_wxObject","_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject}, - { "_wxObject","_class_wxGridSizer",SwigwxGridSizerTowxObject}, { "_wxObject","_wxGridSizer",SwigwxGridSizerTowxObject}, - { "_wxObject","_class_wxNotebookSizer",SwigwxNotebookSizerTowxObject}, { "_wxObject","_wxNotebookSizer",SwigwxNotebookSizerTowxObject}, - { "_wxObject","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject}, { "_wxObject","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject}, - { "_wxObject","_class_wxBoxSizer",SwigwxBoxSizerTowxObject}, { "_wxObject","_wxBoxSizer",SwigwxBoxSizerTowxObject}, - { "_wxObject","_class_wxPySizer",SwigwxPySizerTowxObject}, { "_wxObject","_wxPySizer",SwigwxPySizerTowxObject}, - { "_wxObject","_class_wxSizer",SwigwxSizerTowxObject}, { "_wxObject","_wxSizer",SwigwxSizerTowxObject}, - { "_wxObject","_class_wxSizerItem",SwigwxSizerItemTowxObject}, { "_wxObject","_wxSizerItem",SwigwxSizerItemTowxObject}, - { "_class_wxBoxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer}, - { "_class_wxBoxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, { "_unsigned_char","_byte",0}, @@ -3071,8 +3140,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_short","_WXTYPE",0}, { "_short","_unsigned_short",0}, { "_short","_signed_short",0}, - { "_class_wxGridSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer}, - { "_class_wxGridSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, { "_wxWindowID","_time_t",0}, @@ -3107,17 +3174,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, - { "_wxSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer}, { "_wxSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer}, - { "_wxSizer","_class_wxGridSizer",SwigwxGridSizerTowxSizer}, { "_wxSizer","_wxGridSizer",SwigwxGridSizerTowxSizer}, - { "_wxSizer","_class_wxNotebookSizer",SwigwxNotebookSizerTowxSizer}, { "_wxSizer","_wxNotebookSizer",SwigwxNotebookSizerTowxSizer}, - { "_wxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer}, { "_wxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer}, - { "_wxSizer","_class_wxBoxSizer",SwigwxBoxSizerTowxSizer}, { "_wxSizer","_wxBoxSizer",SwigwxBoxSizerTowxSizer}, - { "_wxSizer","_class_wxPySizer",SwigwxPySizerTowxSizer}, { "_wxSizer","_wxPySizer",SwigwxPySizerTowxSizer}, {0,0,0}};