reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-11-13 03:24:21 +00:00
parent a68b8331cb
commit 070c48b4c0
17 changed files with 1718 additions and 660 deletions

View File

@@ -1848,7 +1848,7 @@ void wxSizer__setOORInfo(wxSizer *self,PyObject *_self){
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){
wxSizerItem *wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){
wxPyUserData* data = NULL;
bool blocked = wxPyBeginBlockThreads();
@@ -1859,14 +1859,16 @@ void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border
// Now call the real Add method if a valid item type was found
if ( info.window )
self->Add(info.window, proportion, flag, border, data);
return self->Add(info.window, proportion, flag, border, data);
else if ( info.sizer )
self->Add(info.sizer, proportion, flag, border, data);
return self->Add(info.sizer, proportion, flag, border, data);
else if (info.gotSize)
self->Add(info.size.GetWidth(), info.size.GetHeight(),
proportion, flag, border, data);
return self->Add(info.size.GetWidth(), info.size.GetHeight(),
proportion, flag, border, data);
else
return NULL;
}
void wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion,int flag,int border,PyObject *userData){
wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion,int flag,int border,PyObject *userData){
wxPyUserData* data = NULL;
bool blocked = wxPyBeginBlockThreads();
@@ -1877,14 +1879,16 @@ void wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion,int f
// Now call the real Insert method if a valid item type was found
if ( info.window )
self->Insert(before, info.window, proportion, flag, border, data);
return self->Insert(before, info.window, proportion, flag, border, data);
else if ( info.sizer )
self->Insert(before, info.sizer, proportion, flag, border, data);
return self->Insert(before, info.sizer, proportion, flag, border, data);
else if (info.gotSize)
self->Insert(before, info.size.GetWidth(), info.size.GetHeight(),
proportion, flag, border, data);
return self->Insert(before, info.size.GetWidth(), info.size.GetHeight(),
proportion, flag, border, data);
else
return NULL;
}
void wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){
wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){
wxPyUserData* data = NULL;
bool blocked = wxPyBeginBlockThreads();
@@ -1895,12 +1899,14 @@ void wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion,int flag,int bo
// Now call the real Prepend method if a valid item type was found
if ( info.window )
self->Prepend(info.window, proportion, flag, border, data);
return self->Prepend(info.window, proportion, flag, border, data);
else if ( info.sizer )
self->Prepend(info.sizer, proportion, flag, border, data);
return self->Prepend(info.sizer, proportion, flag, border, data);
else if (info.gotSize)
self->Prepend(info.size.GetWidth(), info.size.GetHeight(),
proportion, flag, border, data);
return self->Prepend(info.size.GetWidth(), info.size.GetHeight(),
proportion, flag, border, data);
else
return NULL;
}
bool wxSizer_Remove(wxSizer *self,PyObject *item){
bool blocked = wxPyBeginBlockThreads();
@@ -1928,6 +1934,19 @@ bool wxSizer_Detach(wxSizer *self,PyObject *item){
else
return false;
}
wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item){
bool blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
wxPyEndBlockThreads(blocked);
if ( info.window )
return self->GetItem(info.window);
else if ( info.sizer )
return self->GetItem(info.sizer);
else if ( info.gotPos )
return self->GetItem(info.pos);
else
return NULL;
}
void wxSizer__SetItemMinSize(wxSizer *self,PyObject *item,wxSize const &size){
bool blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
@@ -2053,7 +2072,7 @@ wxGBPosition wxGBSizerItem_GetEndPos(wxGBSizerItem *self){
self->GetEndPos(row, col);
return wxGBPosition(row, col);
}
bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const &pos,wxGBSpan const &span,int flag,int border,PyObject *userData){
wxGBSizerItem *wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const &pos,wxGBSpan const &span,int flag,int border,PyObject *userData){
wxPyUserData* data = NULL;
bool blocked = wxPyBeginBlockThreads();
@@ -2064,13 +2083,13 @@ bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const &
// Now call the real Add method if a valid item type was found
if ( info.window )
return self->Add(info.window, pos, span, flag, border, data);
return (wxGBSizerItem*)self->Add(info.window, pos, span, flag, border, data);
else if ( info.sizer )
return self->Add(info.sizer, pos, span, flag, border, data);
return (wxGBSizerItem*)self->Add(info.sizer, pos, span, flag, border, data);
else if (info.gotSize)
return self->Add(info.size.GetWidth(), info.size.GetHeight(),
pos, span, flag, border, data);
return false;
return (wxGBSizerItem*)self->Add(info.size.GetWidth(), info.size.GetHeight(),
pos, span, flag, border, data);
return NULL;
}
@@ -3662,6 +3681,35 @@ static PyObject *_wrap_new_RectPS(PyObject *, PyObject *args, PyObject *kwargs)
}
static PyObject *_wrap_new_RectS(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxSize *arg1 = 0 ;
wxRect *result;
wxSize temp1 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "size", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_RectS",kwnames,&obj0)) goto fail;
{
arg1 = &temp1;
if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxRect *)new wxRect((wxSize const &)*arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 1);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_delete_Rect(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxRect *arg1 = (wxRect *) 0 ;
@@ -34911,6 +34959,36 @@ static PyObject *_wrap_SizerItem_GetRatio(PyObject *, PyObject *args, PyObject *
}
static PyObject *_wrap_SizerItem_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxSizerItem *arg1 = (wxSizerItem *) 0 ;
wxRect result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SizerItem_GetRect",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (arg1)->GetRect();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
wxRect * resultptr;
resultptr = new wxRect((wxRect &) result);
resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRect, 1);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_SizerItem_IsWindow(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxSizerItem *arg1 = (wxSizerItem *) 0 ;
@@ -35491,6 +35569,7 @@ static PyObject *_wrap_Sizer_Add(PyObject *, PyObject *args, PyObject *kwargs) {
int arg4 = (int) 0 ;
int arg5 = (int) 0 ;
PyObject *arg6 = (PyObject *) NULL ;
wxSizerItem *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
@@ -35522,12 +35601,12 @@ static PyObject *_wrap_Sizer_Add(PyObject *, PyObject *args, PyObject *kwargs) {
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_Add(arg1,arg2,arg3,arg4,arg5,arg6);
result = (wxSizerItem *)wxSizer_Add(arg1,arg2,arg3,arg4,arg5,arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSizerItem, 0);
return resultobj;
fail:
return NULL;
@@ -35543,6 +35622,7 @@ static PyObject *_wrap_Sizer_Insert(PyObject *, PyObject *args, PyObject *kwargs
int arg5 = (int) 0 ;
int arg6 = (int) 0 ;
PyObject *arg7 = (PyObject *) NULL ;
wxSizerItem *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
@@ -35577,12 +35657,12 @@ static PyObject *_wrap_Sizer_Insert(PyObject *, PyObject *args, PyObject *kwargs
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_Insert(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
result = (wxSizerItem *)wxSizer_Insert(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSizerItem, 0);
return resultobj;
fail:
return NULL;
@@ -35597,6 +35677,7 @@ static PyObject *_wrap_Sizer_Prepend(PyObject *, PyObject *args, PyObject *kwarg
int arg4 = (int) 0 ;
int arg5 = (int) 0 ;
PyObject *arg6 = (PyObject *) NULL ;
wxSizerItem *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
@@ -35628,12 +35709,12 @@ static PyObject *_wrap_Sizer_Prepend(PyObject *, PyObject *args, PyObject *kwarg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_Prepend(arg1,arg2,arg3,arg4,arg5,arg6);
result = (wxSizerItem *)wxSizer_Prepend(arg1,arg2,arg3,arg4,arg5,arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSizerItem, 0);
return resultobj;
fail:
return NULL;
@@ -35702,6 +35783,35 @@ static PyObject *_wrap_Sizer_Detach(PyObject *, PyObject *args, PyObject *kwargs
}
static PyObject *_wrap_Sizer_GetItem(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxSizer *arg1 = (wxSizer *) 0 ;
PyObject *arg2 = (PyObject *) 0 ;
wxSizerItem *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "item", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_GetItem",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = obj1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSizerItem, 0);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Sizer__SetItemMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxSizer *arg1 = (wxSizer *) 0 ;
@@ -35741,6 +35851,7 @@ static PyObject *_wrap_Sizer_AddItem(PyObject *, PyObject *args, PyObject *kwarg
PyObject *resultobj;
wxSizer *arg1 = (wxSizer *) 0 ;
wxSizerItem *arg2 = (wxSizerItem *) 0 ;
wxSizerItem *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@@ -35754,12 +35865,12 @@ static PyObject *_wrap_Sizer_AddItem(PyObject *, PyObject *args, PyObject *kwarg
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->Add(arg2);
result = (wxSizerItem *)(arg1)->Add(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSizerItem, 0);
return resultobj;
fail:
return NULL;
@@ -35771,6 +35882,7 @@ static PyObject *_wrap_Sizer_InsertItem(PyObject *, PyObject *args, PyObject *kw
wxSizer *arg1 = (wxSizer *) 0 ;
size_t arg2 ;
wxSizerItem *arg3 = (wxSizerItem *) 0 ;
wxSizerItem *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
@@ -35787,12 +35899,12 @@ static PyObject *_wrap_Sizer_InsertItem(PyObject *, PyObject *args, PyObject *kw
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->Insert(arg2,arg3);
result = (wxSizerItem *)(arg1)->Insert(arg2,arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSizerItem, 0);
return resultobj;
fail:
return NULL;
@@ -35803,6 +35915,7 @@ static PyObject *_wrap_Sizer_PrependItem(PyObject *, PyObject *args, PyObject *k
PyObject *resultobj;
wxSizer *arg1 = (wxSizer *) 0 ;
wxSizerItem *arg2 = (wxSizerItem *) 0 ;
wxSizerItem *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@@ -35816,12 +35929,12 @@ static PyObject *_wrap_Sizer_PrependItem(PyObject *, PyObject *args, PyObject *k
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->Prepend(arg2);
result = (wxSizerItem *)(arg1)->Prepend(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSizerItem, 0);
return resultobj;
fail:
return NULL;
@@ -38351,7 +38464,7 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *, PyObject *args, PyObject *kw
int arg5 = (int) 0 ;
int arg6 = (int) 0 ;
PyObject *arg7 = (PyObject *) NULL ;
bool result;
wxGBSizerItem *result;
wxGBPosition temp3 ;
wxGBSpan temp4 ;
PyObject * obj0 = 0 ;
@@ -38392,14 +38505,12 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *, PyObject *args, PyObject *kw
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)wxGridBagSizer_Add(arg1,arg2,(wxGBPosition const &)*arg3,(wxGBSpan const &)*arg4,arg5,arg6,arg7);
result = (wxGBSizerItem *)wxGridBagSizer_Add(arg1,arg2,(wxGBPosition const &)*arg3,(wxGBSpan const &)*arg4,arg5,arg6,arg7);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBSizerItem, 0);
return resultobj;
fail:
return NULL;
@@ -38410,7 +38521,7 @@ static PyObject *_wrap_GridBagSizer_AddItem(PyObject *, PyObject *args, PyObject
PyObject *resultobj;
wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
wxGBSizerItem *arg2 = (wxGBSizerItem *) 0 ;
bool result;
wxGBSizerItem *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@@ -38424,14 +38535,12 @@ static PyObject *_wrap_GridBagSizer_AddItem(PyObject *, PyObject *args, PyObject
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->Add(arg2);
result = (wxGBSizerItem *)(arg1)->Add(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGBSizerItem, 0);
return resultobj;
fail:
return NULL;
@@ -40725,6 +40834,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"new_Rect", (PyCFunction) _wrap_new_Rect, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"new_RectPP", (PyCFunction) _wrap_new_RectPP, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"new_RectPS", (PyCFunction) _wrap_new_RectPS, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"new_RectS", (PyCFunction) _wrap_new_RectS, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"delete_Rect", (PyCFunction) _wrap_delete_Rect, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Rect_GetX", (PyCFunction) _wrap_Rect_GetX, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Rect_SetX", (PyCFunction) _wrap_Rect_SetX, METH_VARARGS | METH_KEYWORDS, NULL },
@@ -41754,6 +41864,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SizerItem_SetRatioSize", (PyCFunction) _wrap_SizerItem_SetRatioSize, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"SizerItem_SetRatio", (PyCFunction) _wrap_SizerItem_SetRatio, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"SizerItem_GetRatio", (PyCFunction) _wrap_SizerItem_GetRatio, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"SizerItem_GetRect", (PyCFunction) _wrap_SizerItem_GetRect, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"SizerItem_IsWindow", (PyCFunction) _wrap_SizerItem_IsWindow, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"SizerItem_IsSizer", (PyCFunction) _wrap_SizerItem_IsSizer, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"SizerItem_IsSpacer", (PyCFunction) _wrap_SizerItem_IsSpacer, METH_VARARGS | METH_KEYWORDS, NULL },
@@ -41780,6 +41891,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Sizer_Prepend", (PyCFunction) _wrap_Sizer_Prepend, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Sizer_Remove", (PyCFunction) _wrap_Sizer_Remove, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Sizer_Detach", (PyCFunction) _wrap_Sizer_Detach, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Sizer_GetItem", (PyCFunction) _wrap_Sizer_GetItem, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Sizer__SetItemMinSize", (PyCFunction) _wrap_Sizer__SetItemMinSize, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Sizer_AddItem", (PyCFunction) _wrap_Sizer_AddItem, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Sizer_InsertItem", (PyCFunction) _wrap_Sizer_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL },