added font encoding support

some more demos
some contributed items into the library
many little tweaks and such


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/src/misc2.i

@@ -18,6 +18,8 @@
 #include "helpers.h"
 #include <wx/resource.h>
 #include <wx/tooltip.h>
+#include <wx/caret.h>
+#include <wx/fontenum.h>
 %}
 
 //----------------------------------------------------------------------
@@ -28,6 +30,7 @@
 // Import some definitions of other classes, etc.
 %import _defs.i
 %import windows.i
+%import misc.i
 
 //----------------------------------------------------------------------
 
@@ -61,4 +64,74 @@ public:
 %}
 
 //----------------------------------------------------------------------
+
+class wxCaret {
+public:
+    wxCaret(wxWindow* window, const wxSize& size);
+    ~wxCaret();
+
+    bool IsOk();
+    bool IsVisible();
+    %name(GetPositionTuple)void GetPosition(int *OUTPUT, int *OUTPUT);
+    wxPoint GetPosition();
+    %name(GetSizeTuple)void GetSize(int *OUTPUT, int *OUTPUT);
+    wxSize GetSize();
+    wxWindow *GetWindow();
+    %name(MoveXY)void Move(int x, int y);
+    void Move(const wxPoint& pt);
+    void Show(int show = TRUE);
+    void Hide();
+    void OnSetFocus();
+    void OnKillFocus();
+};
+
+%inline %{
+    int wxCaret_GetBlinkTime() {
+        return wxCaret::GetBlinkTime();
+    }
+
+    void wxCaret_SetBlinkTime(int milliseconds) {
+        wxCaret::SetBlinkTime(milliseconds);
+    }
+%}
+
 //----------------------------------------------------------------------
+#ifdef NOT_READY_YET
+
+%{
+class wxPyFontEnumerator : public wxFontEnumerator {
+public:
+    wxPyFontEnumerator() {}
+    ~wxPyFontEnumerator() {}
+
+    bool EnumerateFamilies(int fixedWidthOnly = FALSE);
+    bool EnumerateEncodings(const char* family = "");
+
+    DEC_PYCALLBACK_BOOL_STRING(OnFontFamily);
+    DEC_PYCALLBACK_BOOL_STRINGSTRING(OnFontEncoding);
+
+    PYPRIVATE;
+};
+
+IMP_PYCALLBACK_BOOL_STRING(wxPyFontEnumerator, wxFontEnumerator, OnFontFamily);
+IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEncoding);
+
+%}
+
+%name(wxFontEnumerator) class wxPyFontEnumerator {
+public:
+    wxPyFontEnumerator() {}
+    ~wxPyFontEnumerator() {}
+    %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);
+};
+#endif
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
+