X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f4c0a16186cae6d4a780b59314532fab473fb0b..377d47bdf192ca070bf2ba1cbdd8c8a3589073cf:/wxPython/src/msw/gdi_wrap.cpp?ds=sidebyside diff --git a/wxPython/src/msw/gdi_wrap.cpp b/wxPython/src/msw/gdi_wrap.cpp index cc646f523c..34429f3931 100644 --- a/wxPython/src/msw/gdi_wrap.cpp +++ b/wxPython/src/msw/gdi_wrap.cpp @@ -363,15 +363,30 @@ SWIG_CheckUnsignedLongInRange(unsigned long value, const char* type, } +SWIGSTATICINLINE(long) +SWIG_AsLong(PyObject * obj) +{ + if (PyNumber_Check(obj)) + return PyInt_AsLong(obj); + else { + PyObject* errmsg = PyString_FromFormat("Expected number, got %s", + obj->ob_type->tp_name); + PyErr_SetObject(PyExc_TypeError, errmsg); + Py_DECREF(errmsg); + return 0; + } +} + + SWIGSTATICINLINE(unsigned long) SWIG_AsUnsignedLong(PyObject * obj) { if (PyLong_Check(obj)) { return PyLong_AsUnsignedLong(obj); } else { - long i = PyInt_AsLong(obj); + long i = SWIG_AsLong(obj); if ( !PyErr_Occurred() && (i < 0)) { - PyErr_SetString(PyExc_TypeError, "negative value for unsigned type"); + PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type"); } return i; } @@ -464,13 +479,6 @@ SWIG_CheckLongInRange(long value, const char* type, } -SWIGSTATICINLINE(long) -SWIG_AsLong(PyObject * obj) -{ - return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); -} - - #if INT_MAX != LONG_MAX SWIGSTATICINLINE(int) SWIG_AsInt(PyObject *obj) @@ -526,11 +534,11 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject *wxPen_GetDashes(wxPen *self){ wxDash* dashes; int count = self->GetDashes(&dashes); - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyObject* retval = PyList_New(0); for (int x=0; xSetMask(mask); } +bool wxBitmap___eq__(wxBitmap *self,wxBitmap const *other){ return other ? (*self == *other) : False; } +bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? (*self != *other) : True; } wxMask *new_wxMask(wxBitmap const &bitmap,wxColour const &colour){ if ( !colour.Ok() ) return new wxMask(bitmap, *wxBLACK); @@ -751,17 +761,15 @@ wxColour wxDC_GetPixel(wxDC *self,wxPoint const &pt){ SWIGSTATICINLINE(double) SWIG_AsDouble(PyObject *obj) { - double val = (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : -#if HAVE_LONG_LONG - ((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); -#else - ((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); -#endif - if (PyErr_Occurred()) { - PyErr_Clear(); - PyErr_SetString(PyExc_TypeError, "a double is expected"); - } - return val; + if (PyNumber_Check(obj)) + return PyFloat_AsDouble(obj); + else { + PyObject* errmsg = PyString_FromFormat("Expected number, got %s", + obj->ob_type->tp_name); + PyErr_SetObject(PyExc_TypeError, errmsg); + Py_DECREF(errmsg); + return 0; + } } @@ -990,7 +998,9 @@ static PyObject *_wrap_GDIObject_GetVisible(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -1045,7 +1055,9 @@ static PyObject *_wrap_GDIObject_IsNull(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -1285,7 +1297,9 @@ static PyObject *_wrap_Colour_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -1451,7 +1465,9 @@ static PyObject *_wrap_Colour___eq__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -1484,7 +1500,9 @@ static PyObject *_wrap_Colour___ne__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -1683,7 +1701,9 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -1721,7 +1741,9 @@ static PyObject *_wrap_Palette_Ok(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -1954,7 +1976,9 @@ static PyObject *_wrap_Pen_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -2197,7 +2221,9 @@ static PyObject *_wrap_Pen___eq__(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -2227,7 +2253,9 @@ static PyObject *_wrap_Pen___ne__(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -2695,7 +2723,9 @@ static PyObject *_wrap_Brush_Ok(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3054,7 +3084,9 @@ static PyObject *_wrap_Bitmap_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3330,7 +3362,9 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -3376,7 +3410,9 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -3419,7 +3455,9 @@ static PyObject *_wrap_Bitmap_CopyFromIcon(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3541,7 +3579,9 @@ static PyObject *_wrap_Bitmap_CopyFromCursor(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3603,6 +3643,70 @@ static PyObject *_wrap_Bitmap_SetQuality(PyObject *self, PyObject *args, PyObjec } +static PyObject *_wrap_Bitmap___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBitmap *arg1 = (wxBitmap *) 0 ; + wxBitmap *arg2 = (wxBitmap *) 0 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "other", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap___eq__",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxBitmap___eq__(arg1,(wxBitmap const *)arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Bitmap___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBitmap *arg1 = (wxBitmap *) 0 ; + wxBitmap *arg2 = (wxBitmap *) 0 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "other", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap___ne__",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxBitmap___ne__(arg1,(wxBitmap const *)arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * Bitmap_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -3877,7 +3981,9 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -3966,7 +4072,9 @@ static PyObject *_wrap_Icon_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4301,7 +4409,9 @@ static PyObject *_wrap_IconLocation_IsOk(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4674,7 +4784,10 @@ static PyObject *_wrap_IconBundle_GetIcon(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIcon, 0); + { + wxIcon* resultptr = new wxIcon(*result); + resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxIcon, 1); + } return resultobj; fail: return NULL; @@ -4898,7 +5011,9 @@ static PyObject *_wrap_Cursor_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5320,7 +5435,9 @@ static PyObject *_wrap_Region_Offset(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5534,7 +5651,9 @@ static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5567,7 +5686,9 @@ static PyObject *_wrap_Region_IntersectRect(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5602,7 +5723,9 @@ static PyObject *_wrap_Region_IntersectRegion(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5628,7 +5751,9 @@ static PyObject *_wrap_Region_IsEmpty(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5670,7 +5795,9 @@ static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5703,7 +5830,9 @@ static PyObject *_wrap_Region_UnionRect(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5738,7 +5867,9 @@ static PyObject *_wrap_Region_UnionRegion(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5780,7 +5911,9 @@ static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5813,7 +5946,9 @@ static PyObject *_wrap_Region_SubtractRect(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5848,7 +5983,9 @@ static PyObject *_wrap_Region_SubtractRegion(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5890,7 +6027,9 @@ static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5923,7 +6062,9 @@ static PyObject *_wrap_Region_XorRect(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5958,7 +6099,9 @@ static PyObject *_wrap_Region_XorRegion(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6039,7 +6182,9 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6314,7 +6459,9 @@ static PyObject *_wrap_RegionIterator_HaveRects(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6390,7 +6537,9 @@ static PyObject *_wrap_RegionIterator___nonzero__(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6607,7 +6756,9 @@ static PyObject *_wrap_NativeFontInfo_GetUnderlined(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6932,7 +7083,9 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -7038,7 +7191,9 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -7274,7 +7429,9 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -7378,7 +7535,9 @@ static PyObject *_wrap_TestFontEncoding(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -7827,7 +7986,9 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp3) delete arg3; @@ -8162,7 +8323,9 @@ static PyObject *_wrap_Font_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -8192,7 +8355,9 @@ static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -8222,7 +8387,9 @@ static PyObject *_wrap_Font___ne__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -8352,7 +8519,9 @@ static PyObject *_wrap_Font_GetUnderlined(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -8462,7 +8631,9 @@ static PyObject *_wrap_Font_IsFixedWidth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -9010,7 +9181,9 @@ static PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -9184,7 +9357,9 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -9221,7 +9396,9 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -9593,7 +9770,9 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -9655,7 +9834,9 @@ static PyObject *_wrap_Locale_Init2(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -9753,7 +9934,9 @@ static PyObject *_wrap_Locale_IsOk(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -9946,7 +10129,9 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -9988,7 +10173,9 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -10483,7 +10670,9 @@ static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -10633,7 +10822,9 @@ static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -10762,7 +10953,9 @@ static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -10808,7 +11001,9 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12236,7 +12431,9 @@ static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12309,7 +12506,9 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12646,7 +12845,9 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -13886,7 +14087,9 @@ static PyObject *_wrap_DC_CanDrawBitmap(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13912,7 +14115,9 @@ static PyObject *_wrap_DC_CanGetTextExtent(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13994,7 +14199,9 @@ static PyObject *_wrap_DC_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -14049,7 +14256,10 @@ static PyObject *_wrap_DC_GetBackground(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 0); + { + wxBrush* resultptr = new wxBrush(*result); + resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBrush, 1); + } return resultobj; fail: return NULL; @@ -14078,7 +14288,10 @@ static PyObject *_wrap_DC_GetBrush(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 0); + { + wxBrush* resultptr = new wxBrush(*result); + resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBrush, 1); + } return resultobj; fail: return NULL; @@ -14107,7 +14320,10 @@ static PyObject *_wrap_DC_GetFont(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0); + { + wxFont* resultptr = new wxFont(*result); + resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxFont, 1); + } return resultobj; fail: return NULL; @@ -14136,7 +14352,10 @@ static PyObject *_wrap_DC_GetPen(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0); + { + wxPen* resultptr = new wxPen(*result); + resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxPen, 1); + } return resultobj; fail: return NULL; @@ -14804,7 +15023,9 @@ static PyObject *_wrap_DC_GetOptimization(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15635,7 +15856,9 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15667,7 +15890,9 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15693,7 +15918,9 @@ static PyObject *_wrap_ScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16081,7 +16308,9 @@ static PyObject *_wrap_MetaFile_Ok(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16119,7 +16348,9 @@ static PyObject *_wrap_MetaFile_SetClipboard(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16630,7 +16861,9 @@ static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16689,7 +16922,9 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16745,7 +16980,9 @@ static PyObject *_wrap_ImageList_Remove(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16771,7 +17008,9 @@ static PyObject *_wrap_ImageList_RemoveAll(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18619,7 +18858,9 @@ static PyObject *_wrap_Effects_TileBitmap(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18726,6 +18967,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"Bitmap_CopyFromCursor", (PyCFunction) _wrap_Bitmap_CopyFromCursor, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_GetQuality", (PyCFunction) _wrap_Bitmap_GetQuality, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_SetQuality", (PyCFunction) _wrap_Bitmap_SetQuality, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS }, { (char *)"new_Mask", (PyCFunction) _wrap_new_Mask, METH_VARARGS | METH_KEYWORDS }, { (char *)"Mask_swigregister", Mask_swigregister, METH_VARARGS },