new encoding constants

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

diff --git a/wxPython/src/_font.i b/wxPython/src/_font.i
index 13823a26fd1595c5abce602040cea4547d91a8e9..2d8e25b56c18adf331dbc5c6f479882fc57969b4 100644 (file)
--- a/wxPython/src/_font.i
+++ b/wxPython/src/_font.i
@@ -153,6 +153,14 @@ enum wxFontEncoding
     wxFONTENCODING_UTF32BE,         // UTF-32 Big Endian Unicode encoding
     wxFONTENCODING_UTF32LE,         // UTF-32 Little Endian Unicode encoding
 
     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_MAX,             // highest enumerated encoding value
 
 
     wxFONTENCODING_MAX,             // highest enumerated encoding value
 
 

diff --git a/wxPython/src/_gdi_rename.i b/wxPython/src/_gdi_rename.i
index a7146e4e0c38ebccb82dc8c423d47f7d3f734336..34647d4ed05ca5ab18f639f9328aa5feb665aa7f 100644 (file)
--- a/wxPython/src/_gdi_rename.i
+++ b/wxPython/src/_gdi_rename.i
@@ -94,6 +94,13 @@
 %rename(FONTENCODING_UTF16LE)               wxFONTENCODING_UTF16LE;
 %rename(FONTENCODING_UTF32BE)               wxFONTENCODING_UTF32BE;
 %rename(FONTENCODING_UTF32LE)               wxFONTENCODING_UTF32LE;
 %rename(FONTENCODING_UTF16LE)               wxFONTENCODING_UTF16LE;
 %rename(FONTENCODING_UTF32BE)               wxFONTENCODING_UTF32BE;
 %rename(FONTENCODING_UTF32LE)               wxFONTENCODING_UTF32LE;

+%rename(FONTENCODING_MACROMAN)              wxFONTENCODING_MACROMAN;
+%rename(FONTENCODING_MACCENTRALEUR)         wxFONTENCODING_MACCENTRALEUR;
+%rename(FONTENCODING_MACHEBREW)             wxFONTENCODING_MACHEBREW;
+%rename(FONTENCODING_MACGREEK)              wxFONTENCODING_MACGREEK;
+%rename(FONTENCODING_MACARABIC)             wxFONTENCODING_MACARABIC;
+%rename(FONTENCODING_MACTURKISH)            wxFONTENCODING_MACTURKISH;
+%rename(FONTENCODING_MACCYRILLIC)           wxFONTENCODING_MACCYRILLIC;

 %rename(FONTENCODING_MAX)                   wxFONTENCODING_MAX;
 %rename(FONTENCODING_UTF16)                 wxFONTENCODING_UTF16;
 %rename(FONTENCODING_UTF32)                 wxFONTENCODING_UTF32;
 %rename(FONTENCODING_MAX)                   wxFONTENCODING_MAX;
 %rename(FONTENCODING_UTF16)                 wxFONTENCODING_UTF16;
 %rename(FONTENCODING_UTF32)                 wxFONTENCODING_UTF32;

diff --git a/wxPython/wxPython/gdi.py b/wxPython/wxPython/gdi.py
index 6df4eccbec7c5f91c6e7e09bf968b245422dc4b6..89855496ab618489d45102b65bc66ea2bc127d1b 100644 (file)
--- a/wxPython/wxPython/gdi.py
+++ b/wxPython/wxPython/gdi.py
@@ -143,6 +143,13 @@ wxFONTENCODING_UTF16BE = wx.gdi.FONTENCODING_UTF16BE
 wxFONTENCODING_UTF16LE = wx.gdi.FONTENCODING_UTF16LE
 wxFONTENCODING_UTF32BE = wx.gdi.FONTENCODING_UTF32BE
 wxFONTENCODING_UTF32LE = wx.gdi.FONTENCODING_UTF32LE
 wxFONTENCODING_UTF16LE = wx.gdi.FONTENCODING_UTF16LE
 wxFONTENCODING_UTF32BE = wx.gdi.FONTENCODING_UTF32BE
 wxFONTENCODING_UTF32LE = wx.gdi.FONTENCODING_UTF32LE

+wxFONTENCODING_MACROMAN = wx.gdi.FONTENCODING_MACROMAN
+wxFONTENCODING_MACCENTRALEUR = wx.gdi.FONTENCODING_MACCENTRALEUR
+wxFONTENCODING_MACHEBREW = wx.gdi.FONTENCODING_MACHEBREW
+wxFONTENCODING_MACGREEK = wx.gdi.FONTENCODING_MACGREEK
+wxFONTENCODING_MACARABIC = wx.gdi.FONTENCODING_MACARABIC
+wxFONTENCODING_MACTURKISH = wx.gdi.FONTENCODING_MACTURKISH
+wxFONTENCODING_MACCYRILLIC = wx.gdi.FONTENCODING_MACCYRILLIC

 wxFONTENCODING_MAX = wx.gdi.FONTENCODING_MAX
 wxFONTENCODING_UTF16 = wx.gdi.FONTENCODING_UTF16
 wxFONTENCODING_UTF32 = wx.gdi.FONTENCODING_UTF32
 wxFONTENCODING_MAX = wx.gdi.FONTENCODING_MAX
 wxFONTENCODING_UTF16 = wx.gdi.FONTENCODING_UTF16
 wxFONTENCODING_UTF32 = wx.gdi.FONTENCODING_UTF32