X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e63a44037515f18fc68b3d0bcc8c42d0dae3dcf..f07962f933088c85ae0776cd2e4aec4579d31ffa:/wxPython/src/gtk/_gdi_wrap.cpp diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp index c9e2ebdd7e..4a4b8cfd52 100644 --- a/wxPython/src/gtk/_gdi_wrap.cpp +++ b/wxPython/src/gtk/_gdi_wrap.cpp @@ -671,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; } #include @@ -724,8 +724,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); @@ -797,7 +797,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); @@ -845,8 +845,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: @@ -1216,7 +1221,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 @@ -1226,7 +1231,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; @@ -1478,7 +1483,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[] = { @@ -1491,7 +1496,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(); @@ -2705,7 +2710,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[] = { @@ -2716,7 +2721,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); @@ -3240,7 +3245,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 ; @@ -3255,7 +3260,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; @@ -3293,7 +3298,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 ; @@ -3307,7 +3312,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; @@ -3618,7 +3623,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 ; @@ -3631,7 +3636,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; @@ -3810,7 +3815,7 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *, PyObject *args, PyObject *kwarg wxString *arg2 = 0 ; int arg3 ; bool result; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -3824,7 +3829,7 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *, PyObject *args, PyObject *kwarg { 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; @@ -4091,7 +4096,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[] = { @@ -4103,7 +4108,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) { @@ -4189,7 +4194,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[] = { @@ -4202,7 +4207,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(); @@ -4350,7 +4355,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[] = { @@ -4361,7 +4366,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; @@ -4482,7 +4487,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 ; @@ -4496,7 +4501,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; @@ -4575,7 +4580,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 ; @@ -4588,7 +4593,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; @@ -6646,7 +6651,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[] = { @@ -6659,7 +6664,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(); @@ -6754,7 +6759,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[] = { @@ -6767,7 +6772,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(); @@ -6836,7 +6841,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[] = { @@ -6849,7 +6854,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; @@ -6992,7 +6997,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[] = { @@ -7005,7 +7010,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(); @@ -7228,9 +7233,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 ; @@ -7244,7 +7249,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); @@ -7388,7 +7393,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 @@ -7398,7 +7403,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(); @@ -7455,7 +7460,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[] = { @@ -7468,7 +7473,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(); @@ -7526,9 +7531,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 ; @@ -7546,7 +7551,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) { @@ -7582,7 +7587,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 ; @@ -7599,7 +7604,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *, PyObject *args { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } { @@ -7659,7 +7664,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[] = { @@ -7672,7 +7677,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(); @@ -7709,12 +7714,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 ; @@ -7743,7 +7748,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) { @@ -7834,7 +7839,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 @@ -7844,7 +7849,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; @@ -7878,7 +7883,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 ; @@ -7901,7 +7906,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) { @@ -7931,6 +7936,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 ; @@ -8049,6 +8127,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 ; @@ -8360,6 +8496,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 ; @@ -8451,7 +8619,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[] = { @@ -8464,7 +8632,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(); @@ -8584,7 +8752,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[] = { @@ -8597,7 +8765,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(); @@ -8625,7 +8793,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[] = { @@ -8638,7 +8806,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(); @@ -8761,7 +8929,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[] = { @@ -8960,7 +9128,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 ; @@ -9002,7 +9170,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[] = { @@ -9016,7 +9184,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *, PyObject *a { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = True; + temp2 = true; } } { @@ -9151,7 +9319,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[] = { @@ -9164,7 +9332,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; @@ -9214,7 +9382,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[] = { @@ -9227,7 +9395,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; @@ -9347,12 +9515,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 ; @@ -9369,20 +9537,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) { @@ -9698,7 +9866,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 @@ -9708,7 +9876,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(); @@ -9737,7 +9905,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[] = { @@ -9750,7 +9918,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(); @@ -9781,7 +9949,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[] = { @@ -9794,7 +9962,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(); @@ -9882,7 +10050,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 @@ -9892,7 +10060,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(); @@ -9953,8 +10121,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 ; @@ -9968,13 +10136,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; } } { @@ -10081,14 +10249,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(); @@ -10124,8 +10292,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 ; @@ -10134,12 +10302,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; @@ -10314,7 +10482,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[] = { @@ -10327,7 +10495,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(); @@ -11699,7 +11867,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 ; @@ -11746,7 +11914,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 ; @@ -11794,7 +11962,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 ; @@ -11809,7 +11977,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; @@ -11842,7 +12010,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 ; @@ -11857,7 +12025,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; @@ -11892,7 +12060,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 ; @@ -11908,7 +12076,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; @@ -11944,7 +12112,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 ; @@ -11960,7 +12128,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; @@ -12001,7 +12169,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; @@ -12078,7 +12246,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; @@ -12404,7 +12572,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 ; @@ -12421,7 +12589,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; @@ -12466,7 +12634,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 ; @@ -12484,7 +12652,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) @@ -12599,7 +12767,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[] = { @@ -12612,7 +12780,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(); @@ -13074,7 +13242,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 ; @@ -13093,7 +13261,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(); @@ -13130,7 +13298,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 ; @@ -13156,7 +13324,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, @@ -13200,7 +13368,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 ; @@ -13223,7 +13391,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, @@ -13262,7 +13430,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[] = { @@ -13275,7 +13443,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(); @@ -15906,7 +16074,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 @@ -15917,7 +16085,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; } } { @@ -15959,8 +16127,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 ; @@ -15974,7 +16142,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) { @@ -15989,7 +16157,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; } } { @@ -16073,7 +16241,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 ; @@ -16312,7 +16480,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 ; @@ -17400,7 +17568,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[] = { @@ -17413,7 +17581,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(); @@ -17485,7 +17653,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 ; @@ -17500,7 +17668,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; @@ -17535,7 +17703,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 ; @@ -17551,7 +17719,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; @@ -17624,12 +17792,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 ; @@ -17661,7 +17829,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) { @@ -18535,10 +18703,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 }, @@ -18550,6 +18721,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 },