Added IsEditCancelled/SetEditCanceled

[wxWidgets.git] / wxPython / src / gtk / fonts.py

diff --git a/wxPython/src/gtk/fonts.py b/wxPython/src/gtk/fonts.py
index 82c50f821cce7ca775fbaa1ad527fffd8b813a87..361cdcc5b628a1a6adfeea4027b3cd44b8f52e6a 100644 (file)
--- a/wxPython/src/gtk/fonts.py
+++ b/wxPython/src/gtk/fonts.py
@@ -9,6 +9,9 @@ class wxNativeFontInfoPtr :
     def Init(self, *_args, **_kwargs):
         val = fontsc.wxNativeFontInfo_Init(self, *_args, **_kwargs)
         return val
+    def InitFromFont(self, *_args, **_kwargs):
+        val = fontsc.wxNativeFontInfo_InitFromFont(self, *_args, **_kwargs)
+        return val
     def GetPointSize(self, *_args, **_kwargs):
         val = fontsc.wxNativeFontInfo_GetPointSize(self, *_args, **_kwargs)
         return val
@@ -86,27 +89,27 @@ class wxFontMapperPtr :
                 delfunc(self)
             except:
                 pass
+    def CharsetToEncoding(self, *_args, **_kwargs):
+        val = fontsc.wxFontMapper_CharsetToEncoding(self, *_args, **_kwargs)
+        return val
+    def SetConfig(self, *_args, **_kwargs):
+        val = fontsc.wxFontMapper_SetConfig(self, *_args, **_kwargs)
+        return val
+    def SetConfigPath(self, *_args, **_kwargs):
+        val = fontsc.wxFontMapper_SetConfigPath(self, *_args, **_kwargs)
+        return val
     def GetAltForEncoding(self, *_args, **_kwargs):
         val = fontsc.wxFontMapper_GetAltForEncoding(self, *_args, **_kwargs)
         return val
     def IsEncodingAvailable(self, *_args, **_kwargs):
         val = fontsc.wxFontMapper_IsEncodingAvailable(self, *_args, **_kwargs)
         return val
-    def CharsetToEncoding(self, *_args, **_kwargs):
-        val = fontsc.wxFontMapper_CharsetToEncoding(self, *_args, **_kwargs)
-        return val
     def SetDialogParent(self, *_args, **_kwargs):
         val = fontsc.wxFontMapper_SetDialogParent(self, *_args, **_kwargs)
         return val
     def SetDialogTitle(self, *_args, **_kwargs):
         val = fontsc.wxFontMapper_SetDialogTitle(self, *_args, **_kwargs)
         return val
-    def SetConfig(self, *_args, **_kwargs):
-        val = fontsc.wxFontMapper_SetConfig(self, *_args, **_kwargs)
-        return val
-    def SetConfigPath(self, *_args, **_kwargs):
-        val = fontsc.wxFontMapper_SetConfigPath(self, *_args, **_kwargs)
-        return val
     def __repr__(self):
         return "<%s.%s instance; proxy of C++ wxFontMapper instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxFontMapper(wxFontMapperPtr):
@@ -429,6 +432,10 @@ def wxFontMapper_Set(*_args, **_kwargs):
     if val: val = wxFontMapperPtr(val)
     return val
 
+wxFontMapper_GetSupportedEncodingsCount = fontsc.wxFontMapper_GetSupportedEncodingsCount
+
+wxFontMapper_GetEncoding = fontsc.wxFontMapper_GetEncoding
+
 wxFontMapper_GetEncodingName = fontsc.wxFontMapper_GetEncodingName
 
 wxFontMapper_GetEncodingDescription = fontsc.wxFontMapper_GetEncodingDescription
@@ -452,6 +459,8 @@ def wxLocale_GetLanguageInfo(*_args, **_kwargs):
     if val: val = wxLanguageInfoPtr(val)
     return val
 
+wxLocale_GetLanguageName = fontsc.wxLocale_GetLanguageName
+
 def wxLocale_FindLanguageInfo(*_args, **_kwargs):
     val = fontsc.wxLocale_FindLanguageInfo(*_args,**_kwargs)
     if val: val = wxLanguageInfoPtr(val)
@@ -526,12 +535,18 @@ wxFONTENCODING_CP1257 = fontsc.wxFONTENCODING_CP1257
 wxFONTENCODING_CP12_MAX = fontsc.wxFONTENCODING_CP12_MAX
 wxFONTENCODING_UTF7 = fontsc.wxFONTENCODING_UTF7
 wxFONTENCODING_UTF8 = fontsc.wxFONTENCODING_UTF8
+wxFONTENCODING_EUC_JP = fontsc.wxFONTENCODING_EUC_JP
+wxFONTENCODING_UTF16BE = fontsc.wxFONTENCODING_UTF16BE
+wxFONTENCODING_UTF16LE = fontsc.wxFONTENCODING_UTF16LE
+wxFONTENCODING_UTF32BE = fontsc.wxFONTENCODING_UTF32BE
+wxFONTENCODING_UTF32LE = fontsc.wxFONTENCODING_UTF32LE
+wxFONTENCODING_MAX = fontsc.wxFONTENCODING_MAX
 wxFONTENCODING_GB2312 = fontsc.wxFONTENCODING_GB2312
 wxFONTENCODING_BIG5 = fontsc.wxFONTENCODING_BIG5
 wxFONTENCODING_SHIFT_JIS = fontsc.wxFONTENCODING_SHIFT_JIS
-wxFONTENCODING_EUC_JP = fontsc.wxFONTENCODING_EUC_JP
+wxFONTENCODING_UTF16 = fontsc.wxFONTENCODING_UTF16
+wxFONTENCODING_UTF32 = fontsc.wxFONTENCODING_UTF32
 wxFONTENCODING_UNICODE = fontsc.wxFONTENCODING_UNICODE
-wxFONTENCODING_MAX = fontsc.wxFONTENCODING_MAX
 wxLANGUAGE_DEFAULT = fontsc.wxLANGUAGE_DEFAULT
 wxLANGUAGE_UNKNOWN = fontsc.wxLANGUAGE_UNKNOWN
 wxLANGUAGE_ABKHAZIAN = fontsc.wxLANGUAGE_ABKHAZIAN