X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c370783e915cbf999619624ee6a082e99b028981..56a52e909411904736e41258c39f306d218d84d5:/wxPython/src/mac/_gdi_wrap.cpp diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp index 61c27dce07..8cbaa377a7 100644 --- a/wxPython/src/mac/_gdi_wrap.cpp +++ b/wxPython/src/mac/_gdi_wrap.cpp @@ -621,11 +621,12 @@ SWIG_Check_int(PyObject* obj) } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { - o2 = target; - target = PyTuple_New(1); - PyTuple_SetItem(target, 0, o2); - + } 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); @@ -635,7 +636,7 @@ SWIG_Check_int(PyObject* obj) Py_DECREF(o3); } return target; -} + } PyObject *wxPen_GetDashes(wxPen *self){ @@ -670,8 +671,8 @@ void wxPen__SetDashes(wxPen *self,PyObject *_self,PyObject *pyDashes){ Py_DECREF(strDashes); wxPyEndBlockThreads(blocked); } -bool wxPen___eq__(wxPen *self,wxPen const *other){ return other ? (*self == *other) : False; } -bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*self != *other) : True; } +bool wxPen___eq__(wxPen *self,wxPen const *other){ return other ? (*self == *other) : false; } +bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*self != *other) : true; } SWIGSTATICINLINE(int) SWIG_AsVal_short(PyObject *obj, short *val) @@ -768,8 +769,8 @@ void wxBitmap_SetSize(wxBitmap *self,wxSize const &size){ self->SetWidth(size.x); self->SetHeight(size.y); } -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; } +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); @@ -841,7 +842,7 @@ SWIG_Check_long(PyObject* obj) wxCursor *new_wxCursor(wxString const *cursorName,long type,int hotSpotX,int hotSpotY){ #ifdef __WXGTK__ - wxCHECK_MSG(False, NULL, + wxCHECK_MSG(false, NULL, wxT("wx.Cursor constructor not implemented for wxGTK, use wx.StockCursor, wx.CursorFromImage, or wx.CursorFromBits instead.")); #else return new wxCursor(*cursorName, type, hotSpotX, hotSpotY); @@ -889,8 +890,13 @@ wxFont *new_wxFont(wxString const &info){ wxFont *new_wxFont(int pointSize,wxFontFamily family,int flags,wxString const &face,wxFontEncoding encoding){ return wxFont::New(pointSize, family, flags, face, encoding); } -bool wxFont___eq__(wxFont *self,wxFont const *other){ return other ? (*self == *other) : False; } -bool wxFont___ne__(wxFont *self,wxFont const *other){ return other ? (*self != *other) : True; } +wxFont *new_wxFont(wxSize const &pixelSize,int family,int style,int weight,bool underlined,wxString const &face,wxFontEncoding encoding){ + return wxFontBase::New(pixelSize, family, + style, weight, underlined, + face, encoding); + } +bool wxFont___eq__(wxFont *self,wxFont const *other){ return other ? (*self == *other) : false; } +bool wxFont___ne__(wxFont *self,wxFont const *other){ return other ? (*self != *other) : true; } class wxPyFontEnumerator : public wxFontEnumerator { public: @@ -922,12 +928,38 @@ PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){ return PyList_New(0); } +#include wxLocale *new_wxLocale(int language,int flags){ + wxLocale* loc; if (language == -1) - return new wxLocale(); + loc = new wxLocale(); else - return new wxLocale(language, flags); + loc = new wxLocale(language, flags); + // Python before 2.4 needs to have LC_NUMERIC set to "C" in order + // for the floating point conversions and such to work right. +#if PY_VERSION_HEX < 0x02040000 + setlocale(LC_NUMERIC, "C"); +#endif + return loc; + } +bool wxLocale_Init1(wxLocale *self,wxString const &szName,wxString const &szShort,wxString const &szLocale,bool bLoadDefault,bool bConvertEncoding){ + bool rc = self->Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding); + // Python before 2.4 needs to have LC_NUMERIC set to "C" in order + // for the floating point conversions and such to work right. +#if PY_VERSION_HEX < 0x02040000 + setlocale(LC_NUMERIC, "C"); +#endif + return rc; + } +bool wxLocale_Init2(wxLocale *self,int language,int flags){ + bool rc = self->Init(language, flags); + // Python before 2.4 needs to have LC_NUMERIC set to "C" in order + // for the floating point conversions and such to work right. +#if PY_VERSION_HEX < 0x02040000 + setlocale(LC_NUMERIC, "C"); +#endif + return rc; } #include "wx/wxPython/pydrawxxx.h" @@ -1239,7 +1271,7 @@ static PyObject *_wrap_new_NamedColour(PyObject *, PyObject *args, PyObject *kwa PyObject *resultobj; wxString *arg1 = 0 ; wxColour *result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "colorName", NULL @@ -1249,7 +1281,7 @@ static PyObject *_wrap_new_NamedColour(PyObject *, PyObject *args, PyObject *kwa { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } { if (!wxPyCheckForApp()) SWIG_fail; @@ -1501,7 +1533,7 @@ static PyObject *_wrap_Colour_SetFromName(PyObject *, PyObject *args, PyObject * PyObject *resultobj; wxColour *arg1 = (wxColour *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -1514,7 +1546,7 @@ static PyObject *_wrap_Colour_SetFromName(PyObject *, PyObject *args, PyObject * { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1845,6 +1877,32 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *, PyObject *args, PyObject *kwar } +static PyObject *_wrap_Palette_GetColoursCount(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPalette *arg1 = (wxPalette *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Palette_GetColoursCount",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPalette, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxPalette const *)arg1)->GetColoursCount(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int((int)result); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Palette_Ok(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPalette *arg1 = (wxPalette *) 0 ; @@ -2662,6 +2720,34 @@ static PyObject *_wrap_Brush_GetStipple(PyObject *, PyObject *args, PyObject *kw } +static PyObject *_wrap_Brush_IsHatch(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBrush *arg1 = (wxBrush *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Brush_IsHatch",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxBrush const *)arg1)->IsHatch(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Brush_Ok(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBrush *arg1 = (wxBrush *) 0 ; @@ -2757,7 +2843,7 @@ static PyObject *_wrap_new_Bitmap(PyObject *, PyObject *args, PyObject *kwargs) wxString *arg1 = 0 ; int arg2 = (int) wxBITMAP_TYPE_ANY ; wxBitmap *result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -2768,7 +2854,7 @@ static PyObject *_wrap_new_Bitmap(PyObject *, PyObject *args, PyObject *kwargs) { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } if (obj1) { arg2 = (int)SWIG_As_int(obj1); @@ -3292,7 +3378,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *, PyObject *args, PyObject *kwa int arg3 ; wxPalette *arg4 = (wxPalette *) NULL ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -3307,7 +3393,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *, PyObject *args, PyObject *kwa { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; @@ -3345,7 +3431,7 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *, PyObject *args, PyObject *kwa wxString *arg2 = 0 ; int arg3 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -3359,7 +3445,7 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *, PyObject *args, PyObject *kwa { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; @@ -3387,6 +3473,32 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *, PyObject *args, PyObject *kwa } +static PyObject *_wrap_Bitmap_GetPalette(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBitmap *arg1 = (wxBitmap *) 0 ; + wxPalette *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetPalette",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxPalette *)((wxBitmap const *)arg1)->GetPalette(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPalette, 0); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Bitmap_CopyFromIcon(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBitmap *arg1 = (wxBitmap *) 0 ; @@ -3670,7 +3782,7 @@ static PyObject *_wrap_new_Icon(PyObject *, PyObject *args, PyObject *kwargs) { int arg3 = (int) -1 ; int arg4 = (int) -1 ; wxIcon *result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -3683,7 +3795,7 @@ static PyObject *_wrap_new_Icon(PyObject *, PyObject *args, PyObject *kwargs) { { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; @@ -4095,7 +4207,7 @@ static PyObject *_wrap_new_IconLocation(PyObject *, PyObject *args, PyObject *kw wxString *arg1 = (wxString *) &wxPyEmptyString ; int arg2 = (int) 0 ; wxIconLocation *result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -4107,7 +4219,7 @@ static PyObject *_wrap_new_IconLocation(PyObject *, PyObject *args, PyObject *kw { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } } if (obj1) { @@ -4193,7 +4305,7 @@ static PyObject *_wrap_IconLocation_SetFileName(PyObject *, PyObject *args, PyOb PyObject *resultobj; wxIconLocation *arg1 = (wxIconLocation *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -4206,7 +4318,7 @@ static PyObject *_wrap_IconLocation_SetFileName(PyObject *, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4354,7 +4466,7 @@ static PyObject *_wrap_new_IconBundleFromFile(PyObject *, PyObject *args, PyObje wxString *arg1 = 0 ; long arg2 ; wxIconBundle *result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -4365,7 +4477,7 @@ static PyObject *_wrap_new_IconBundleFromFile(PyObject *, PyObject *args, PyObje { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } arg2 = (long)SWIG_As_long(obj1); if (PyErr_Occurred()) SWIG_fail; @@ -4486,7 +4598,7 @@ static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *, PyObject *args, Py wxIconBundle *arg1 = (wxIconBundle *) 0 ; wxString *arg2 = 0 ; long arg3 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -4500,7 +4612,7 @@ static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } arg3 = (long)SWIG_As_long(obj2); if (PyErr_Occurred()) SWIG_fail; @@ -4579,7 +4691,7 @@ static PyObject *_wrap_new_Cursor(PyObject *, PyObject *args, PyObject *kwargs) int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxCursor *result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -4592,7 +4704,7 @@ static PyObject *_wrap_new_Cursor(PyObject *, PyObject *args, PyObject *kwargs) { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } arg2 = (long)SWIG_As_long(obj1); if (PyErr_Occurred()) SWIG_fail; @@ -4962,6 +5074,42 @@ static PyObject *_wrap_Region_Clear(PyObject *, PyObject *args, PyObject *kwargs } +static PyObject *_wrap_Region_Offset(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRegion *arg1 = (wxRegion *) 0 ; + int arg2 ; + int arg3 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "x",(char *) "y", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Region_Offset",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int)SWIG_As_int(obj2); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Offset(arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Region_Contains(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegion *arg1 = (wxRegion *) 0 ; @@ -6614,7 +6762,7 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *, PyObject *args, PyO wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6627,7 +6775,7 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6722,7 +6870,7 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *, PyObject *args, wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6735,7 +6883,7 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6804,7 +6952,7 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *, PyObject *arg PyObject *resultobj; wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ; wxString *arg2 = (wxString *) 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6817,7 +6965,7 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *, PyObject *arg { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (arg1) (arg1)->facename = *arg2; @@ -6960,7 +7108,7 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *, PyObject *args, wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6973,7 +7121,7 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7196,9 +7344,9 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *, PyObject *args, PyObject *resultobj; wxFontMapper *arg1 = (wxFontMapper *) 0 ; wxString *arg2 = 0 ; - bool arg3 = (bool) True ; + bool arg3 = (bool) true ; int result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -7212,7 +7360,7 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { arg3 = (bool)SWIG_As_bool(obj2); @@ -7356,7 +7504,7 @@ static PyObject *_wrap_FontMapper_GetEncodingFromName(PyObject *, PyObject *args PyObject *resultobj; wxString *arg1 = 0 ; int result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name", NULL @@ -7366,7 +7514,7 @@ static PyObject *_wrap_FontMapper_GetEncodingFromName(PyObject *, PyObject *args { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7423,7 +7571,7 @@ static PyObject *_wrap_FontMapper_SetConfigPath(PyObject *, PyObject *args, PyOb PyObject *resultobj; wxFontMapper *arg1 = (wxFontMapper *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7436,7 +7584,7 @@ static PyObject *_wrap_FontMapper_SetConfigPath(PyObject *, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7494,9 +7642,9 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *, PyObject *args, int arg2 ; wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; - bool arg4 = (bool) True ; + bool arg4 = (bool) true ; PyObject *result; - bool temp3 = False ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -7514,7 +7662,7 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *, PyObject *args, { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } if (obj3) { @@ -7550,7 +7698,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *, PyObject *args wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; bool result; - bool temp3 = False ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -7567,7 +7715,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *, PyObject *args { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } { @@ -7627,7 +7775,7 @@ static PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *, PyObject *args, PyO PyObject *resultobj; wxFontMapper *arg1 = (wxFontMapper *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7640,7 +7788,7 @@ static PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7677,12 +7825,12 @@ static PyObject *_wrap_new_Font(PyObject *, PyObject *args, PyObject *kwargs) { int arg2 ; int arg3 ; int arg4 ; - bool arg5 = (bool) False ; + bool arg5 = (bool) false ; wxString const &arg6_defvalue = wxPyEmptyString ; wxString *arg6 = (wxString *) &arg6_defvalue ; int arg7 = (int) wxFONTENCODING_DEFAULT ; wxFont *result; - bool temp6 = False ; + bool temp6 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -7711,7 +7859,7 @@ static PyObject *_wrap_new_Font(PyObject *, PyObject *args, PyObject *kwargs) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = True; + temp6 = true; } } if (obj6) { @@ -7802,7 +7950,7 @@ static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *, PyObject *args, PyObject *resultobj; wxString *arg1 = 0 ; wxFont *result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "info", NULL @@ -7812,7 +7960,7 @@ static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *, PyObject *args, { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } { if (!wxPyCheckForApp()) SWIG_fail; @@ -7846,7 +7994,7 @@ static PyObject *_wrap_new_Font2(PyObject *, PyObject *args, PyObject *kwargs) { wxString *arg4 = (wxString *) &arg4_defvalue ; int arg5 = (int) wxFONTENCODING_DEFAULT ; wxFont *result; - bool temp4 = False ; + bool temp4 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -7869,7 +8017,7 @@ static PyObject *_wrap_new_Font2(PyObject *, PyObject *args, PyObject *kwargs) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = True; + temp4 = true; } } if (obj4) { @@ -7899,6 +8047,79 @@ static PyObject *_wrap_new_Font2(PyObject *, PyObject *args, PyObject *kwargs) { } +static PyObject *_wrap_new_FontFromPixelSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxSize *arg1 = 0 ; + int arg2 ; + int arg3 ; + int arg4 ; + bool arg5 = (bool) false ; + wxString const &arg6_defvalue = wxEmptyString ; + wxString *arg6 = (wxString *) &arg6_defvalue ; + int arg7 = (int) wxFONTENCODING_DEFAULT ; + wxFont *result; + wxSize temp1 ; + bool temp6 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char *kwnames[] = { + (char *) "pixelSize",(char *) "family",(char *) "style",(char *) "weight",(char *) "underlined",(char *) "face",(char *) "encoding", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:new_FontFromPixelSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + { + arg1 = &temp1; + if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail; + } + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int)SWIG_As_int(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int)SWIG_As_int(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (bool)SWIG_As_bool(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = wxString_in_helper(obj5); + if (arg6 == NULL) SWIG_fail; + temp6 = true; + } + } + if (obj6) { + arg7 = (int)SWIG_As_int(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxFont *)new_wxFont((wxSize const &)*arg1,arg2,arg3,arg4,arg5,(wxString const &)*arg6,(wxFontEncoding )arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 1); + { + if (temp6) + delete arg6; + } + return resultobj; + fail: + { + if (temp6) + delete arg6; + } + return NULL; +} + + static PyObject *_wrap_Font_Ok(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; @@ -8017,6 +8238,64 @@ static PyObject *_wrap_Font_GetPointSize(PyObject *, PyObject *args, PyObject *k } +static PyObject *_wrap_Font_GetPixelSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFont *arg1 = (wxFont *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetPixelSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxFont const *)arg1)->GetPixelSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Font_IsUsingSizeInPixels(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFont *arg1 = (wxFont *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_IsUsingSizeInPixels",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxFont const *)arg1)->IsUsingSizeInPixels(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Font_GetFamily(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; @@ -8328,6 +8607,38 @@ static PyObject *_wrap_Font_SetPointSize(PyObject *, PyObject *args, PyObject *k } +static PyObject *_wrap_Font_SetPixelSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFont *arg1 = (wxFont *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pixelSize", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetPixelSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetPixelSize((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Font_SetFamily(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; @@ -8419,7 +8730,7 @@ static PyObject *_wrap_Font_SetFaceName(PyObject *, PyObject *args, PyObject *kw PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8432,7 +8743,7 @@ static PyObject *_wrap_Font_SetFaceName(PyObject *, PyObject *args, PyObject *kw { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8552,7 +8863,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *, PyObject *ar PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8565,7 +8876,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *, PyObject *ar { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8593,7 +8904,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *, PyObject *args PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; wxString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8606,7 +8917,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *, PyObject *args { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8729,7 +9040,7 @@ static PyObject *_wrap_Font_GetWeightString(PyObject *, PyObject *args, PyObject static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; - bool arg2 = (bool) True ; + bool arg2 = (bool) true ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8928,7 +9239,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *, PyObject *a PyObject *resultobj; wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ; int arg2 = (int) wxFONTENCODING_SYSTEM ; - bool arg3 = (bool) False ; + bool arg3 = (bool) false ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -8970,7 +9281,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *, PyObject *a wxString const &arg2_defvalue = wxPyEmptyString ; wxString *arg2 = (wxString *) &arg2_defvalue ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8984,7 +9295,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *, PyObject *a { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } } { @@ -9119,7 +9430,7 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *, PyObject *args PyObject *resultobj; wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; wxString *arg2 = (wxString *) 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9132,7 +9443,7 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *, PyObject *args { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (arg1) (arg1)->CanonicalName = *arg2; @@ -9182,7 +9493,7 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *, PyObject *args, PyObject *resultobj; wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; wxString *arg2 = (wxString *) 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9195,7 +9506,7 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (arg1) (arg1)->Description = *arg2; @@ -9315,12 +9626,12 @@ static PyObject *_wrap_Locale_Init1(PyObject *, PyObject *args, PyObject *kwargs wxString *arg3 = (wxString *) &arg3_defvalue ; wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; - bool arg5 = (bool) True ; - bool arg6 = (bool) False ; + bool arg5 = (bool) true ; + bool arg6 = (bool) false ; bool result; - bool temp2 = False ; - bool temp3 = False ; - bool temp4 = False ; + bool temp2 = false ; + bool temp3 = false ; + bool temp4 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -9337,20 +9648,20 @@ static PyObject *_wrap_Locale_Init1(PyObject *, PyObject *args, PyObject *kwargs { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = True; + temp4 = true; } } if (obj4) { @@ -9363,7 +9674,7 @@ static PyObject *_wrap_Locale_Init1(PyObject *, PyObject *args, PyObject *kwargs } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Init((wxString const &)*arg2,(wxString const &)*arg3,(wxString const &)*arg4,arg5,arg6); + result = (bool)wxLocale_Init1(arg1,(wxString const &)*arg2,(wxString const &)*arg3,(wxString const &)*arg4,arg5,arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -9427,7 +9738,7 @@ static PyObject *_wrap_Locale_Init2(PyObject *, PyObject *args, PyObject *kwargs } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Init(arg2,arg3); + result = (bool)wxLocale_Init2(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -9666,7 +9977,7 @@ static PyObject *_wrap_Locale_GetCanonicalName(PyObject *, PyObject *args, PyObj static PyObject *_wrap_Locale_AddCatalogLookupPathPrefix(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "prefix", NULL @@ -9676,7 +9987,7 @@ static PyObject *_wrap_Locale_AddCatalogLookupPathPrefix(PyObject *, PyObject *a { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9705,7 +10016,7 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *, PyObject *args, PyObject *k wxLocale *arg1 = (wxLocale *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9718,7 +10029,7 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *, PyObject *args, PyObject *k { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9749,7 +10060,7 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *, PyObject *args, PyObject *kwa wxLocale *arg1 = (wxLocale *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9762,7 +10073,7 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *, PyObject *args, PyObject *kwa { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9850,7 +10161,7 @@ static PyObject *_wrap_Locale_FindLanguageInfo(PyObject *, PyObject *args, PyObj PyObject *resultobj; wxString *arg1 = 0 ; wxLanguageInfo *result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "locale", NULL @@ -9860,7 +10171,7 @@ static PyObject *_wrap_Locale_FindLanguageInfo(PyObject *, PyObject *args, PyObj { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9921,8 +10232,8 @@ static PyObject *_wrap_Locale_GetString(PyObject *, PyObject *args, PyObject *kw wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; wxString result; - bool temp2 = False ; - bool temp3 = False ; + bool temp2 = false ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -9936,13 +10247,13 @@ static PyObject *_wrap_Locale_GetString(PyObject *, PyObject *args, PyObject *kw { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } { @@ -10049,14 +10360,14 @@ static PyObject *_wrap_GetTranslation__SWIG_0(PyObject *, PyObject *args) { PyObject *resultobj; wxString *arg1 = 0 ; wxString result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:GetTranslation",&obj0)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10092,8 +10403,8 @@ static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *, PyObject *args) { wxString *arg2 = 0 ; size_t arg3 ; wxString result; - bool temp1 = False ; - bool temp2 = False ; + bool temp1 = false ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -10102,12 +10413,12 @@ static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *, PyObject *args) { { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); if (PyErr_Occurred()) SWIG_fail; @@ -10282,7 +10593,7 @@ static PyObject *_wrap_EncodingConverter_Convert(PyObject *, PyObject *args, PyO wxEncodingConverter *arg1 = (wxEncodingConverter *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10295,7 +10606,7 @@ static PyObject *_wrap_EncodingConverter_Convert(PyObject *, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11667,7 +11978,7 @@ static PyObject *_wrap_DC_DrawBitmap(PyObject *, PyObject *args, PyObject *kwarg wxBitmap *arg2 = 0 ; int arg3 ; int arg4 ; - bool arg5 = (bool) False ; + bool arg5 = (bool) false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11714,7 +12025,7 @@ static PyObject *_wrap_DC_DrawBitmapPoint(PyObject *, PyObject *args, PyObject * wxDC *arg1 = (wxDC *) 0 ; wxBitmap *arg2 = 0 ; wxPoint *arg3 = 0 ; - bool arg4 = (bool) False ; + bool arg4 = (bool) false ; wxPoint temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -11762,7 +12073,7 @@ static PyObject *_wrap_DC_DrawText(PyObject *, PyObject *args, PyObject *kwargs) wxString *arg2 = 0 ; int arg3 ; int arg4 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11777,7 +12088,7 @@ static PyObject *_wrap_DC_DrawText(PyObject *, PyObject *args, PyObject *kwargs) { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; @@ -11810,7 +12121,7 @@ static PyObject *_wrap_DC_DrawTextPoint(PyObject *, PyObject *args, PyObject *kw wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; wxPoint *arg3 = 0 ; - bool temp2 = False ; + bool temp2 = false ; wxPoint temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -11825,7 +12136,7 @@ static PyObject *_wrap_DC_DrawTextPoint(PyObject *, PyObject *args, PyObject *kw { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { arg3 = &temp3; @@ -11860,7 +12171,7 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *, PyObject *args, PyObject * int arg3 ; int arg4 ; double arg5 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11876,7 +12187,7 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *, PyObject *args, PyObject * { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; @@ -11912,7 +12223,7 @@ static PyObject *_wrap_DC_DrawRotatedTextPoint(PyObject *, PyObject *args, PyObj wxString *arg2 = 0 ; wxPoint *arg3 = 0 ; double arg4 ; - bool temp2 = False ; + bool temp2 = false ; wxPoint temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -11928,7 +12239,7 @@ static PyObject *_wrap_DC_DrawRotatedTextPoint(PyObject *, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { arg3 = &temp3; @@ -11969,7 +12280,7 @@ static PyObject *_wrap_DC_Blit(PyObject *, PyObject *args, PyObject *kwargs) { int arg7 ; int arg8 ; int arg9 = (int) wxCOPY ; - bool arg10 = (bool) False ; + bool arg10 = (bool) false ; int arg11 = (int) -1 ; int arg12 = (int) -1 ; bool result; @@ -12046,7 +12357,7 @@ static PyObject *_wrap_DC_BlitPointSize(PyObject *, PyObject *args, PyObject *kw wxDC *arg4 = (wxDC *) 0 ; wxPoint *arg5 = 0 ; int arg6 = (int) wxCOPY ; - bool arg7 = (bool) False ; + bool arg7 = (bool) false ; wxPoint const &arg8_defvalue = wxDefaultPosition ; wxPoint *arg8 = (wxPoint *) &arg8_defvalue ; bool result; @@ -12372,7 +12683,7 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *, PyObject *args, PyObject *kwargs wxRect *arg3 = 0 ; int arg4 = (int) wxALIGN_LEFT|wxALIGN_TOP ; int arg5 = (int) -1 ; - bool temp2 = False ; + bool temp2 = false ; wxRect temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -12389,7 +12700,7 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *, PyObject *args, PyObject *kwargs { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { arg3 = &temp3; @@ -12434,7 +12745,7 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *, PyObject *args, PyObject *k int arg5 = (int) wxALIGN_LEFT|wxALIGN_TOP ; int arg6 = (int) -1 ; wxRect result; - bool temp2 = False ; + bool temp2 = false ; wxRect temp4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -12452,7 +12763,7 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *, PyObject *args, PyObject *k { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0)) == -1) @@ -12567,7 +12878,7 @@ static PyObject *_wrap_DC_StartDoc(PyObject *, PyObject *args, PyObject *kwargs) wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -12580,7 +12891,7 @@ static PyObject *_wrap_DC_StartDoc(PyObject *, PyObject *args, PyObject *kwargs) { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13042,7 +13353,7 @@ static PyObject *_wrap_DC_GetTextExtent(PyObject *, PyObject *args, PyObject *kw wxString *arg2 = 0 ; int *arg3 = (int *) 0 ; int *arg4 = (int *) 0 ; - bool temp2 = False ; + bool temp2 = false ; int temp3 ; int res3 = 0 ; int temp4 ; @@ -13061,7 +13372,7 @@ static PyObject *_wrap_DC_GetTextExtent(PyObject *, PyObject *args, PyObject *kw { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13098,7 +13409,7 @@ static PyObject *_wrap_DC_GetFullTextExtent(PyObject *, PyObject *args, PyObject int *arg5 = (int *) 0 ; int *arg6 = (int *) 0 ; wxFont *arg7 = (wxFont *) NULL ; - bool temp2 = False ; + bool temp2 = false ; int temp3 ; int res3 = 0 ; int temp4 ; @@ -13124,7 +13435,7 @@ static PyObject *_wrap_DC_GetFullTextExtent(PyObject *, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { if ((SWIG_ConvertPtr(obj2,(void **)(&arg7),SWIGTYPE_p_wxFont, @@ -13168,7 +13479,7 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *, PyObject *args, PyO int *arg4 = (int *) 0 ; int *arg5 = (int *) 0 ; wxFont *arg6 = (wxFont *) NULL ; - bool temp2 = False ; + bool temp2 = false ; int temp3 ; int res3 = 0 ; int temp4 ; @@ -13191,7 +13502,7 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } if (obj2) { if ((SWIG_ConvertPtr(obj2,(void **)(&arg6),SWIGTYPE_p_wxFont, @@ -13230,7 +13541,7 @@ static PyObject *_wrap_DC_GetPartialTextExtents(PyObject *, PyObject *args, PyOb wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; wxArrayInt result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -13243,7 +13554,7 @@ static PyObject *_wrap_DC_GetPartialTextExtents(PyObject *, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14612,57 +14923,25 @@ static PyObject *_wrap_DC_SetLogicalFunction(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_DC_SetOptimization(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_ComputeScaleAndOrigin(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - bool arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "optimize", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetOptimization",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool)SWIG_As_bool(obj1); - if (PyErr_Occurred()) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetOptimization(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DC_GetOptimization(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxDC *arg1 = (wxDC *) 0 ; - bool result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetOptimization",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_ComputeScaleAndOrigin",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->GetOptimization(); + (arg1)->ComputeScaleAndOrigin(); 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; @@ -15874,7 +16153,7 @@ static PyObject *_wrap_new_MetaFile(PyObject *, PyObject *args, PyObject *kwargs wxString const &arg1_defvalue = wxPyEmptyString ; wxString *arg1 = (wxString *) &arg1_defvalue ; wxMetaFile *result; - bool temp1 = False ; + bool temp1 = false ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "filename", NULL @@ -15885,7 +16164,7 @@ static PyObject *_wrap_new_MetaFile(PyObject *, PyObject *args, PyObject *kwargs { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } } { @@ -16102,8 +16381,8 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *, PyObject *args, PyObject *kwar wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; wxMetaFileDC *result; - bool temp1 = False ; - bool temp4 = False ; + bool temp1 = false ; + bool temp4 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -16117,7 +16396,7 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *, PyObject *args, PyObject *kwar { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = True; + temp1 = true; } } if (obj1) { @@ -16132,7 +16411,7 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *, PyObject *args, PyObject *kwar { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = True; + temp4 = true; } } { @@ -16242,7 +16521,7 @@ static PyObject *_wrap_new_ImageList(PyObject *, PyObject *args, PyObject *kwarg PyObject *resultobj; int arg1 ; int arg2 ; - int arg3 = (int) True ; + int arg3 = (int) true ; int arg4 = (int) 1 ; wxImageList *result; PyObject * obj0 = 0 ; @@ -16481,7 +16760,7 @@ static PyObject *_wrap_ImageList_Draw(PyObject *, PyObject *args, PyObject *kwar int arg4 ; int arg5 ; int arg6 = (int) wxIMAGELIST_DRAW_NORMAL ; - bool arg7 = (bool) (bool)False ; + bool arg7 = (bool) (bool)false ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -17569,7 +17848,7 @@ static PyObject *_wrap_ColourDatabase_Find(PyObject *, PyObject *args, PyObject wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; wxString *arg2 = 0 ; wxColour result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17582,7 +17861,7 @@ static PyObject *_wrap_ColourDatabase_Find(PyObject *, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17654,7 +17933,7 @@ static PyObject *_wrap_ColourDatabase_AddColour(PyObject *, PyObject *args, PyOb wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; wxString *arg2 = 0 ; wxColour *arg3 = 0 ; - bool temp2 = False ; + bool temp2 = false ; wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -17669,7 +17948,7 @@ static PyObject *_wrap_ColourDatabase_AddColour(PyObject *, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } { arg3 = &temp3; @@ -17704,7 +17983,7 @@ static PyObject *_wrap_ColourDatabase_Append(PyObject *, PyObject *args, PyObjec int arg3 ; int arg4 ; int arg5 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -17720,7 +17999,7 @@ static PyObject *_wrap_ColourDatabase_Append(PyObject *, PyObject *args, PyObjec { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; @@ -17793,12 +18072,12 @@ static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *, PyObject *args, PyO int arg3 ; int arg4 ; int arg5 ; - bool arg6 = (bool) False ; + bool arg6 = (bool) false ; wxString const &arg7_defvalue = wxPyEmptyString ; wxString *arg7 = (wxString *) &arg7_defvalue ; int arg8 = (int) wxFONTENCODING_DEFAULT ; wxFont *result; - bool temp7 = False ; + bool temp7 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -17830,7 +18109,7 @@ static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *, PyObject *args, PyO { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = True; + temp7 = true; } } if (obj7) { @@ -18504,6 +18783,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_Palette", (PyCFunction) _wrap_delete_Palette, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Palette_GetPixel", (PyCFunction) _wrap_Palette_GetPixel, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Palette_GetRGB", (PyCFunction) _wrap_Palette_GetRGB, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Palette_GetColoursCount", (PyCFunction) _wrap_Palette_GetColoursCount, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Palette_Ok", (PyCFunction) _wrap_Palette_Ok, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Palette_swigregister", Palette_swigregister, METH_VARARGS, NULL }, { (char *)"new_Pen", (PyCFunction) _wrap_new_Pen, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -18533,6 +18813,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Brush_GetColour", (PyCFunction) _wrap_Brush_GetColour, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Brush_GetStyle", (PyCFunction) _wrap_Brush_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Brush_GetStipple", (PyCFunction) _wrap_Brush_GetStipple, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Brush_IsHatch", (PyCFunction) _wrap_Brush_IsHatch, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Brush_Ok", (PyCFunction) _wrap_Brush_Ok, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Brush_MacGetTheme", (PyCFunction) _wrap_Brush_MacGetTheme, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Brush_MacSetTheme", (PyCFunction) _wrap_Brush_MacSetTheme, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -18556,6 +18837,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Bitmap_GetSubBitmap", (PyCFunction) _wrap_Bitmap_GetSubBitmap, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Bitmap_SaveFile", (PyCFunction) _wrap_Bitmap_SaveFile, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Bitmap_LoadFile", (PyCFunction) _wrap_Bitmap_LoadFile, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Bitmap_GetPalette", (PyCFunction) _wrap_Bitmap_GetPalette, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Bitmap_CopyFromIcon", (PyCFunction) _wrap_Bitmap_CopyFromIcon, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Bitmap_SetHeight", (PyCFunction) _wrap_Bitmap_SetHeight, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Bitmap_SetWidth", (PyCFunction) _wrap_Bitmap_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -18609,6 +18891,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_RegionFromPoints", (PyCFunction) _wrap_new_RegionFromPoints, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"delete_Region", (PyCFunction) _wrap_delete_Region, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Region_Clear", (PyCFunction) _wrap_Region_Clear, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Region_Offset", (PyCFunction) _wrap_Region_Offset, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Region_Contains", (PyCFunction) _wrap_Region_Contains, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Region_ContainsPoint", (PyCFunction) _wrap_Region_ContainsPoint, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Region_ContainsRect", (PyCFunction) _wrap_Region_ContainsRect, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -18703,10 +18986,13 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_FontFromNativeInfo", (PyCFunction) _wrap_new_FontFromNativeInfo, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"new_FontFromNativeInfoString", (PyCFunction) _wrap_new_FontFromNativeInfoString, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"new_Font2", (PyCFunction) _wrap_new_Font2, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"new_FontFromPixelSize", (PyCFunction) _wrap_new_FontFromPixelSize, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_Ok", (PyCFunction) _wrap_Font_Ok, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font___eq__", (PyCFunction) _wrap_Font___eq__, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font___ne__", (PyCFunction) _wrap_Font___ne__, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetPointSize", (PyCFunction) _wrap_Font_GetPointSize, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Font_GetPixelSize", (PyCFunction) _wrap_Font_GetPixelSize, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Font_IsUsingSizeInPixels", (PyCFunction) _wrap_Font_IsUsingSizeInPixels, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetFamily", (PyCFunction) _wrap_Font_GetFamily, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetStyle", (PyCFunction) _wrap_Font_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetWeight", (PyCFunction) _wrap_Font_GetWeight, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -18718,6 +19004,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Font_GetNativeFontInfoDesc", (PyCFunction) _wrap_Font_GetNativeFontInfoDesc, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetNativeFontInfoUserDesc", (PyCFunction) _wrap_Font_GetNativeFontInfoUserDesc, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_SetPointSize", (PyCFunction) _wrap_Font_SetPointSize, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Font_SetPixelSize", (PyCFunction) _wrap_Font_SetPixelSize, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_SetFamily", (PyCFunction) _wrap_Font_SetFamily, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_SetStyle", (PyCFunction) _wrap_Font_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_SetWeight", (PyCFunction) _wrap_Font_SetWeight, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -18894,8 +19181,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"DC_SetAxisOrientation", (PyCFunction) _wrap_DC_SetAxisOrientation, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"DC_GetLogicalFunction", (PyCFunction) _wrap_DC_GetLogicalFunction, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"DC_SetLogicalFunction", (PyCFunction) _wrap_DC_SetLogicalFunction, METH_VARARGS | METH_KEYWORDS, NULL }, - { (char *)"DC_SetOptimization", (PyCFunction) _wrap_DC_SetOptimization, METH_VARARGS | METH_KEYWORDS, NULL }, - { (char *)"DC_GetOptimization", (PyCFunction) _wrap_DC_GetOptimization, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"DC_ComputeScaleAndOrigin", (PyCFunction) _wrap_DC_ComputeScaleAndOrigin, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"DC_CalcBoundingBox", (PyCFunction) _wrap_DC_CalcBoundingBox, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"DC_CalcBoundingBoxPoint", (PyCFunction) _wrap_DC_CalcBoundingBoxPoint, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"DC_ResetBoundingBox", (PyCFunction) _wrap_DC_ResetBoundingBox, METH_VARARGS | METH_KEYWORDS, NULL },