X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b9048c56f0aa04b2adbb7813f9698abdda15184..b8c4ab9cbc8af96c28ae17f34998bd2a46757990:/wxPython/src/_stockobjs.i?ds=sidebyside diff --git a/wxPython/src/_stockobjs.i b/wxPython/src/_stockobjs.i index 12aa013492..b3227af463 100644 --- a/wxPython/src/_stockobjs.i +++ b/wxPython/src/_stockobjs.i @@ -19,6 +19,7 @@ // See also wxPy_ReinitStockObjects in helpers.cpp %immutable; +%threadWrapperOff; wxFont* const wxNORMAL_FONT; wxFont* const wxSMALL_FONT; @@ -69,6 +70,7 @@ const wxPalette wxNullPalette; const wxFont wxNullFont; const wxColour wxNullColour; +%threadWrapperOn; %mutable; @@ -91,7 +93,7 @@ class wxBrushList : public wxObject { public: void AddBrush(wxBrush *brush); - wxBrush * FindOrCreateBrush(const wxColour& colour, int style); + wxBrush * FindOrCreateBrush(const wxColour& colour, int style=wxSOLID); void RemoveBrush(wxBrush *brush); int GetCount(); @@ -99,6 +101,8 @@ public: //--------------------------------------------------------------------------- +MustHaveApp(wxColourDatabase); + class wxColourDatabase : public wxObject { public: wxColourDatabase(); @@ -126,7 +130,7 @@ public: void AddFont(wxFont* font); wxFont * FindOrCreateFont(int point_size, int family, int style, int weight, - bool underline = False, const wxString& facename = wxPyEmptyString, + bool underline = false, const wxString& facename = wxPyEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); void RemoveFont(wxFont *font);