Detect Apple bug that prevents the joystick code compiling for OS X 10.1

[wxWidgets.git] / wxPython / contrib / stc / mac / stc.py

diff --git a/wxPython/contrib/stc/mac/stc.py b/wxPython/contrib/stc/mac/stc.py
index 94da31a2c38fd78c54d173d7846a01b1f8792737..1f0c46e07f7461ba722a36072d087cc0f642a3f2 100644 (file)
--- a/wxPython/contrib/stc/mac/stc.py
+++ b/wxPython/contrib/stc/mac/stc.py
@@ -1662,14 +1662,6 @@ class StyledTextCtrl(_core.Control):
         """
         return _stc.StyledTextCtrl_StyleSetCase(*args, **kwargs)
 
-    def StyleSetCharacterSet(*args, **kwargs):
-        """
-        StyleSetCharacterSet(self, int style, int characterSet)
-
-        Set the character set of the font in a style.
-        """
-        return _stc.StyledTextCtrl_StyleSetCharacterSet(*args, **kwargs)
-
     def StyleSetHotSpot(*args, **kwargs):
         """
         StyleSetHotSpot(self, int style, bool hotspot)
@@ -3171,10 +3163,11 @@ class StyledTextCtrl(_core.Control):
         """
         LineDown(self)
 
-        This is just a wrapper for ScrollLines(1).
+        Move caret down one line.
         """
         return _stc.StyledTextCtrl_LineDown(*args, **kwargs)
 
+
     def LineDownExtend(*args, **kwargs):
         """
         LineDownExtend(self)
@@ -3187,10 +3180,11 @@ class StyledTextCtrl(_core.Control):
         """
         LineUp(self)
 
-        This is just a wrapper for ScrollLines(-1).
+        Move caret up one line.
         """
         return _stc.StyledTextCtrl_LineUp(*args, **kwargs)
 
+
     def LineUpExtend(*args, **kwargs):
         """
         LineUpExtend(self)
@@ -3331,10 +3325,11 @@ class StyledTextCtrl(_core.Control):
         """
         PageUp(self)
 
-        This is just a wrapper for ScrollPages(-1).
+        Move caret one page up.
         """
         return _stc.StyledTextCtrl_PageUp(*args, **kwargs)
 
+
     def PageUpExtend(*args, **kwargs):
         """
         PageUpExtend(self)
@@ -3347,10 +3342,11 @@ class StyledTextCtrl(_core.Control):
         """
         PageDown(self)
 
-        This is just a wrapper for ScrollPages(1).
+        Move caret one page down.
         """
         return _stc.StyledTextCtrl_PageDown(*args, **kwargs)
 
+
     def PageDownExtend(*args, **kwargs):
         """
         PageDownExtend(self)
@@ -4439,12 +4435,29 @@ class StyledTextCtrl(_core.Control):
     def StyleSetFontAttr(*args, **kwargs):
         """
         StyleSetFontAttr(self, int styleNum, int size, String faceName, bool bold, 
-            bool italic, bool underline)
+            bool italic, bool underline, int encoding=wxFONTENCODING_DEFAULT)
 
         Set all font style attributes at once.
         """
         return _stc.StyledTextCtrl_StyleSetFontAttr(*args, **kwargs)
 
+    def StyleSetCharacterSet(*args, **kwargs):
+        """
+        StyleSetCharacterSet(self, int style, int characterSet)
+
+        Set the character set of the font in a style.  Converts the Scintilla
+        wx.stc.STC_CHARSET_* set values to a wxFontEncoding.
+        """
+        return _stc.StyledTextCtrl_StyleSetCharacterSet(*args, **kwargs)
+
+    def StyleSetFontEncoding(*args, **kwargs):
+        """
+        StyleSetFontEncoding(self, int style, int encoding)
+
+        Set the font encoding to be used by a style.
+        """
+        return _stc.StyledTextCtrl_StyleSetFontEncoding(*args, **kwargs)
+
     def CmdKeyExecute(*args, **kwargs):
         """
         CmdKeyExecute(self, int cmd)