X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7449af7300c1a1f105caefdb0e77553b1d682bf9..5ce8a6113a12e8b9f68347d0517d8a985b95039d:/wxPython/src/msw/_gdi_wrap.cpp diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index 28515a7886..65ce1135fa 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -1624,7 +1624,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1711,7 +1711,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -1800,12 +1800,12 @@ SWIG_Check_unsigned_SS_long(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_char PyInt_FromLong /*@@*/ - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -1858,36 +1858,35 @@ SWIG_Check_int(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ - static PyObject* t_output_helper(PyObject* target, PyObject* o) { - PyObject* o2; - PyObject* o3; - - if (!target) { - target = o; - } else if (target == Py_None) { - Py_DECREF(Py_None); - target = o; - } else { - if (!PyTuple_Check(target)) { - o2 = target; - target = PyTuple_New(1); - PyTuple_SetItem(target, 0, o2); - } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); - - o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); - Py_DECREF(o3); - } - return target; - } + static PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static PyObject *wxPen_GetDashes(wxPen *self){ @@ -2193,7 +2192,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2236,7 +2235,7 @@ static wxArrayInt wxDC_GetPartialTextExtents(wxDC *self,wxString const &text){ return widths; } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ @@ -13076,155 +13075,212 @@ static PyObject *_wrap_delete_DC(PyObject *, PyObject *args, PyObject *kwargs) { } -static PyObject *_wrap_DC_BeginDrawing(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_FloodFill(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxDC *arg1 = (wxDC *) 0 ; + int arg2 ; + int arg3 ; + wxColour *arg4 = 0 ; + int arg5 = (int) wxFLOOD_SURFACE ; + bool result; + wxColour temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "x",(char *) "y",(char *) "col",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_BeginDrawing",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + { + arg4 = &temp4; + if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail; + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_int(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->BeginDrawing(); + result = (bool)(arg1)->FloodFill(arg2,arg3,(wxColour const &)*arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; } -static PyObject *_wrap_DC_EndDrawing(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_FloodFillPoint(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxDC *arg1 = (wxDC *) 0 ; + wxPoint *arg2 = 0 ; + wxColour *arg3 = 0 ; + int arg4 = (int) wxFLOOD_SURFACE ; + bool result; + wxPoint temp2 ; + wxColour temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "pt",(char *) "col",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_EndDrawing",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_FloodFillPoint",kwnames,&obj0,&obj1,&obj2,&obj3)) 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 ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_int(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->EndDrawing(); + result = (bool)(arg1)->FloodFill((wxPoint const &)*arg2,(wxColour const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; } -static PyObject *_wrap_DC_FloodFill(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_GradientFillConcentric(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxDC *arg1 = (wxDC *) 0 ; - int arg2 ; - int arg3 ; + wxRect *arg2 = 0 ; + wxColour *arg3 = 0 ; wxColour *arg4 = 0 ; - int arg5 = (int) wxFLOOD_SURFACE ; - bool result; + wxPoint *arg5 = 0 ; + wxRect temp2 ; + wxColour temp3 ; wxColour temp4 ; + wxPoint temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "x",(char *) "y",(char *) "col",(char *) "style", NULL + (char *) "self",(char *) "rect",(char *) "initialColour",(char *) "destColour",(char *) "circleCenter", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_GradientFillConcentric",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = static_cast(SWIG_As_int(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; + arg2 = &temp2; + if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } { - arg3 = static_cast(SWIG_As_int(obj2)); - if (SWIG_arg_fail(3)) SWIG_fail; + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; } { arg4 = &temp4; if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail; } - if (obj4) { - { - arg5 = static_cast(SWIG_As_int(obj4)); - if (SWIG_arg_fail(5)) SWIG_fail; - } + { + arg5 = &temp5; + if ( ! wxPoint_helper(obj4, &arg5)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->FloodFill(arg2,arg3,(wxColour const &)*arg4,arg5); + (arg1)->GradientFillConcentric((wxRect const &)*arg2,(wxColour const &)*arg3,(wxColour const &)*arg4,(wxPoint const &)*arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_DC_FloodFillPoint(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_GradientFillLinear(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxDC *arg1 = (wxDC *) 0 ; - wxPoint *arg2 = 0 ; + wxRect *arg2 = 0 ; wxColour *arg3 = 0 ; - int arg4 = (int) wxFLOOD_SURFACE ; - bool result; - wxPoint temp2 ; + wxColour *arg4 = 0 ; + wxDirection arg5 = (wxDirection) wxEAST ; + wxRect temp2 ; wxColour temp3 ; + wxColour temp4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pt",(char *) "col",(char *) "style", NULL + (char *) "self",(char *) "rect",(char *) "initialColour",(char *) "destColour",(char *) "nDirection", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_FloodFillPoint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_GradientFillLinear",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) 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 ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } { arg3 = &temp3; if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; } - if (obj3) { + { + arg4 = &temp4; + if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail; + } + if (obj4) { { - arg4 = static_cast(SWIG_As_int(obj3)); - if (SWIG_arg_fail(4)) SWIG_fail; + arg5 = static_cast(SWIG_As_int(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->FloodFill((wxPoint const &)*arg2,(wxColour const &)*arg3,arg4); + (arg1)->GradientFillLinear((wxRect const &)*arg2,(wxColour const &)*arg3,(wxColour const &)*arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; @@ -19265,7 +19321,7 @@ static PyObject *_wrap_new_ImageList(PyObject *, PyObject *args, PyObject *kwarg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -22749,10 +22805,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"EncodingConverter_CanConvert", (PyCFunction) _wrap_EncodingConverter_CanConvert, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"EncodingConverter_swigregister", EncodingConverter_swigregister, METH_VARARGS, NULL}, { (char *)"delete_DC", (PyCFunction) _wrap_delete_DC, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DC_BeginDrawing", (PyCFunction) _wrap_DC_BeginDrawing, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DC_EndDrawing", (PyCFunction) _wrap_DC_EndDrawing, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_FloodFill", (PyCFunction) _wrap_DC_FloodFill, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_FloodFillPoint", (PyCFunction) _wrap_DC_FloodFillPoint, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DC_GradientFillConcentric", (PyCFunction) _wrap_DC_GradientFillConcentric, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DC_GradientFillLinear", (PyCFunction) _wrap_DC_GradientFillLinear, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_GetPixel", (PyCFunction) _wrap_DC_GetPixel, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_GetPixelPoint", (PyCFunction) _wrap_DC_GetPixelPoint, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_DrawLine", (PyCFunction) _wrap_DC_DrawLine, METH_VARARGS | METH_KEYWORDS, NULL},