X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53aa7709e08bb3cdaa8ec5c4977f32e817aff7d6..c437fde9f90fc7dfcac79053d214fc9146d7be21:/wxPython/src/mac/_gdi_wrap.cpp diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp index 0f0c02e7a1..6dd1ebb91b 100644 --- a/wxPython/src/mac/_gdi_wrap.cpp +++ b/wxPython/src/mac/_gdi_wrap.cpp @@ -1721,7 +1721,7 @@ SWIG_Check_int(PyObject* obj) 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= 1) && (argc <= 3)) { int _v; { void *ptr; @@ -17314,6 +17333,9 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { } } 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) { @@ -17324,11 +17346,17 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { } } 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; @@ -17344,7 +17372,13 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { _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); + } } } } @@ -17416,14 +17450,16 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *, PyObject *args, PyObject 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) { @@ -17436,10 +17472,16 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *, PyObject *args, PyObject 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; @@ -18479,6 +18521,78 @@ static PyObject *_wrap_ImageList_AddIcon(PyObject *, PyObject *args, PyObject *k } +static PyObject *_wrap_ImageList_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImageList *arg1 = (wxImageList *) 0 ; + int arg2 ; + SwigValueWrapper 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 ; @@ -21067,6 +21181,8 @@ static PyMethodDef SwigMethods[] = { { (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}, @@ -23111,6 +23227,12 @@ SWIGEXPORT(void) SWIG_init(void) { { 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))); }