Some minor bugs fixed, some spit and polish, especially in the demo,

and some fixes in the build and distrib stuff.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-10-22 23:53:39 +00:00
parent 52e72fde27
commit 1e081845e5
5 changed files with 285 additions and 23 deletions

View File

@@ -1,5 +1,5 @@
/* /*
* FILE : gtk/grid.cpp * FILE : src/gtk/grid.cpp
* *
* This file was automatically generated by : * This file was automatically generated by :
* Simplified Wrapper and Interface Generator (SWIG) * Simplified Wrapper and Interface Generator (SWIG)
@@ -10936,7 +10936,7 @@ static PyObject *_wrap_wxGrid_SelectCol(PyObject *self, PyObject *args, PyObject
return _resultobj; return _resultobj;
} }
#define wxGrid_SelectBlock(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->SelectBlock(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) #define wxGrid_SelectBlock(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->SelectBlock(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
static PyObject *_wrap_wxGrid_SelectBlock(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxGrid_SelectBlock(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
wxGrid * _arg0; wxGrid * _arg0;
@@ -10944,11 +10944,13 @@ static PyObject *_wrap_wxGrid_SelectBlock(PyObject *self, PyObject *args, PyObje
int _arg2; int _arg2;
int _arg3; int _arg3;
int _arg4; int _arg4;
bool _arg5 = (bool ) FALSE;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
char *_kwnames[] = { "self","topRow","leftCol","bottomRow","rightCol", NULL }; int tempbool5 = (int) FALSE;
char *_kwnames[] = { "self","topRow","leftCol","bottomRow","rightCol","addToSelected", NULL };
self = self; self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii:wxGrid_SelectBlock",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|i:wxGrid_SelectBlock",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5))
return NULL; return NULL;
if (_argo0) { if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; } if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -10957,9 +10959,10 @@ static PyObject *_wrap_wxGrid_SelectBlock(PyObject *self, PyObject *args, PyObje
return NULL; return NULL;
} }
} }
_arg5 = (bool ) tempbool5;
{ {
wxPy_BEGIN_ALLOW_THREADS; wxPy_BEGIN_ALLOW_THREADS;
wxGrid_SelectBlock(_arg0,_arg1,_arg2,_arg3,_arg4); wxGrid_SelectBlock(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
wxPy_END_ALLOW_THREADS; wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None); } Py_INCREF(Py_None);

View File

@@ -1451,6 +1451,121 @@ static PyObject *_wrap_wxRealPoint_asTuple(PyObject *self, PyObject *args, PyObj
return _resultobj; return _resultobj;
} }
static wxRealPoint wxRealPoint___add__(wxRealPoint *self,const wxRealPoint * p) {
if (! p) return *self;
return *self + *p;
}
static PyObject *_wrap_wxRealPoint___add__(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxRealPoint * _result;
wxRealPoint * _arg0;
wxRealPoint * _arg1;
wxRealPoint temp;
PyObject * _obj0 = 0;
wxRealPoint temp0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","p", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRealPoint___add__",_kwnames,&_obj0,&_obj1))
return NULL;
{
_arg0 = &temp;
if (! wxRealPoint_helper(_obj0, &_arg0))
return NULL;
}
{
_arg1 = &temp0;
if (! wxRealPoint_helper(_obj1, &_arg1))
return NULL;
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxRealPoint (wxRealPoint___add__(_arg0,_arg1));
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxRealPoint_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static wxRealPoint wxRealPoint___sub__(wxRealPoint *self,const wxRealPoint * p) {
if (! p) return *self;
return *self - *p;
}
static PyObject *_wrap_wxRealPoint___sub__(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxRealPoint * _result;
wxRealPoint * _arg0;
wxRealPoint * _arg1;
wxRealPoint temp;
PyObject * _obj0 = 0;
wxRealPoint temp0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","p", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRealPoint___sub__",_kwnames,&_obj0,&_obj1))
return NULL;
{
_arg0 = &temp;
if (! wxRealPoint_helper(_obj0, &_arg0))
return NULL;
}
{
_arg1 = &temp0;
if (! wxRealPoint_helper(_obj1, &_arg1))
return NULL;
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxRealPoint (wxRealPoint___sub__(_arg0,_arg1));
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxRealPoint_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static int wxRealPoint___cmp__(wxRealPoint *self,const wxRealPoint * p) {
if (! p) return 0;
return *self == *p;
}
static PyObject *_wrap_wxRealPoint___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxRealPoint * _arg0;
wxRealPoint * _arg1;
wxRealPoint temp;
PyObject * _obj0 = 0;
wxRealPoint temp0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","p", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRealPoint___cmp__",_kwnames,&_obj0,&_obj1))
return NULL;
{
_arg0 = &temp;
if (! wxRealPoint_helper(_obj0, &_arg0))
return NULL;
}
{
_arg1 = &temp0;
if (! wxRealPoint_helper(_obj1, &_arg1))
return NULL;
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (int )wxRealPoint___cmp__(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxPoint_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval) #define wxPoint_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)
static PyObject *_wrap_wxPoint_x_set(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxPoint_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
@@ -1674,6 +1789,121 @@ static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args, PyObject
return _resultobj; return _resultobj;
} }
static wxPoint wxPoint___add__(wxPoint *self,const wxPoint * p) {
if (! p) return *self;
return *self + *p;
}
static PyObject *_wrap_wxPoint___add__(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPoint * _result;
wxPoint * _arg0;
wxPoint * _arg1;
wxPoint temp;
PyObject * _obj0 = 0;
wxPoint temp0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","p", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint___add__",_kwnames,&_obj0,&_obj1))
return NULL;
{
_arg0 = &temp;
if (! wxPoint_helper(_obj0, &_arg0))
return NULL;
}
{
_arg1 = &temp0;
if (! wxPoint_helper(_obj1, &_arg1))
return NULL;
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxPoint (wxPoint___add__(_arg0,_arg1));
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static wxPoint wxPoint___sub__(wxPoint *self,const wxPoint * p) {
if (! p) return *self;
return *self - *p;
}
static PyObject *_wrap_wxPoint___sub__(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPoint * _result;
wxPoint * _arg0;
wxPoint * _arg1;
wxPoint temp;
PyObject * _obj0 = 0;
wxPoint temp0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","p", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint___sub__",_kwnames,&_obj0,&_obj1))
return NULL;
{
_arg0 = &temp;
if (! wxPoint_helper(_obj0, &_arg0))
return NULL;
}
{
_arg1 = &temp0;
if (! wxPoint_helper(_obj1, &_arg1))
return NULL;
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxPoint (wxPoint___sub__(_arg0,_arg1));
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static int wxPoint___cmp__(wxPoint *self,const wxPoint * p) {
if (! p) return 0;
return *self == *p;
}
static PyObject *_wrap_wxPoint___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxPoint * _arg0;
wxPoint * _arg1;
wxPoint temp;
PyObject * _obj0 = 0;
wxPoint temp0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","p", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint___cmp__",_kwnames,&_obj0,&_obj1))
return NULL;
{
_arg0 = &temp;
if (! wxPoint_helper(_obj0, &_arg0))
return NULL;
}
{
_arg1 = &temp0;
if (! wxPoint_helper(_obj1, &_arg1))
return NULL;
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (int )wxPoint___cmp__(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define new_wxRect(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxRect(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) #define new_wxRect(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxRect(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
@@ -4643,6 +4873,9 @@ static PyMethodDef misccMethods[] = {
{ "wxRect_GetX", (PyCFunction) _wrap_wxRect_GetX, METH_VARARGS | METH_KEYWORDS }, { "wxRect_GetX", (PyCFunction) _wrap_wxRect_GetX, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxRect", (PyCFunction) _wrap_delete_wxRect, METH_VARARGS | METH_KEYWORDS }, { "delete_wxRect", (PyCFunction) _wrap_delete_wxRect, METH_VARARGS | METH_KEYWORDS },
{ "new_wxRect", (PyCFunction) _wrap_new_wxRect, METH_VARARGS | METH_KEYWORDS }, { "new_wxRect", (PyCFunction) _wrap_new_wxRect, METH_VARARGS | METH_KEYWORDS },
{ "wxPoint___cmp__", (PyCFunction) _wrap_wxPoint___cmp__, METH_VARARGS | METH_KEYWORDS },
{ "wxPoint___sub__", (PyCFunction) _wrap_wxPoint___sub__, METH_VARARGS | METH_KEYWORDS },
{ "wxPoint___add__", (PyCFunction) _wrap_wxPoint___add__, METH_VARARGS | METH_KEYWORDS },
{ "wxPoint_asTuple", (PyCFunction) _wrap_wxPoint_asTuple, METH_VARARGS | METH_KEYWORDS }, { "wxPoint_asTuple", (PyCFunction) _wrap_wxPoint_asTuple, METH_VARARGS | METH_KEYWORDS },
{ "wxPoint_Set", (PyCFunction) _wrap_wxPoint_Set, METH_VARARGS | METH_KEYWORDS }, { "wxPoint_Set", (PyCFunction) _wrap_wxPoint_Set, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxPoint", (PyCFunction) _wrap_delete_wxPoint, METH_VARARGS | METH_KEYWORDS }, { "delete_wxPoint", (PyCFunction) _wrap_delete_wxPoint, METH_VARARGS | METH_KEYWORDS },
@@ -4651,6 +4884,9 @@ static PyMethodDef misccMethods[] = {
{ "wxPoint_y_set", (PyCFunction) _wrap_wxPoint_y_set, METH_VARARGS | METH_KEYWORDS }, { "wxPoint_y_set", (PyCFunction) _wrap_wxPoint_y_set, METH_VARARGS | METH_KEYWORDS },
{ "wxPoint_x_get", (PyCFunction) _wrap_wxPoint_x_get, METH_VARARGS | METH_KEYWORDS }, { "wxPoint_x_get", (PyCFunction) _wrap_wxPoint_x_get, METH_VARARGS | METH_KEYWORDS },
{ "wxPoint_x_set", (PyCFunction) _wrap_wxPoint_x_set, METH_VARARGS | METH_KEYWORDS }, { "wxPoint_x_set", (PyCFunction) _wrap_wxPoint_x_set, METH_VARARGS | METH_KEYWORDS },
{ "wxRealPoint___cmp__", (PyCFunction) _wrap_wxRealPoint___cmp__, METH_VARARGS | METH_KEYWORDS },
{ "wxRealPoint___sub__", (PyCFunction) _wrap_wxRealPoint___sub__, METH_VARARGS | METH_KEYWORDS },
{ "wxRealPoint___add__", (PyCFunction) _wrap_wxRealPoint___add__, METH_VARARGS | METH_KEYWORDS },
{ "wxRealPoint_asTuple", (PyCFunction) _wrap_wxRealPoint_asTuple, METH_VARARGS | METH_KEYWORDS }, { "wxRealPoint_asTuple", (PyCFunction) _wrap_wxRealPoint_asTuple, METH_VARARGS | METH_KEYWORDS },
{ "wxRealPoint_Set", (PyCFunction) _wrap_wxRealPoint_Set, METH_VARARGS | METH_KEYWORDS }, { "wxRealPoint_Set", (PyCFunction) _wrap_wxRealPoint_Set, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxRealPoint", (PyCFunction) _wrap_delete_wxRealPoint, METH_VARARGS | METH_KEYWORDS }, { "delete_wxRealPoint", (PyCFunction) _wrap_delete_wxRealPoint, METH_VARARGS | METH_KEYWORDS },

View File

@@ -80,6 +80,17 @@ class wxRealPointPtr :
def asTuple(self, *_args, **_kwargs): def asTuple(self, *_args, **_kwargs):
val = apply(miscc.wxRealPoint_asTuple,(self,) + _args, _kwargs) val = apply(miscc.wxRealPoint_asTuple,(self,) + _args, _kwargs)
return val return val
def __add__(self, *_args, **_kwargs):
val = apply(miscc.wxRealPoint___add__,(self,) + _args, _kwargs)
if val: val = wxRealPointPtr(val) ; val.thisown = 1
return val
def __sub__(self, *_args, **_kwargs):
val = apply(miscc.wxRealPoint___sub__,(self,) + _args, _kwargs)
if val: val = wxRealPointPtr(val) ; val.thisown = 1
return val
def __cmp__(self, *_args, **_kwargs):
val = apply(miscc.wxRealPoint___cmp__,(self,) + _args, _kwargs)
return val
def __setattr__(self,name,value): def __setattr__(self,name,value):
if name == "x" : if name == "x" :
miscc.wxRealPoint_x_set(self,value) miscc.wxRealPoint_x_set(self,value)
@@ -119,6 +130,17 @@ class wxPointPtr :
def asTuple(self, *_args, **_kwargs): def asTuple(self, *_args, **_kwargs):
val = apply(miscc.wxPoint_asTuple,(self,) + _args, _kwargs) val = apply(miscc.wxPoint_asTuple,(self,) + _args, _kwargs)
return val return val
def __add__(self, *_args, **_kwargs):
val = apply(miscc.wxPoint___add__,(self,) + _args, _kwargs)
if val: val = wxPointPtr(val) ; val.thisown = 1
return val
def __sub__(self, *_args, **_kwargs):
val = apply(miscc.wxPoint___sub__,(self,) + _args, _kwargs)
if val: val = wxPointPtr(val) ; val.thisown = 1
return val
def __cmp__(self, *_args, **_kwargs):
val = apply(miscc.wxPoint___cmp__,(self,) + _args, _kwargs)
return val
def __setattr__(self,name,value): def __setattr__(self,name,value):
if name == "x" : if name == "x" :
miscc.wxPoint_x_set(self,value) miscc.wxPoint_x_set(self,value)

View File

@@ -1,5 +1,5 @@
/* /*
* FILE : gtk/stattool.cpp * FILE : src/gtk/stattool.cpp
* *
* This file was automatically generated by : * This file was automatically generated by :
* Simplified Wrapper and Interface Generator (SWIG) * Simplified Wrapper and Interface Generator (SWIG)
@@ -1358,11 +1358,11 @@ static void *SwigwxToolBarBaseTowxEvtHandler(void *ptr) {
return (void *) dest; return (void *) dest;
} }
static wxToolBarToolBase * wxToolBarBase_AddTool(wxToolBarBase *self,int id,const wxBitmap & bitmap,const wxBitmap & pushedBitmap,int toggle,PyObject * clientData,const wxString & shortHelpString,const wxString & longHelpString) { static wxToolBarToolBase * wxToolBarBase_AddTool(wxToolBarBase *self,int id,const wxBitmap & bitmap,const wxBitmap & pushedBitmap,int isToggle,PyObject * clientData,const wxString & shortHelpString,const wxString & longHelpString) {
wxPyUserData* udata = NULL; wxPyUserData* udata = NULL;
if (clientData) if (clientData)
udata = new wxPyUserData(clientData); udata = new wxPyUserData(clientData);
return self->AddTool(id, bitmap, pushedBitmap, (bool)toggle, return self->AddTool(id, bitmap, pushedBitmap, (bool)isToggle,
udata, shortHelpString, longHelpString); udata, shortHelpString, longHelpString);
} }
static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args, PyObject *kwargs) {
@@ -1382,7 +1382,7 @@ static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args, PyO
PyObject * _obj5 = 0; PyObject * _obj5 = 0;
PyObject * _obj6 = 0; PyObject * _obj6 = 0;
PyObject * _obj7 = 0; PyObject * _obj7 = 0;
char *_kwnames[] = { "self","id","bitmap","pushedBitmap","toggle","clientData","shortHelpString","longHelpString", NULL }; char *_kwnames[] = { "self","id","bitmap","pushedBitmap","isToggle","clientData","shortHelpString","longHelpString", NULL };
char _ptemp[128]; char _ptemp[128];
self = self; self = self;
@@ -1452,8 +1452,8 @@ static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args, PyO
return _resultobj; return _resultobj;
} }
static wxToolBarToolBase * wxToolBarBase_AddSimpleTool(wxToolBarBase *self,int id,const wxBitmap & bitmap,const wxString & shortHelpString,const wxString & longHelpString,int toggle) { static wxToolBarToolBase * wxToolBarBase_AddSimpleTool(wxToolBarBase *self,int id,const wxBitmap & bitmap,const wxString & shortHelpString,const wxString & longHelpString,int isToggle) {
return self->AddTool(id, bitmap, wxNullBitmap, toggle, NULL, return self->AddTool(id, bitmap, wxNullBitmap, isToggle, NULL,
shortHelpString, longHelpString); shortHelpString, longHelpString);
} }
static PyObject *_wrap_wxToolBarBase_AddSimpleTool(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxToolBarBase_AddSimpleTool(PyObject *self, PyObject *args, PyObject *kwargs) {
@@ -1469,7 +1469,7 @@ static PyObject *_wrap_wxToolBarBase_AddSimpleTool(PyObject *self, PyObject *arg
PyObject * _argo2 = 0; PyObject * _argo2 = 0;
PyObject * _obj3 = 0; PyObject * _obj3 = 0;
PyObject * _obj4 = 0; PyObject * _obj4 = 0;
char *_kwnames[] = { "self","id","bitmap","shortHelpString","longHelpString","toggle", NULL }; char *_kwnames[] = { "self","id","bitmap","shortHelpString","longHelpString","isToggle", NULL };
char _ptemp[128]; char _ptemp[128];
self = self; self = self;
@@ -1528,11 +1528,11 @@ static PyObject *_wrap_wxToolBarBase_AddSimpleTool(PyObject *self, PyObject *arg
return _resultobj; return _resultobj;
} }
static wxToolBarToolBase * wxToolBarBase_InsertTool(wxToolBarBase *self,size_t pos,int id,const wxBitmap & bitmap,const wxBitmap & pushedBitmap,int toggle,PyObject * clientData,const wxString & shortHelpString,const wxString & longHelpString) { static wxToolBarToolBase * wxToolBarBase_InsertTool(wxToolBarBase *self,size_t pos,int id,const wxBitmap & bitmap,const wxBitmap & pushedBitmap,int isToggle,PyObject * clientData,const wxString & shortHelpString,const wxString & longHelpString) {
wxPyUserData* udata = NULL; wxPyUserData* udata = NULL;
if (clientData) if (clientData)
udata = new wxPyUserData(clientData); udata = new wxPyUserData(clientData);
return self->InsertTool(pos, id, bitmap, pushedBitmap, (bool)toggle, return self->InsertTool(pos, id, bitmap, pushedBitmap, (bool)isToggle,
udata, shortHelpString, longHelpString); udata, shortHelpString, longHelpString);
} }
static PyObject *_wrap_wxToolBarBase_InsertTool(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxToolBarBase_InsertTool(PyObject *self, PyObject *args, PyObject *kwargs) {
@@ -1553,7 +1553,7 @@ static PyObject *_wrap_wxToolBarBase_InsertTool(PyObject *self, PyObject *args,
PyObject * _obj6 = 0; PyObject * _obj6 = 0;
PyObject * _obj7 = 0; PyObject * _obj7 = 0;
PyObject * _obj8 = 0; PyObject * _obj8 = 0;
char *_kwnames[] = { "self","pos","id","bitmap","pushedBitmap","toggle","clientData","shortHelpString","longHelpString", NULL }; char *_kwnames[] = { "self","pos","id","bitmap","pushedBitmap","isToggle","clientData","shortHelpString","longHelpString", NULL };
char _ptemp[128]; char _ptemp[128];
self = self; self = self;
@@ -1623,8 +1623,8 @@ static PyObject *_wrap_wxToolBarBase_InsertTool(PyObject *self, PyObject *args,
return _resultobj; return _resultobj;
} }
static wxToolBarToolBase * wxToolBarBase_InsertSimpleTool(wxToolBarBase *self,size_t pos,int id,const wxBitmap & bitmap,const wxString & shortHelpString,const wxString & longHelpString,int toggle) { static wxToolBarToolBase * wxToolBarBase_InsertSimpleTool(wxToolBarBase *self,size_t pos,int id,const wxBitmap & bitmap,const wxString & shortHelpString,const wxString & longHelpString,int isToggle) {
return self->InsertTool(pos, id, bitmap, wxNullBitmap, toggle, NULL, return self->InsertTool(pos, id, bitmap, wxNullBitmap, isToggle, NULL,
shortHelpString, longHelpString); shortHelpString, longHelpString);
} }
static PyObject *_wrap_wxToolBarBase_InsertSimpleTool(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxToolBarBase_InsertSimpleTool(PyObject *self, PyObject *args, PyObject *kwargs) {
@@ -1641,7 +1641,7 @@ static PyObject *_wrap_wxToolBarBase_InsertSimpleTool(PyObject *self, PyObject *
PyObject * _argo3 = 0; PyObject * _argo3 = 0;
PyObject * _obj4 = 0; PyObject * _obj4 = 0;
PyObject * _obj5 = 0; PyObject * _obj5 = 0;
char *_kwnames[] = { "self","pos","id","bitmap","shortHelpString","longHelpString","toggle", NULL }; char *_kwnames[] = { "self","pos","id","bitmap","shortHelpString","longHelpString","isToggle", NULL };
char _ptemp[128]; char _ptemp[128];
self = self; self = self;

View File

@@ -1,5 +1,5 @@
/* /*
* FILE : gtk/windows.cpp * FILE : src/gtk/windows.cpp
* *
* This file was automatically generated by : * This file was automatically generated by :
* Simplified Wrapper and Interface Generator (SWIG) * Simplified Wrapper and Interface Generator (SWIG)
@@ -7552,19 +7552,20 @@ static void *SwigwxMenuBarTowxEvtHandler(void *ptr) {
return (void *) dest; return (void *) dest;
} }
#define new_wxMenuBar() (new wxMenuBar()) #define new_wxMenuBar(_swigarg0) (new wxMenuBar(_swigarg0))
static PyObject *_wrap_new_wxMenuBar(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_new_wxMenuBar(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
wxMenuBar * _result; wxMenuBar * _result;
char *_kwnames[] = { NULL }; long _arg0 = (long ) 0;
char *_kwnames[] = { "style", NULL };
char _ptemp[128]; char _ptemp[128];
self = self; self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxMenuBar",_kwnames)) if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|l:new_wxMenuBar",_kwnames,&_arg0))
return NULL; return NULL;
{ {
wxPy_BEGIN_ALLOW_THREADS; wxPy_BEGIN_ALLOW_THREADS;
_result = (wxMenuBar *)new_wxMenuBar(); _result = (wxMenuBar *)new_wxMenuBar(_arg0);
wxPy_END_ALLOW_THREADS; wxPy_END_ALLOW_THREADS;
} if (_result) { } if (_result) {