AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

generated source updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2001-04-27 00:16:34 +00:00
parent 7905ec5558
commit df05452ec0
3 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/src/gtk/gdi.cpp
View File

@ -1276,13 +1276,13 @@ static PyObject *_wrap_new_wxBitmap(PyObject *self, PyObject *args, PyObject *kw
PyObject * _resultobj;
wxBitmap * _result;
wxString * _arg0;
long _arg1;
wxBitmapType _arg1;
PyObject * _obj0 = 0;
char *_kwnames[] = { "name","type", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:new_wxBitmap",_kwnames,&_obj0,&_arg1))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:new_wxBitmap",_kwnames,&_obj0,&_arg1))
return NULL;
{
#if PYTHON_API_VERSION >= 1009

64
wxPython/src/gtk/image.cpp
View File

@ -106,12 +106,11 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
static char* wxStringErrorMsg = "string type is required for parameter";
wxImage* wxNullImage() {
return new wxImage;
}
wxImage* wxEmptyImage(int width, int height) {
return new wxImage(width, height);
wxImage* wxEmptyImage(int width=0, int height=0) {
if (width == 0 && height == 0)
return new wxImage;
else
return new wxImage(width, height);
}
wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype) {
@ -121,43 +120,24 @@ static char* wxStringErrorMsg = "string type is required for parameter";
wxImage* wxImageFromBitmap(const wxBitmap &bitmap) {
return new wxImage(bitmap);
}
#if 0
extern wxImage wxNullImage;
#endif
#ifdef __cplusplus
extern "C" {
#endif
static PyObject *_wrap_wxNullImage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxImage * _result;
char *_kwnames[] = { NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxNullImage",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxImage *)wxNullImage();
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxImage_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
static PyObject *_wrap_wxEmptyImage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxImage * _result;
int _arg0;
int _arg1;
int _arg0 = (int ) 0;
int _arg1 = (int ) 0;
char *_kwnames[] = { "width","height", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:wxEmptyImage",_kwnames,&_arg0,&_arg1))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:wxEmptyImage",_kwnames,&_arg0,&_arg1))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
@ -296,6 +276,21 @@ static PyObject *_wrap_wxInitAllImageHandlers(PyObject *self, PyObject *args, Py
return _resultobj;
}
static int _wrap_wxNullImage_set(PyObject *val) {
PyErr_SetString(PyExc_TypeError,"Variable wxNullImage is read-only.");
return 1;
}
static PyObject *_wrap_wxNullImage_get() {
PyObject * pyobj;
char ptemp[128];
SWIG_MakePtr(ptemp,(char *) &wxNullImage,"_wxImage_p");
pyobj = PyString_FromString(ptemp);
return pyobj;
}
#define wxImageHandler_GetName(_swigobj) (_swigobj->GetName())
static PyObject *_wrap_wxImageHandler_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@ -2231,7 +2226,6 @@ static PyMethodDef imagecMethods[] = {
{ "wxImageFromBitmap", (PyCFunction) _wrap_wxImageFromBitmap, METH_VARARGS | METH_KEYWORDS },
{ "wxImageFromMime", (PyCFunction) _wrap_wxImageFromMime, METH_VARARGS | METH_KEYWORDS },
{ "wxEmptyImage", (PyCFunction) _wrap_wxEmptyImage, METH_VARARGS | METH_KEYWORDS },
{ "wxNullImage", (PyCFunction) _wrap_wxNullImage, METH_VARARGS | METH_KEYWORDS },
{ NULL, NULL }
};
#ifdef __cplusplus
@ -2454,6 +2448,8 @@ SWIGEXPORT(void) initimagec() {
SWIG_globals = SWIG_newvarlink();
m = Py_InitModule("imagec", imagecMethods);
d = PyModule_GetDict(m);
PyDict_SetItemString(d,"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,"wxNullImage",_wrap_wxNullImage_get, _wrap_wxNullImage_set);
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)

7
wxPython/src/gtk/image.py
View File

@ -264,11 +264,6 @@ class wxImage(wxImagePtr):
#-------------- FUNCTION WRAPPERS ------------------
def wxNullImage(*_args, **_kwargs):
val = apply(imagec.wxNullImage,_args,_kwargs)
if val: val = wxImagePtr(val); val.thisown = 1
return val
def wxEmptyImage(*_args, **_kwargs):
val = apply(imagec.wxEmptyImage,_args,_kwargs)
if val: val = wxImagePtr(val); val.thisown = 1
@ -298,3 +293,5 @@ wxImage_RemoveHandler = imagec.wxImage_RemoveHandler
#-------------- VARIABLE WRAPPERS ------------------
cvar = imagec.cvar
wxNullImage = wxImagePtr(imagec.cvar.wxNullImage)