Allow to set a style's wxFontEncoding

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

wxPython/contrib/stc/_stc_docstrings.i

@@ -56,6 +56,13 @@ attributes of a `wx.Font`.", "");
 DocStr(wxStyledTextCtrl::StyleSetFontAttr,
 "Set all font style attributes at once.", "");
 
+DocStr(wxStyledTextCtrl::StyleSetCharacterSet,
+       "Set the character set of the font in a style.  Converts the Scintilla
+wx.stc.STC_CHARSET_* set values to a wxFontEncoding.", "");
+
+DocStr(wxStyledTextCtrl::StyleSetFontEncoding,
+       "Set the font encoding to be used by a style.", "");
+
 DocStr(wxStyledTextCtrl::CmdKeyExecute,
 "Perform one of the operations defined by the wx.stc.STC_CMD_* constants.", "");
 

wxPython/contrib/stc/_stc_gendocs.i

@@ -209,9 +209,6 @@ DocStr(wxStyledTextCtrl::StyleSetUnderline,
 DocStr(wxStyledTextCtrl::StyleSetCase,
 "Set a style to be mixed case, or to force upper or lower case.", "");
 
-DocStr(wxStyledTextCtrl::StyleSetCharacterSet,
-"Set the character set of the font in a style.", "");
-
 DocStr(wxStyledTextCtrl::StyleSetHotSpot,
 "Set a style to be a hotspot or not.", "");
 

wxPython/contrib/stc/stc.i

@@ -30,6 +30,8 @@ languages are built-in."
 
 %import core.i
 %import misc.i  // for DnD
+//%import gdi.i   // for wxFontEncoding
+
 %pythoncode { wx = _core }
 %pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
 
@@ -39,6 +41,8 @@ MAKE_CONST_WXSTRING(STCNameStr);
 %include _stc_rename.i
 %include _stc_docstrings.i
 
+enum wxFontEncoding;  // forward declare
+
 MustHaveApp(wxStyledTextCtrl);
 
 //---------------------------------------------------------------------------

wxPython/demo/StyledTextCtrl_1.py

@@ -192,7 +192,16 @@ def runTest(frame, nb, log):
         ed.AddText('\tRussian: ')
         ed.AddText(unitext)
         ed.GotoPos(0)
-
+    #else:
+    #    #ed.StyleSetFontEncoding(stc.STC_STYLE_DEFAULT, wx.FONTENCODING_KOI8)
+    #    #text = u'\u041f\u0438\u0442\u043e\u043d - \u043b\u0443\u0447\u0448\u0438\u0439 \u044f\u0437\u044b\u043a \n\u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f!'
+    #    #text = text.encode('koi8-r')
+    #    #ed.StyleSetFontEncoding(stc.STC_STYLE_DEFAULT, wx.FONTENCODING_BIG5)
+    #    #text = u'Python \u662f\u6700\u597d\u7684\u7de8\u7a0b\u8a9e\u8a00\uff01'
+    #    #text = text.encode('big5')
+    #    ed.GotoPos(ed.GetLength())
+    #    ed.AddText('\n\n' + text)
+        
     ed.EmptyUndoBuffer()
 
     # make some styles