X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2abc0a0f9bf1a1c4fb3e807be687850949603e5c..3af4e610b182d2aeb504bdeeef8b44cb1279f28e:/utils/wxPython/src/misc2.i

diff --git a/utils/wxPython/src/misc2.i b/utils/wxPython/src/misc2.i
index b5064caa19..6f1d507e0a 100644
--- a/utils/wxPython/src/misc2.i
+++ b/utils/wxPython/src/misc2.i
@@ -19,9 +19,7 @@
 #include <wx/resource.h>
 #include <wx/tooltip.h>
 #include <wx/caret.h>
-#ifdef NOT_READY_YET
 #include <wx/fontenum.h>
-#endif
 %}
 
 //----------------------------------------------------------------------
@@ -34,6 +32,7 @@
 %import windows.i
 %import misc.i
 %import gdi.i
+%import events.i
 
 //---------------------------------------------------------------------------
 // Dialog Functions
@@ -292,7 +291,6 @@ public:
 %}
 
 //----------------------------------------------------------------------
-#ifdef NOT_READY_YET
 
 %{
 class wxPyFontEnumerator : public wxFontEnumerator {
@@ -300,34 +298,49 @@ public:
     wxPyFontEnumerator() {}
     ~wxPyFontEnumerator() {}
 
-    bool EnumerateFamilies(int fixedWidthOnly = FALSE);
-    bool EnumerateEncodings(const char* family = "");
-
-    DEC_PYCALLBACK_BOOL_STRING(OnFontFamily);
+    DEC_PYCALLBACK_BOOL_STRING(OnFacename);
     DEC_PYCALLBACK_BOOL_STRINGSTRING(OnFontEncoding);
 
     PYPRIVATE;
 };
 
-IMP_PYCALLBACK_BOOL_STRING(wxPyFontEnumerator, wxFontEnumerator, OnFontFamily);
+IMP_PYCALLBACK_BOOL_STRING(wxPyFontEnumerator, wxFontEnumerator, OnFacename);
 IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEncoding);
 
 %}
 
 %name(wxFontEnumerator) class wxPyFontEnumerator {
 public:
-    wxPyFontEnumerator() {}
-    ~wxPyFontEnumerator() {}
+    wxPyFontEnumerator();
+    ~wxPyFontEnumerator();
+    void _setSelf(PyObject* self);
     %pragma(python) addtomethod = "__init__:self._setSelf(self)"
 
-    bool EnumerateFamilies(int fixedWidthOnly = FALSE);
-    bool EnumerateEncodings(const char* family = "");
-
-    bool base_OnFontFamily(const wxString& family);
-    bool base_OnFontEncoding(const wxString& family,
-                             const wxString& encoding);
+    bool EnumerateFacenames(
+        wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all
+        bool fixedWidthOnly = FALSE);
+    bool EnumerateEncodings(const char* facename = "");
+
+    //wxArrayString* GetEncodings();
+    //wxArrayString* GetFacenames();
+    %addmethods {
+        PyObject* GetEncodings() {
+            wxArrayString* arr = self->GetEncodings();
+            PyObject* list = PyList_New(0);
+            for (size_t x=0; x<arr->GetCount(); x++)
+                PyList_Append(list, PyString_FromString((*arr)[x]));
+            return list;
+        }
+
+        PyObject* GetFacenames() {
+            wxArrayString* arr = self->GetFacenames();
+            PyObject* list = PyList_New(0);
+            for (size_t x=0; x<arr->GetCount(); x++)
+                PyList_Append(list, PyString_FromString((*arr)[x]));
+            return list;
+        }
+    }
 };
-#endif
 
 //----------------------------------------------------------------------
 
@@ -337,7 +350,10 @@ public:
     ~wxBusyCursor();
 };
 
+//----------------------------------------------------------------------
 
+void wxPostEvent(wxEvtHandler *dest, wxEvent& event);
+void wxWakeUpIdle();
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------