fixed deadlock when calling wxPostEvent() from worker thread

[wxWidgets.git] / wxPython / src / _font.i

diff --git a/wxPython/src/_font.i b/wxPython/src/_font.i
index fe0746eecfe9649841617bea84e20b4c5a4475aa..ac507526bc41b8a27e0b8c99b2a5c0f0c9f99abd 100644 (file)
--- a/wxPython/src/_font.i
+++ b/wxPython/src/_font.i
@@ -278,6 +278,14 @@ public:
     // hopefully be understood by the user)
     bool FromUserString(const wxString& s);
     wxString ToUserString() const;
     // hopefully be understood by the user)
     bool FromUserString(const wxString& s);
     wxString ToUserString() const;

+    
+    %property(Encoding, GetEncoding, SetEncoding, doc="See `GetEncoding` and `SetEncoding`");
+    %property(FaceName, GetFaceName, SetFaceName, doc="See `GetFaceName` and `SetFaceName`");
+    %property(Family, GetFamily, SetFamily, doc="See `GetFamily` and `SetFamily`");
+    %property(PointSize, GetPointSize, SetPointSize, doc="See `GetPointSize` and `SetPointSize`");
+    %property(Style, GetStyle, SetStyle, doc="See `GetStyle` and `SetStyle`");
+    %property(Underlined, GetUnderlined, SetUnderlined, doc="See `GetUnderlined` and `SetUnderlined`");
+    %property(Weight, GetWeight, SetWeight, doc="See `GetWeight` and `SetWeight`");

 };
 
 
 };
 
 


@@ -648,9 +656,10 @@ the closest size is found using a binary search.
 
     // was the font successfully created?
     DocDeclStr(
 
     // was the font successfully created?
     DocDeclStr(

-        bool , Ok() const,
+        bool , IsOk() const,

         "Returns ``True`` if this font was successfully created.", "");    
         "Returns ``True`` if this font was successfully created.", "");    

-    %pythoncode { def __nonzero__(self): return self.Ok() }
+    %pythoncode { Ok = IsOk }
+    %pythoncode { def __nonzero__(self): return self.IsOk() }

 
     
     // comparison
 
     
     // comparison


@@ -852,11 +861,11 @@ MustHaveApp(wxPyFontEnumerator);
 %rename(FontEnumerator) wxPyFontEnumerator;
 class wxPyFontEnumerator {
 public:
 %rename(FontEnumerator) wxPyFontEnumerator;
 class wxPyFontEnumerator {
 public:

-    %pythonAppend wxPyFontEnumerator "self._setCallbackInfo(self, FontEnumerator, 0)"
+    %pythonAppend wxPyFontEnumerator setCallbackInfo(FontEnumerator)

 
     wxPyFontEnumerator();
     ~wxPyFontEnumerator();
 
     wxPyFontEnumerator();
     ~wxPyFontEnumerator();

-    void _setCallbackInfo(PyObject* self, PyObject* _class, bool incref);
+    void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=0);

 
     bool EnumerateFacenames(
         wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all
 
     bool EnumerateFacenames(
         wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all