Typos

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

diff --git a/wxPython/src/_font.i b/wxPython/src/_font.i
index 997d2ede8c0fd15e97ba60887eafc583d6c4501b..c342e425e4340a523f35fccf401708a23fb0bf7c 100644 (file)
--- a/wxPython/src/_font.i
+++ b/wxPython/src/_font.i
@@ -153,6 +153,50 @@ enum wxFontEncoding
     wxFONTENCODING_UTF32BE,         // UTF-32 Big Endian Unicode encoding
     wxFONTENCODING_UTF32LE,         // UTF-32 Little Endian Unicode 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
 
 
@@ -268,10 +312,10 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
 
 %inline %{
     wxNativeEncodingInfo* wxGetNativeFontEncoding(wxFontEncoding encoding)
-        { PyErr_SetNone(PyExc_NotImplementedError); return NULL; }
+        { wxPyRaiseNotImplemented(); return NULL; }
     
     bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
-        { PyErr_SetNone(PyExc_NotImplementedError); return False; }
+        { wxPyRaiseNotImplemented(); return False; }
 %}
 #endif
 
@@ -408,8 +452,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;
@@ -479,7 +525,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();