PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
type, otype);
}
- Py_DECREF(str);
+ if (str)
+ Py_DECREF(str);
return;
}
}
static PyObject *wxPen_GetDashes(wxPen *self){
wxDash* dashes;
int count = self->GetDashes(&dashes);
- bool blocked = wxPyBeginBlockThreads();
+ wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* retval = PyList_New(0);
for (int x=0; x<count; x++) {
PyObject* pyint = PyInt_FromLong(dashes[x]);
return retval;
}
static void wxPen__SetDashes(wxPen *self,PyObject *_self,PyObject *pyDashes){
- bool blocked = wxPyBeginBlockThreads();
+ wxPyBlock_t blocked = wxPyBeginBlockThreads();
int size = PyList_Size(pyDashes);
wxDash* dashes = (wxDash*)byte_LIST_helper(pyDashes);
}
+static PyObject *_wrap_new_BrushFromBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
+ PyObject *resultobj;
+ wxBitmap *arg1 = 0 ;
+ wxBrush *result;
+ PyObject * obj0 = 0 ;
+ char *kwnames[] = {
+ (char *) "stippleBitmap", NULL
+ };
+
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_BrushFromBitmap",kwnames,&obj0)) goto fail;
+ {
+ SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
+ if (SWIG_arg_fail(1)) SWIG_fail;
+ if (arg1 == NULL) {
+ SWIG_null_ref("wxBitmap");
+ }
+ if (SWIG_arg_fail(1)) SWIG_fail;
+ }
+ {
+ if (!wxPyCheckForApp()) SWIG_fail;
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+ result = (wxBrush *)new wxBrush((wxBitmap const &)*arg1);
+
+ wxPyEndAllowThreads(__tstate);
+ if (PyErr_Occurred()) SWIG_fail;
+ }
+ resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 1);
+ return resultobj;
+ fail:
+ return NULL;
+}
+
+
static PyObject *_wrap_delete_Brush(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxBrush *arg1 = (wxBrush *) 0 ;
static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) {
PyObject *resultobj;
wxDC *arg1 = (wxDC *) 0 ;
- wxBitmap *arg2 = 0 ;
+ wxBitmap const &arg2_defvalue = wxNullBitmap ;
+ wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
+ int arg3 = (int) wxBUFFER_CLIENT_AREA ;
wxBufferedDC *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
+ PyObject * obj2 = 0 ;
- if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail;
+ if(!PyArg_ParseTuple(args,(char *)"O|OO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
- {
- SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
- if (SWIG_arg_fail(2)) SWIG_fail;
- if (arg2 == NULL) {
- SWIG_null_ref("wxBitmap");
+ if (obj1) {
+ {
+ SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
+ if (SWIG_arg_fail(2)) SWIG_fail;
+ if (arg2 == NULL) {
+ SWIG_null_ref("wxBitmap");
+ }
+ if (SWIG_arg_fail(2)) SWIG_fail;
+ }
+ }
+ if (obj2) {
+ {
+ arg3 = (int)(SWIG_As_int(obj2));
+ if (SWIG_arg_fail(3)) SWIG_fail;
}
- if (SWIG_arg_fail(2)) SWIG_fail;
}
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2);
+ result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2,arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
PyObject *resultobj;
wxDC *arg1 = (wxDC *) 0 ;
wxSize *arg2 = 0 ;
+ int arg3 = (int) wxBUFFER_CLIENT_AREA ;
wxBufferedDC *result;
wxSize temp2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
+ PyObject * obj2 = 0 ;
- if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail;
+ if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
{
arg2 = &temp2;
if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
}
+ if (obj2) {
+ {
+ arg3 = (int)(SWIG_As_int(obj2));
+ if (SWIG_arg_fail(3)) SWIG_fail;
+ }
+ }
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2);
+ result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2,arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
int argc;
- PyObject *argv[3];
+ PyObject *argv[4];
int ii;
argc = PyObject_Length(args);
- for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+ for (ii = 0; (ii < argc) && (ii < 3); ii++) {
argv[ii] = PyTuple_GetItem(args,ii);
}
- if (argc == 2) {
+ if ((argc >= 1) && (argc <= 3)) {
int _v;
{
void *ptr;
}
}
if (_v) {
+ if (argc <= 1) {
+ return _wrap_new_BufferedDC__SWIG_0(self,args);
+ }
{
void *ptr = 0;
if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) {
}
}
if (_v) {
- return _wrap_new_BufferedDC__SWIG_0(self,args);
+ if (argc <= 2) {
+ return _wrap_new_BufferedDC__SWIG_0(self,args);
+ }
+ _v = SWIG_Check_int(argv[2]);
+ if (_v) {
+ return _wrap_new_BufferedDC__SWIG_0(self,args);
+ }
}
}
}
- if (argc == 2) {
+ if ((argc >= 2) && (argc <= 3)) {
int _v;
{
void *ptr;
_v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2);
}
if (_v) {
- return _wrap_new_BufferedDC__SWIG_1(self,args);
+ if (argc <= 2) {
+ return _wrap_new_BufferedDC__SWIG_1(self,args);
+ }
+ _v = SWIG_Check_int(argv[2]);
+ if (_v) {
+ return _wrap_new_BufferedDC__SWIG_1(self,args);
+ }
}
}
}
wxWindow *arg1 = (wxWindow *) 0 ;
wxBitmap const &arg2_defvalue = wxNullBitmap ;
wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
+ int arg3 = (int) wxBUFFER_CLIENT_AREA ;
wxBufferedPaintDC *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
+ PyObject * obj2 = 0 ;
char *kwnames[] = {
- (char *) "window",(char *) "buffer", NULL
+ (char *) "window",(char *) "buffer",(char *) "style", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BufferedPaintDC",kwnames,&obj0,&obj1)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_BufferedPaintDC",kwnames,&obj0,&obj1,&obj2)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
if (obj1) {
if (SWIG_arg_fail(2)) SWIG_fail;
}
}
+ if (obj2) {
+ {
+ arg3 = (int)(SWIG_As_int(obj2));
+ if (SWIG_arg_fail(3)) SWIG_fail;
+ }
+ }
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2);
+ result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2,arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
+static PyObject *_wrap_ImageList_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
+ PyObject *resultobj;
+ wxImageList *arg1 = (wxImageList *) 0 ;
+ int arg2 ;
+ SwigValueWrapper<wxBitmap > result;
+ PyObject * obj0 = 0 ;
+ PyObject * obj1 = 0 ;
+ char *kwnames[] = {
+ (char *) "self",(char *) "index", NULL
+ };
+
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_GetBitmap",kwnames,&obj0,&obj1)) goto fail;
+ SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageList, SWIG_POINTER_EXCEPTION | 0);
+ if (SWIG_arg_fail(1)) SWIG_fail;
+ {
+ arg2 = (int)(SWIG_As_int(obj1));
+ if (SWIG_arg_fail(2)) SWIG_fail;
+ }
+ {
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+ result = ((wxImageList const *)arg1)->GetBitmap(arg2);
+
+ wxPyEndAllowThreads(__tstate);
+ if (PyErr_Occurred()) SWIG_fail;
+ }
+ {
+ wxBitmap * resultptr;
+ resultptr = new wxBitmap((wxBitmap &)(result));
+ resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxBitmap, 1);
+ }
+ return resultobj;
+ fail:
+ return NULL;
+}
+
+
+static PyObject *_wrap_ImageList_GetIcon(PyObject *, PyObject *args, PyObject *kwargs) {
+ PyObject *resultobj;
+ wxImageList *arg1 = (wxImageList *) 0 ;
+ int arg2 ;
+ wxIcon result;
+ PyObject * obj0 = 0 ;
+ PyObject * obj1 = 0 ;
+ char *kwnames[] = {
+ (char *) "self",(char *) "index", NULL
+ };
+
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_GetIcon",kwnames,&obj0,&obj1)) goto fail;
+ SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageList, SWIG_POINTER_EXCEPTION | 0);
+ if (SWIG_arg_fail(1)) SWIG_fail;
+ {
+ arg2 = (int)(SWIG_As_int(obj1));
+ if (SWIG_arg_fail(2)) SWIG_fail;
+ }
+ {
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+ result = ((wxImageList const *)arg1)->GetIcon(arg2);
+
+ wxPyEndAllowThreads(__tstate);
+ if (PyErr_Occurred()) SWIG_fail;
+ }
+ {
+ wxIcon * resultptr;
+ resultptr = new wxIcon((wxIcon &)(result));
+ resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxIcon, 1);
+ }
+ return resultobj;
+ fail:
+ return NULL;
+}
+
+
static PyObject *_wrap_ImageList_Replace(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImageList *arg1 = (wxImageList *) 0 ;
PyObject *resultobj;
wxBrushList *arg1 = (wxBrushList *) 0 ;
wxColour *arg2 = 0 ;
- int arg3 ;
+ int arg3 = (int) wxSOLID ;
wxBrush *result;
wxColour temp2 ;
PyObject * obj0 = 0 ;
(char *) "self",(char *) "colour",(char *) "style", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&obj2)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&obj2)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBrushList, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
{
arg2 = &temp2;
if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
}
- {
- arg3 = (int)(SWIG_As_int(obj2));
- if (SWIG_arg_fail(3)) SWIG_fail;
+ if (obj2) {
+ {
+ arg3 = (int)(SWIG_As_int(obj2));
+ if (SWIG_arg_fail(3)) SWIG_fail;
+ }
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
{ (char *)"Pen___ne__", (PyCFunction) _wrap_Pen___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Pen_swigregister", Pen_swigregister, METH_VARARGS, NULL},
{ (char *)"new_Brush", (PyCFunction) _wrap_new_Brush, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"new_BrushFromBitmap", (PyCFunction) _wrap_new_BrushFromBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"delete_Brush", (PyCFunction) _wrap_delete_Brush, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Brush_SetColour", (PyCFunction) _wrap_Brush_SetColour, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Brush_SetStyle", (PyCFunction) _wrap_Brush_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ImageList_Add", (PyCFunction) _wrap_ImageList_Add, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ImageList_AddWithColourMask", (PyCFunction) _wrap_ImageList_AddWithColourMask, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ImageList_AddIcon", (PyCFunction) _wrap_ImageList_AddIcon, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"ImageList_GetBitmap", (PyCFunction) _wrap_ImageList_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"ImageList_GetIcon", (PyCFunction) _wrap_ImageList_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ImageList_Replace", (PyCFunction) _wrap_ImageList_Replace, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ImageList_Draw", (PyCFunction) _wrap_ImageList_Draw, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ImageList_GetImageCount", (PyCFunction) _wrap_ImageList_GetImageCount, METH_VARARGS | METH_KEYWORDS, NULL},
{
PyDict_SetItemString(d,"PLATFORM_MAC", SWIG_From_int((int)(wxPLATFORM_MAC)));
}
+ {
+ PyDict_SetItemString(d,"BUFFER_VIRTUAL_AREA", SWIG_From_int((int)(wxBUFFER_VIRTUAL_AREA)));
+ }
+ {
+ PyDict_SetItemString(d,"BUFFER_CLIENT_AREA", SWIG_From_int((int)(wxBUFFER_CLIENT_AREA)));
+ }
{
PyDict_SetItemString(d,"IMAGELIST_DRAW_NORMAL", SWIG_From_int((int)(wxIMAGELIST_DRAW_NORMAL)));
}
projects / wxWidgets.git / blobdiff