wxScreenDC also needs a pango context and layout so it can do GetTextExtent

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

diff --git a/wxPython/src/_font.i b/wxPython/src/_font.i
index 2d8e25b56c18adf331dbc5c6f479882fc57969b4..bd059a236e3e7cbd14e8bc7091c1bece9288f81d 100644 (file)
--- a/wxPython/src/_font.i
+++ b/wxPython/src/_font.i
@@ -118,7 +118,8 @@ enum wxFontEncoding
     wxFONTENCODING_ISO8859_MAX,
 
     // Cyrillic charset soup (see http://czyborra.com/charsets/cyrillic.html)
-    wxFONTENCODING_KOI8,            // we don't support any of KOI8 variants
+    wxFONTENCODING_KOI8,            // KOI8 Russian
+    wxFONTENCODING_KOI8_U,          // KOI8 Ukrainian
     wxFONTENCODING_ALTERNATIVE,     // same as MS-DOS CP866
     wxFONTENCODING_BULGARIAN,       // used under Linux in Bulgaria
 
@@ -153,13 +154,49 @@ enum wxFontEncoding
     wxFONTENCODING_UTF32BE,         // UTF-32 Big Endian Unicode encoding
     wxFONTENCODING_UTF32LE,         // UTF-32 Little Endian Unicode encoding
 
-    wxFONTENCODING_MACROMAN,        // Mac Roman encoding
-    wxFONTENCODING_MACCENTRALEUR,   // Mac Roman Central Europe encoding
-    wxFONTENCODING_MACHEBREW,       // Mac Hebrew encoding
-    wxFONTENCODING_MACGREEK,        // Mac Greek encoding
-    wxFONTENCODING_MACARABIC,       // Mac Arabic encoding
-    wxFONTENCODING_MACTURKISH,      // Mac Turkish encoding
-    wxFONTENCODING_MACCYRILLIC,     // Mac Cyrillic encoding
+    wxFONTENCODING_MACROMAN,        // the standard mac encodings
+    wxFONTENCODING_MACJAPANESE,      
+    wxFONTENCODING_MACCHINESETRAD,   
+    wxFONTENCODING_MACKOREAN,       
+    wxFONTENCODING_MACARABIC,       
+    wxFONTENCODING_MACHEBREW,        
+    wxFONTENCODING_MACGREEK,       
+    wxFONTENCODING_MACCYRILLIC,      
+    wxFONTENCODING_MACDEVANAGARI,      
+    wxFONTENCODING_MACGURMUKHI,      
+    wxFONTENCODING_MACGUJARATI,     
+    wxFONTENCODING_MACORIYA,       
+    wxFONTENCODING_MACBENGALI,       
+    wxFONTENCODING_MACTAMIL,       
+    wxFONTENCODING_MACTELUGU,        
+    wxFONTENCODING_MACKANNADA,        
+    wxFONTENCODING_MACMALAJALAM,        
+    wxFONTENCODING_MACSINHALESE,        
+    wxFONTENCODING_MACBURMESE,       
+    wxFONTENCODING_MACKHMER,        
+    wxFONTENCODING_MACTHAI,        
+    wxFONTENCODING_MACLAOTIAN,        
+    wxFONTENCODING_MACGEORGIAN,        
+    wxFONTENCODING_MACARMENIAN,        
+    wxFONTENCODING_MACCHINESESIMP,        
+    wxFONTENCODING_MACTIBETAN,        
+    wxFONTENCODING_MACMONGOLIAN,        
+    wxFONTENCODING_MACETHIOPIC,        
+    wxFONTENCODING_MACCENTRALEUR,        
+    wxFONTENCODING_MACVIATNAMESE,        
+    wxFONTENCODING_MACARABICEXT,        
+    wxFONTENCODING_MACSYMBOL,        
+    wxFONTENCODING_MACDINGBATS,        
+    wxFONTENCODING_MACTURKISH,        
+    wxFONTENCODING_MACCROATIAN,        
+    wxFONTENCODING_MACICELANDIC,        
+    wxFONTENCODING_MACROMANIAN,        
+    wxFONTENCODING_MACCELTIC,        
+    wxFONTENCODING_MACGAELIC,        
+    wxFONTENCODING_MACKEYBOARD,       
+
+    wxFONTENCODING_MACMIN = wxFONTENCODING_MACROMAN ,
+    wxFONTENCODING_MACMAX = wxFONTENCODING_MACKEYBOARD ,
 
     wxFONTENCODING_MAX,             // highest enumerated encoding value
 
@@ -337,6 +374,12 @@ public:
     // NB: hard-coded now, but might change later (read it from config?)
     static wxString GetEncodingDescription(wxFontEncoding encoding);
 
+    // find the encoding corresponding to the given name, inverse of
+    // GetEncodingName() and less general than CharsetToEncoding()
+    //
+    // returns wxFONTENCODING_MAX if the name is not a supported encoding
+    static wxFontEncoding GetEncodingFromName(const wxString& name);
+
 
     // set the config object to use (may be NULL to use default)
     void SetConfig(wxConfigBase *config);
@@ -368,7 +411,8 @@ public:
 
 
     // checks whether given encoding is available in given face or not.
-    // If no facename is given,
+    // If no facename is given (default), return true if it's available in any
+    // facename at all.
     bool IsEncodingAvailable(wxFontEncoding encoding,
                              const wxString& facename = wxPyEmptyString);
 
@@ -416,8 +460,10 @@ public:
     %pythoncode { def __nonzero__(self): return self.Ok() }
 
     // comparison
-    bool operator == (const wxFont& font) const;
-    bool operator != (const wxFont& font) const;
+    %extend {
+        bool __eq__(const wxFont* other) { return other ? (*self == *other) : False; }
+        bool __ne__(const wxFont* other) { return other ? (*self != *other) : True;  }
+    }
 
     // accessors: get the font characteristics
     virtual int GetPointSize() const;
@@ -487,7 +533,7 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc
 
 %name(FontEnumerator) class wxPyFontEnumerator {
 public:
-    %addtofunc wxPyFontEnumerator "self._setCallbackInfo(self, FontEnumerator, 0)"
+    %pythonAppend wxPyFontEnumerator "self._setCallbackInfo(self, FontEnumerator, 0)"
 
     wxPyFontEnumerator();
     ~wxPyFontEnumerator();