Save the initial tstate during initialization

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

diff --git a/wxPython/src/mac/fonts.py b/wxPython/src/mac/fonts.py
index e36477f30cbdb62980097a0c31bb027fae4b1637..361cdcc5b628a1a6adfeea4027b3cd44b8f52e6a 100644 (file)
--- a/wxPython/src/mac/fonts.py
+++ b/wxPython/src/mac/fonts.py
@@ -9,6 +9,9 @@ class wxNativeFontInfoPtr :
     def Init(self, *_args, **_kwargs):
         val = fontsc.wxNativeFontInfo_Init(self, *_args, **_kwargs)
         return val
     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
     def GetPointSize(self, *_args, **_kwargs):
         val = fontsc.wxNativeFontInfo_GetPointSize(self, *_args, **_kwargs)
         return val


@@ -532,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_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_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_UNICODE = fontsc.wxFONTENCODING_UNICODE

-wxFONTENCODING_MAX = fontsc.wxFONTENCODING_MAX

 wxLANGUAGE_DEFAULT = fontsc.wxLANGUAGE_DEFAULT
 wxLANGUAGE_UNKNOWN = fontsc.wxLANGUAGE_UNKNOWN
 wxLANGUAGE_ABKHAZIAN = fontsc.wxLANGUAGE_ABKHAZIAN
 wxLANGUAGE_DEFAULT = fontsc.wxLANGUAGE_DEFAULT
 wxLANGUAGE_UNKNOWN = fontsc.wxLANGUAGE_UNKNOWN
 wxLANGUAGE_ABKHAZIAN = fontsc.wxLANGUAGE_ABKHAZIAN