]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/contrib/stc/stc.py
typo
[wxWidgets.git] / wxPython / contrib / stc / stc.py
index a1a5e14a47383b0ffcec5bbc5232857513cabb06..50bc3d5eaf55ecddc79c706ddf1f22a6793cb707 100644 (file)
@@ -4,6 +4,7 @@
 import _stc
 
 import core
+import misc
 wx = core 
 STC_USE_DND = _stc.STC_USE_DND
 STC_USE_POPUP = _stc.STC_USE_POPUP
@@ -94,6 +95,7 @@ STC_INDIC_TT = _stc.STC_INDIC_TT
 STC_INDIC_DIAGONAL = _stc.STC_INDIC_DIAGONAL
 STC_INDIC_STRIKE = _stc.STC_INDIC_STRIKE
 STC_INDIC_HIDDEN = _stc.STC_INDIC_HIDDEN
+STC_INDIC_BOX = _stc.STC_INDIC_BOX
 STC_INDIC0_MASK = _stc.STC_INDIC0_MASK
 STC_INDIC1_MASK = _stc.STC_INDIC1_MASK
 STC_INDIC2_MASK = _stc.STC_INDIC2_MASK
@@ -140,6 +142,9 @@ STC_CARET_SLOP = _stc.STC_CARET_SLOP
 STC_CARET_STRICT = _stc.STC_CARET_STRICT
 STC_CARET_JUMPS = _stc.STC_CARET_JUMPS
 STC_CARET_EVEN = _stc.STC_CARET_EVEN
+STC_SEL_STREAM = _stc.STC_SEL_STREAM
+STC_SEL_RECTANGLE = _stc.STC_SEL_RECTANGLE
+STC_SEL_LINES = _stc.STC_SEL_LINES
 STC_KEYWORDSET_MAX = _stc.STC_KEYWORDSET_MAX
 STC_MOD_INSERTTEXT = _stc.STC_MOD_INSERTTEXT
 STC_MOD_DELETETEXT = _stc.STC_MOD_DELETETEXT
@@ -218,6 +223,16 @@ STC_LEX_ESCRIPT = _stc.STC_LEX_ESCRIPT
 STC_LEX_PS = _stc.STC_LEX_PS
 STC_LEX_NSIS = _stc.STC_LEX_NSIS
 STC_LEX_MMIXAL = _stc.STC_LEX_MMIXAL
+STC_LEX_CLW = _stc.STC_LEX_CLW
+STC_LEX_CLWNOCASE = _stc.STC_LEX_CLWNOCASE
+STC_LEX_LOT = _stc.STC_LEX_LOT
+STC_LEX_YAML = _stc.STC_LEX_YAML
+STC_LEX_TEX = _stc.STC_LEX_TEX
+STC_LEX_METAPOST = _stc.STC_LEX_METAPOST
+STC_LEX_POWERBASIC = _stc.STC_LEX_POWERBASIC
+STC_LEX_FORTH = _stc.STC_LEX_FORTH
+STC_LEX_ERLANG = _stc.STC_LEX_ERLANG
+STC_LEX_OCTAVE = _stc.STC_LEX_OCTAVE
 STC_LEX_AUTOMATIC = _stc.STC_LEX_AUTOMATIC
 STC_P_DEFAULT = _stc.STC_P_DEFAULT
 STC_P_COMMENTLINE = _stc.STC_P_COMMENTLINE
@@ -402,6 +417,10 @@ STC_B_PREPROCESSOR = _stc.STC_B_PREPROCESSOR
 STC_B_OPERATOR = _stc.STC_B_OPERATOR
 STC_B_IDENTIFIER = _stc.STC_B_IDENTIFIER
 STC_B_DATE = _stc.STC_B_DATE
+STC_B_STRINGEOL = _stc.STC_B_STRINGEOL
+STC_B_KEYWORD2 = _stc.STC_B_KEYWORD2
+STC_B_KEYWORD3 = _stc.STC_B_KEYWORD3
+STC_B_KEYWORD4 = _stc.STC_B_KEYWORD4
 STC_PROPS_DEFAULT = _stc.STC_PROPS_DEFAULT
 STC_PROPS_COMMENT = _stc.STC_PROPS_COMMENT
 STC_PROPS_SECTION = _stc.STC_PROPS_SECTION
@@ -449,6 +468,8 @@ STC_ERR_DIFF_MESSAGE = _stc.STC_ERR_DIFF_MESSAGE
 STC_ERR_PHP = _stc.STC_ERR_PHP
 STC_ERR_ELF = _stc.STC_ERR_ELF
 STC_ERR_IFC = _stc.STC_ERR_IFC
+STC_ERR_IFORT = _stc.STC_ERR_IFORT
+STC_ERR_ABSF = _stc.STC_ERR_ABSF
 STC_BAT_DEFAULT = _stc.STC_BAT_DEFAULT
 STC_BAT_COMMENT = _stc.STC_BAT_COMMENT
 STC_BAT_WORD = _stc.STC_BAT_WORD
@@ -547,6 +568,18 @@ STC_NNCRONTAB_NUMBER = _stc.STC_NNCRONTAB_NUMBER
 STC_NNCRONTAB_STRING = _stc.STC_NNCRONTAB_STRING
 STC_NNCRONTAB_ENVIRONMENT = _stc.STC_NNCRONTAB_ENVIRONMENT
 STC_NNCRONTAB_IDENTIFIER = _stc.STC_NNCRONTAB_IDENTIFIER
+STC_FORTH_DEFAULT = _stc.STC_FORTH_DEFAULT
+STC_FORTH_COMMENT = _stc.STC_FORTH_COMMENT
+STC_FORTH_COMMENT_ML = _stc.STC_FORTH_COMMENT_ML
+STC_FORTH_IDENTIFIER = _stc.STC_FORTH_IDENTIFIER
+STC_FORTH_CONTROL = _stc.STC_FORTH_CONTROL
+STC_FORTH_KEYWORD = _stc.STC_FORTH_KEYWORD
+STC_FORTH_DEFWORD = _stc.STC_FORTH_DEFWORD
+STC_FORTH_PREWORD1 = _stc.STC_FORTH_PREWORD1
+STC_FORTH_PREWORD2 = _stc.STC_FORTH_PREWORD2
+STC_FORTH_NUMBER = _stc.STC_FORTH_NUMBER
+STC_FORTH_STRING = _stc.STC_FORTH_STRING
+STC_FORTH_LOCALE = _stc.STC_FORTH_LOCALE
 STC_MATLAB_DEFAULT = _stc.STC_MATLAB_DEFAULT
 STC_MATLAB_COMMENT = _stc.STC_MATLAB_COMMENT
 STC_MATLAB_COMMAND = _stc.STC_MATLAB_COMMAND
@@ -555,26 +588,23 @@ STC_MATLAB_KEYWORD = _stc.STC_MATLAB_KEYWORD
 STC_MATLAB_STRING = _stc.STC_MATLAB_STRING
 STC_MATLAB_OPERATOR = _stc.STC_MATLAB_OPERATOR
 STC_MATLAB_IDENTIFIER = _stc.STC_MATLAB_IDENTIFIER
+STC_MATLAB_DOUBLEQUOTESTRING = _stc.STC_MATLAB_DOUBLEQUOTESTRING
 STC_SCRIPTOL_DEFAULT = _stc.STC_SCRIPTOL_DEFAULT
-STC_SCRIPTOL_COMMENT = _stc.STC_SCRIPTOL_COMMENT
+STC_SCRIPTOL_WHITE = _stc.STC_SCRIPTOL_WHITE
 STC_SCRIPTOL_COMMENTLINE = _stc.STC_SCRIPTOL_COMMENTLINE
-STC_SCRIPTOL_COMMENTDOC = _stc.STC_SCRIPTOL_COMMENTDOC
+STC_SCRIPTOL_PERSISTENT = _stc.STC_SCRIPTOL_PERSISTENT
+STC_SCRIPTOL_CSTYLE = _stc.STC_SCRIPTOL_CSTYLE
+STC_SCRIPTOL_COMMENTBLOCK = _stc.STC_SCRIPTOL_COMMENTBLOCK
 STC_SCRIPTOL_NUMBER = _stc.STC_SCRIPTOL_NUMBER
-STC_SCRIPTOL_WORD = _stc.STC_SCRIPTOL_WORD
 STC_SCRIPTOL_STRING = _stc.STC_SCRIPTOL_STRING
 STC_SCRIPTOL_CHARACTER = _stc.STC_SCRIPTOL_CHARACTER
-STC_SCRIPTOL_UUID = _stc.STC_SCRIPTOL_UUID
-STC_SCRIPTOL_PREPROCESSOR = _stc.STC_SCRIPTOL_PREPROCESSOR
+STC_SCRIPTOL_STRINGEOL = _stc.STC_SCRIPTOL_STRINGEOL
+STC_SCRIPTOL_KEYWORD = _stc.STC_SCRIPTOL_KEYWORD
 STC_SCRIPTOL_OPERATOR = _stc.STC_SCRIPTOL_OPERATOR
 STC_SCRIPTOL_IDENTIFIER = _stc.STC_SCRIPTOL_IDENTIFIER
-STC_SCRIPTOL_STRINGEOL = _stc.STC_SCRIPTOL_STRINGEOL
-STC_SCRIPTOL_VERBATIM = _stc.STC_SCRIPTOL_VERBATIM
-STC_SCRIPTOL_REGEX = _stc.STC_SCRIPTOL_REGEX
-STC_SCRIPTOL_COMMENTLINEDOC = _stc.STC_SCRIPTOL_COMMENTLINEDOC
-STC_SCRIPTOL_WORD2 = _stc.STC_SCRIPTOL_WORD2
-STC_SCRIPTOL_COMMENTDOCKEYWORD = _stc.STC_SCRIPTOL_COMMENTDOCKEYWORD
-STC_SCRIPTOL_COMMENTDOCKEYWORDERROR = _stc.STC_SCRIPTOL_COMMENTDOCKEYWORDERROR
-STC_SCRIPTOL_COMMENTBASIC = _stc.STC_SCRIPTOL_COMMENTBASIC
+STC_SCRIPTOL_TRIPLE = _stc.STC_SCRIPTOL_TRIPLE
+STC_SCRIPTOL_CLASSNAME = _stc.STC_SCRIPTOL_CLASSNAME
+STC_SCRIPTOL_PREPROCESSOR = _stc.STC_SCRIPTOL_PREPROCESSOR
 STC_ASM_DEFAULT = _stc.STC_ASM_DEFAULT
 STC_ASM_COMMENT = _stc.STC_ASM_COMMENT
 STC_ASM_NUMBER = _stc.STC_ASM_NUMBER
@@ -586,6 +616,10 @@ STC_ASM_MATHINSTRUCTION = _stc.STC_ASM_MATHINSTRUCTION
 STC_ASM_REGISTER = _stc.STC_ASM_REGISTER
 STC_ASM_DIRECTIVE = _stc.STC_ASM_DIRECTIVE
 STC_ASM_DIRECTIVEOPERAND = _stc.STC_ASM_DIRECTIVEOPERAND
+STC_ASM_COMMENTBLOCK = _stc.STC_ASM_COMMENTBLOCK
+STC_ASM_CHARACTER = _stc.STC_ASM_CHARACTER
+STC_ASM_STRINGEOL = _stc.STC_ASM_STRINGEOL
+STC_ASM_EXTINSTRUCTION = _stc.STC_ASM_EXTINSTRUCTION
 STC_F_DEFAULT = _stc.STC_F_DEFAULT
 STC_F_COMMENT = _stc.STC_F_COMMENT
 STC_F_NUMBER = _stc.STC_F_NUMBER
@@ -704,6 +738,65 @@ STC_MMIXAL_HEX = _stc.STC_MMIXAL_HEX
 STC_MMIXAL_OPERATOR = _stc.STC_MMIXAL_OPERATOR
 STC_MMIXAL_SYMBOL = _stc.STC_MMIXAL_SYMBOL
 STC_MMIXAL_INCLUDE = _stc.STC_MMIXAL_INCLUDE
+STC_CLW_DEFAULT = _stc.STC_CLW_DEFAULT
+STC_CLW_LABEL = _stc.STC_CLW_LABEL
+STC_CLW_COMMENT = _stc.STC_CLW_COMMENT
+STC_CLW_STRING = _stc.STC_CLW_STRING
+STC_CLW_USER_IDENTIFIER = _stc.STC_CLW_USER_IDENTIFIER
+STC_CLW_INTEGER_CONSTANT = _stc.STC_CLW_INTEGER_CONSTANT
+STC_CLW_REAL_CONSTANT = _stc.STC_CLW_REAL_CONSTANT
+STC_CLW_PICTURE_STRING = _stc.STC_CLW_PICTURE_STRING
+STC_CLW_KEYWORD = _stc.STC_CLW_KEYWORD
+STC_CLW_COMPILER_DIRECTIVE = _stc.STC_CLW_COMPILER_DIRECTIVE
+STC_CLW_BUILTIN_PROCEDURES_FUNCTION = _stc.STC_CLW_BUILTIN_PROCEDURES_FUNCTION
+STC_CLW_STRUCTURE_DATA_TYPE = _stc.STC_CLW_STRUCTURE_DATA_TYPE
+STC_CLW_ATTRIBUTE = _stc.STC_CLW_ATTRIBUTE
+STC_CLW_STANDARD_EQUATE = _stc.STC_CLW_STANDARD_EQUATE
+STC_CLW_ERROR = _stc.STC_CLW_ERROR
+STC_LOT_DEFAULT = _stc.STC_LOT_DEFAULT
+STC_LOT_HEADER = _stc.STC_LOT_HEADER
+STC_LOT_BREAK = _stc.STC_LOT_BREAK
+STC_LOT_SET = _stc.STC_LOT_SET
+STC_LOT_PASS = _stc.STC_LOT_PASS
+STC_LOT_FAIL = _stc.STC_LOT_FAIL
+STC_LOT_ABORT = _stc.STC_LOT_ABORT
+STC_YAML_DEFAULT = _stc.STC_YAML_DEFAULT
+STC_YAML_COMMENT = _stc.STC_YAML_COMMENT
+STC_YAML_IDENTIFIER = _stc.STC_YAML_IDENTIFIER
+STC_YAML_KEYWORD = _stc.STC_YAML_KEYWORD
+STC_YAML_NUMBER = _stc.STC_YAML_NUMBER
+STC_YAML_REFERENCE = _stc.STC_YAML_REFERENCE
+STC_YAML_DOCUMENT = _stc.STC_YAML_DOCUMENT
+STC_YAML_TEXT = _stc.STC_YAML_TEXT
+STC_YAML_ERROR = _stc.STC_YAML_ERROR
+STC_TEX_DEFAULT = _stc.STC_TEX_DEFAULT
+STC_TEX_SPECIAL = _stc.STC_TEX_SPECIAL
+STC_TEX_GROUP = _stc.STC_TEX_GROUP
+STC_TEX_SYMBOL = _stc.STC_TEX_SYMBOL
+STC_TEX_COMMAND = _stc.STC_TEX_COMMAND
+STC_TEX_TEXT = _stc.STC_TEX_TEXT
+STC_METAPOST_DEFAULT = _stc.STC_METAPOST_DEFAULT
+STC_METAPOST_SPECIAL = _stc.STC_METAPOST_SPECIAL
+STC_METAPOST_GROUP = _stc.STC_METAPOST_GROUP
+STC_METAPOST_SYMBOL = _stc.STC_METAPOST_SYMBOL
+STC_METAPOST_COMMAND = _stc.STC_METAPOST_COMMAND
+STC_METAPOST_TEXT = _stc.STC_METAPOST_TEXT
+STC_METAPOST_EXTRA = _stc.STC_METAPOST_EXTRA
+STC_ERLANG_DEFAULT = _stc.STC_ERLANG_DEFAULT
+STC_ERLANG_COMMENT = _stc.STC_ERLANG_COMMENT
+STC_ERLANG_VARIABLE = _stc.STC_ERLANG_VARIABLE
+STC_ERLANG_NUMBER = _stc.STC_ERLANG_NUMBER
+STC_ERLANG_KEYWORD = _stc.STC_ERLANG_KEYWORD
+STC_ERLANG_STRING = _stc.STC_ERLANG_STRING
+STC_ERLANG_OPERATOR = _stc.STC_ERLANG_OPERATOR
+STC_ERLANG_ATOM = _stc.STC_ERLANG_ATOM
+STC_ERLANG_FUNCTION_NAME = _stc.STC_ERLANG_FUNCTION_NAME
+STC_ERLANG_CHARACTER = _stc.STC_ERLANG_CHARACTER
+STC_ERLANG_MACRO = _stc.STC_ERLANG_MACRO
+STC_ERLANG_RECORD = _stc.STC_ERLANG_RECORD
+STC_ERLANG_SEPARATOR = _stc.STC_ERLANG_SEPARATOR
+STC_ERLANG_NODE_NAME = _stc.STC_ERLANG_NODE_NAME
+STC_ERLANG_UNKNOWN = _stc.STC_ERLANG_UNKNOWN
 STC_CMD_REDO = _stc.STC_CMD_REDO
 STC_CMD_SELECTALL = _stc.STC_CMD_SELECTALL
 STC_CMD_UNDO = _stc.STC_CMD_UNDO
@@ -767,6 +860,7 @@ STC_CMD_LINEENDWRAP = _stc.STC_CMD_LINEENDWRAP
 STC_CMD_LINEENDWRAPEXTEND = _stc.STC_CMD_LINEENDWRAPEXTEND
 STC_CMD_VCHOMEWRAP = _stc.STC_CMD_VCHOMEWRAP
 STC_CMD_VCHOMEWRAPEXTEND = _stc.STC_CMD_VCHOMEWRAPEXTEND
+STC_CMD_LINECOPY = _stc.STC_CMD_LINECOPY
 STC_CMD_WORDPARTLEFT = _stc.STC_CMD_WORDPARTLEFT
 STC_CMD_WORDPARTLEFTEXTEND = _stc.STC_CMD_WORDPARTLEFTEXTEND
 STC_CMD_WORDPARTRIGHT = _stc.STC_CMD_WORDPARTRIGHT
@@ -777,13 +871,30 @@ STC_CMD_PARADOWN = _stc.STC_CMD_PARADOWN
 STC_CMD_PARADOWNEXTEND = _stc.STC_CMD_PARADOWNEXTEND
 STC_CMD_PARAUP = _stc.STC_CMD_PARAUP
 STC_CMD_PARAUPEXTEND = _stc.STC_CMD_PARAUPEXTEND
+STC_CMD_LINEDOWNRECTEXTEND = _stc.STC_CMD_LINEDOWNRECTEXTEND
+STC_CMD_LINEUPRECTEXTEND = _stc.STC_CMD_LINEUPRECTEXTEND
+STC_CMD_CHARLEFTRECTEXTEND = _stc.STC_CMD_CHARLEFTRECTEXTEND
+STC_CMD_CHARRIGHTRECTEXTEND = _stc.STC_CMD_CHARRIGHTRECTEXTEND
+STC_CMD_HOMERECTEXTEND = _stc.STC_CMD_HOMERECTEXTEND
+STC_CMD_VCHOMERECTEXTEND = _stc.STC_CMD_VCHOMERECTEXTEND
+STC_CMD_LINEENDRECTEXTEND = _stc.STC_CMD_LINEENDRECTEXTEND
+STC_CMD_PAGEUPRECTEXTEND = _stc.STC_CMD_PAGEUPRECTEXTEND
+STC_CMD_PAGEDOWNRECTEXTEND = _stc.STC_CMD_PAGEDOWNRECTEXTEND
+STC_CMD_STUTTEREDPAGEUP = _stc.STC_CMD_STUTTEREDPAGEUP
+STC_CMD_STUTTEREDPAGEUPEXTEND = _stc.STC_CMD_STUTTEREDPAGEUPEXTEND
+STC_CMD_STUTTEREDPAGEDOWN = _stc.STC_CMD_STUTTEREDPAGEDOWN
+STC_CMD_STUTTEREDPAGEDOWNEXTEND = _stc.STC_CMD_STUTTEREDPAGEDOWNEXTEND
+STC_CMD_WORDLEFTEND = _stc.STC_CMD_WORDLEFTEND
+STC_CMD_WORDLEFTENDEXTEND = _stc.STC_CMD_WORDLEFTENDEXTEND
+STC_CMD_WORDRIGHTEND = _stc.STC_CMD_WORDRIGHTEND
+STC_CMD_WORDRIGHTENDEXTEND = _stc.STC_CMD_WORDRIGHTENDEXTEND
 class StyledTextCtrl(core.Control):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxStyledTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=0, wxString name=wxPySTCNameStr) -> StyledTextCtrl
+            long style=0, String name=STCNameStr) -> StyledTextCtrl
         """
         newobj = _stc.new_StyledTextCtrl(*args, **kwargs)
         self.this = newobj.this
@@ -794,12 +905,12 @@ class StyledTextCtrl(core.Control):
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=0, wxString name=wxSTCNameStr)
+            long style=0, String name=wxSTCNameStr)
         """
         return _stc.StyledTextCtrl_Create(*args, **kwargs)
 
     def AddText(*args, **kwargs):
-        """AddText(wxString text)"""
+        """AddText(String text)"""
         return _stc.StyledTextCtrl_AddText(*args, **kwargs)
 
     def AddStyledText(*args, **kwargs):
@@ -807,7 +918,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_AddStyledText(*args, **kwargs)
 
     def InsertText(*args, **kwargs):
-        """InsertText(int pos, wxString text)"""
+        """InsertText(int pos, String text)"""
         return _stc.StyledTextCtrl_InsertText(*args, **kwargs)
 
     def ClearAll(*args, **kwargs):
@@ -903,7 +1014,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SetAnchor(*args, **kwargs)
 
     def GetCurLine(*args, **kwargs):
-        """GetCurLine(int OUTPUT) -> wxString"""
+        """GetCurLine(int OUTPUT) -> String"""
         return _stc.StyledTextCtrl_GetCurLine(*args, **kwargs)
 
     def GetEndStyled(*args, **kwargs):
@@ -952,17 +1063,17 @@ class StyledTextCtrl(core.Control):
 
     def MarkerDefine(*args, **kwargs):
         """
-        MarkerDefine(int markerNumber, int markerSymbol, wxColour foreground=wxNullColour, 
-            wxColour background=wxNullColour)
+        MarkerDefine(int markerNumber, int markerSymbol, Colour foreground=wxNullColour, 
+            Colour background=wxNullColour)
         """
         return _stc.StyledTextCtrl_MarkerDefine(*args, **kwargs)
 
     def MarkerSetForeground(*args, **kwargs):
-        """MarkerSetForeground(int markerNumber, wxColour fore)"""
+        """MarkerSetForeground(int markerNumber, Colour fore)"""
         return _stc.StyledTextCtrl_MarkerSetForeground(*args, **kwargs)
 
     def MarkerSetBackground(*args, **kwargs):
-        """MarkerSetBackground(int markerNumber, wxColour back)"""
+        """MarkerSetBackground(int markerNumber, Colour back)"""
         return _stc.StyledTextCtrl_MarkerSetBackground(*args, **kwargs)
 
     def MarkerAdd(*args, **kwargs):
@@ -990,7 +1101,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_MarkerPrevious(*args, **kwargs)
 
     def MarkerDefineBitmap(*args, **kwargs):
-        """MarkerDefineBitmap(int markerNumber, wxBitmap bmp)"""
+        """MarkerDefineBitmap(int markerNumber, Bitmap bmp)"""
         return _stc.StyledTextCtrl_MarkerDefineBitmap(*args, **kwargs)
 
     def SetMarginType(*args, **kwargs):
@@ -1030,11 +1141,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_StyleClearAll(*args, **kwargs)
 
     def StyleSetForeground(*args, **kwargs):
-        """StyleSetForeground(int style, wxColour fore)"""
+        """StyleSetForeground(int style, Colour fore)"""
         return _stc.StyledTextCtrl_StyleSetForeground(*args, **kwargs)
 
     def StyleSetBackground(*args, **kwargs):
-        """StyleSetBackground(int style, wxColour back)"""
+        """StyleSetBackground(int style, Colour back)"""
         return _stc.StyledTextCtrl_StyleSetBackground(*args, **kwargs)
 
     def StyleSetBold(*args, **kwargs):
@@ -1050,7 +1161,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_StyleSetSize(*args, **kwargs)
 
     def StyleSetFaceName(*args, **kwargs):
-        """StyleSetFaceName(int style, wxString fontName)"""
+        """StyleSetFaceName(int style, String fontName)"""
         return _stc.StyledTextCtrl_StyleSetFaceName(*args, **kwargs)
 
     def StyleSetEOLFilled(*args, **kwargs):
@@ -1078,15 +1189,15 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_StyleSetHotSpot(*args, **kwargs)
 
     def SetSelForeground(*args, **kwargs):
-        """SetSelForeground(bool useSetting, wxColour fore)"""
+        """SetSelForeground(bool useSetting, Colour fore)"""
         return _stc.StyledTextCtrl_SetSelForeground(*args, **kwargs)
 
     def SetSelBackground(*args, **kwargs):
-        """SetSelBackground(bool useSetting, wxColour back)"""
+        """SetSelBackground(bool useSetting, Colour back)"""
         return _stc.StyledTextCtrl_SetSelBackground(*args, **kwargs)
 
     def SetCaretForeground(*args, **kwargs):
-        """SetCaretForeground(wxColour fore)"""
+        """SetCaretForeground(Colour fore)"""
         return _stc.StyledTextCtrl_SetCaretForeground(*args, **kwargs)
 
     def CmdKeyAssign(*args, **kwargs):
@@ -1118,7 +1229,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SetCaretPeriod(*args, **kwargs)
 
     def SetWordChars(*args, **kwargs):
-        """SetWordChars(wxString characters)"""
+        """SetWordChars(String characters)"""
         return _stc.StyledTextCtrl_SetWordChars(*args, **kwargs)
 
     def BeginUndoAction(*args, **kwargs):
@@ -1138,19 +1249,19 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_IndicatorGetStyle(*args, **kwargs)
 
     def IndicatorSetForeground(*args, **kwargs):
-        """IndicatorSetForeground(int indic, wxColour fore)"""
+        """IndicatorSetForeground(int indic, Colour fore)"""
         return _stc.StyledTextCtrl_IndicatorSetForeground(*args, **kwargs)
 
     def IndicatorGetForeground(*args, **kwargs):
-        """IndicatorGetForeground(int indic) -> wxColour"""
+        """IndicatorGetForeground(int indic) -> Colour"""
         return _stc.StyledTextCtrl_IndicatorGetForeground(*args, **kwargs)
 
     def SetWhitespaceForeground(*args, **kwargs):
-        """SetWhitespaceForeground(bool useSetting, wxColour fore)"""
+        """SetWhitespaceForeground(bool useSetting, Colour fore)"""
         return _stc.StyledTextCtrl_SetWhitespaceForeground(*args, **kwargs)
 
     def SetWhitespaceBackground(*args, **kwargs):
-        """SetWhitespaceBackground(bool useSetting, wxColour back)"""
+        """SetWhitespaceBackground(bool useSetting, Colour back)"""
         return _stc.StyledTextCtrl_SetWhitespaceBackground(*args, **kwargs)
 
     def SetStyleBits(*args, **kwargs):
@@ -1182,11 +1293,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SetCaretLineVisible(*args, **kwargs)
 
     def GetCaretLineBack(*args, **kwargs):
-        """GetCaretLineBack() -> wxColour"""
+        """GetCaretLineBack() -> Colour"""
         return _stc.StyledTextCtrl_GetCaretLineBack(*args, **kwargs)
 
     def SetCaretLineBack(*args, **kwargs):
-        """SetCaretLineBack(wxColour back)"""
+        """SetCaretLineBack(Colour back)"""
         return _stc.StyledTextCtrl_SetCaretLineBack(*args, **kwargs)
 
     def StyleSetChangeable(*args, **kwargs):
@@ -1194,7 +1305,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_StyleSetChangeable(*args, **kwargs)
 
     def AutoCompShow(*args, **kwargs):
-        """AutoCompShow(int lenEntered, wxString itemList)"""
+        """AutoCompShow(int lenEntered, String itemList)"""
         return _stc.StyledTextCtrl_AutoCompShow(*args, **kwargs)
 
     def AutoCompCancel(*args, **kwargs):
@@ -1214,7 +1325,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_AutoCompComplete(*args, **kwargs)
 
     def AutoCompStops(*args, **kwargs):
-        """AutoCompStops(wxString characterSet)"""
+        """AutoCompStops(String characterSet)"""
         return _stc.StyledTextCtrl_AutoCompStops(*args, **kwargs)
 
     def AutoCompSetSeparator(*args, **kwargs):
@@ -1226,7 +1337,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_AutoCompGetSeparator(*args, **kwargs)
 
     def AutoCompSelect(*args, **kwargs):
-        """AutoCompSelect(wxString text)"""
+        """AutoCompSelect(String text)"""
         return _stc.StyledTextCtrl_AutoCompSelect(*args, **kwargs)
 
     def AutoCompSetCancelAtStart(*args, **kwargs):
@@ -1238,7 +1349,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_AutoCompGetCancelAtStart(*args, **kwargs)
 
     def AutoCompSetFillUps(*args, **kwargs):
-        """AutoCompSetFillUps(wxString characterSet)"""
+        """AutoCompSetFillUps(String characterSet)"""
         return _stc.StyledTextCtrl_AutoCompSetFillUps(*args, **kwargs)
 
     def AutoCompSetChooseSingle(*args, **kwargs):
@@ -1258,7 +1369,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_AutoCompGetIgnoreCase(*args, **kwargs)
 
     def UserListShow(*args, **kwargs):
-        """UserListShow(int listType, wxString itemList)"""
+        """UserListShow(int listType, String itemList)"""
         return _stc.StyledTextCtrl_UserListShow(*args, **kwargs)
 
     def AutoCompSetAutoHide(*args, **kwargs):
@@ -1278,7 +1389,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_AutoCompGetDropRestOfWord(*args, **kwargs)
 
     def RegisterImage(*args, **kwargs):
-        """RegisterImage(int type, wxBitmap bmp)"""
+        """RegisterImage(int type, Bitmap bmp)"""
         return _stc.StyledTextCtrl_RegisterImage(*args, **kwargs)
 
     def ClearRegisteredImages(*args, **kwargs):
@@ -1358,7 +1469,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetCodePage(*args, **kwargs)
 
     def GetCaretForeground(*args, **kwargs):
-        """GetCaretForeground() -> wxColour"""
+        """GetCaretForeground() -> Colour"""
         return _stc.StyledTextCtrl_GetCaretForeground(*args, **kwargs)
 
     def GetReadOnly(*args, **kwargs):
@@ -1402,12 +1513,12 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetPrintColourMode(*args, **kwargs)
 
     def FindText(*args, **kwargs):
-        """FindText(int minPos, int maxPos, wxString text, int flags=0) -> int"""
+        """FindText(int minPos, int maxPos, String text, int flags=0) -> int"""
         return _stc.StyledTextCtrl_FindText(*args, **kwargs)
 
     def FormatRange(*args, **kwargs):
         """
-        FormatRange(bool doDraw, int startPos, int endPos, wxDC draw, wxDC target, 
+        FormatRange(bool doDraw, int startPos, int endPos, DC draw, DC target, 
             Rect renderRect, Rect pageRect) -> int
         """
         return _stc.StyledTextCtrl_FormatRange(*args, **kwargs)
@@ -1417,7 +1528,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetFirstVisibleLine(*args, **kwargs)
 
     def GetLine(*args, **kwargs):
-        """GetLine(int line) -> wxString"""
+        """GetLine(int line) -> String"""
         return _stc.StyledTextCtrl_GetLine(*args, **kwargs)
 
     def GetLineCount(*args, **kwargs):
@@ -1449,11 +1560,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SetSelection(*args, **kwargs)
 
     def GetSelectedText(*args, **kwargs):
-        """GetSelectedText() -> wxString"""
+        """GetSelectedText() -> String"""
         return _stc.StyledTextCtrl_GetSelectedText(*args, **kwargs)
 
     def GetTextRange(*args, **kwargs):
-        """GetTextRange(int startPos, int endPos) -> wxString"""
+        """GetTextRange(int startPos, int endPos) -> String"""
         return _stc.StyledTextCtrl_GetTextRange(*args, **kwargs)
 
     def HideSelection(*args, **kwargs):
@@ -1477,7 +1588,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_EnsureCaretVisible(*args, **kwargs)
 
     def ReplaceSelection(*args, **kwargs):
-        """ReplaceSelection(wxString text)"""
+        """ReplaceSelection(String text)"""
         return _stc.StyledTextCtrl_ReplaceSelection(*args, **kwargs)
 
     def SetReadOnly(*args, **kwargs):
@@ -1517,11 +1628,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_Clear(*args, **kwargs)
 
     def SetText(*args, **kwargs):
-        """SetText(wxString text)"""
+        """SetText(String text)"""
         return _stc.StyledTextCtrl_SetText(*args, **kwargs)
 
     def GetText(*args, **kwargs):
-        """GetText() -> wxString"""
+        """GetText() -> String"""
         return _stc.StyledTextCtrl_GetText(*args, **kwargs)
 
     def GetTextLength(*args, **kwargs):
@@ -1561,15 +1672,15 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetTargetEnd(*args, **kwargs)
 
     def ReplaceTarget(*args, **kwargs):
-        """ReplaceTarget(wxString text) -> int"""
+        """ReplaceTarget(String text) -> int"""
         return _stc.StyledTextCtrl_ReplaceTarget(*args, **kwargs)
 
     def ReplaceTargetRE(*args, **kwargs):
-        """ReplaceTargetRE(wxString text) -> int"""
+        """ReplaceTargetRE(String text) -> int"""
         return _stc.StyledTextCtrl_ReplaceTargetRE(*args, **kwargs)
 
     def SearchInTarget(*args, **kwargs):
-        """SearchInTarget(wxString text) -> int"""
+        """SearchInTarget(String text) -> int"""
         return _stc.StyledTextCtrl_SearchInTarget(*args, **kwargs)
 
     def SetSearchFlags(*args, **kwargs):
@@ -1581,7 +1692,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetSearchFlags(*args, **kwargs)
 
     def CallTipShow(*args, **kwargs):
-        """CallTipShow(int pos, wxString definition)"""
+        """CallTipShow(int pos, String definition)"""
         return _stc.StyledTextCtrl_CallTipShow(*args, **kwargs)
 
     def CallTipCancel(*args, **kwargs):
@@ -1601,15 +1712,15 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_CallTipSetHighlight(*args, **kwargs)
 
     def CallTipSetBackground(*args, **kwargs):
-        """CallTipSetBackground(wxColour back)"""
+        """CallTipSetBackground(Colour back)"""
         return _stc.StyledTextCtrl_CallTipSetBackground(*args, **kwargs)
 
     def CallTipSetForeground(*args, **kwargs):
-        """CallTipSetForeground(wxColour fore)"""
+        """CallTipSetForeground(Colour fore)"""
         return _stc.StyledTextCtrl_CallTipSetForeground(*args, **kwargs)
 
     def CallTipSetForegroundHighlight(*args, **kwargs):
-        """CallTipSetForegroundHighlight(wxColour fore)"""
+        """CallTipSetForegroundHighlight(Colour fore)"""
         return _stc.StyledTextCtrl_CallTipSetForegroundHighlight(*args, **kwargs)
 
     def VisibleFromDocLine(*args, **kwargs):
@@ -1729,7 +1840,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetScrollWidth(*args, **kwargs)
 
     def TextWidth(*args, **kwargs):
-        """TextWidth(int style, wxString text) -> int"""
+        """TextWidth(int style, String text) -> int"""
         return _stc.StyledTextCtrl_TextWidth(*args, **kwargs)
 
     def SetEndAtLastLine(*args, **kwargs):
@@ -1753,7 +1864,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetUseVerticalScrollBar(*args, **kwargs)
 
     def AppendText(*args, **kwargs):
-        """AppendText(int length, wxString text)"""
+        """AppendText(int length, String text)"""
         return _stc.StyledTextCtrl_AppendText(*args, **kwargs)
 
     def GetTwoPhaseDraw(*args, **kwargs):
@@ -1777,17 +1888,213 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_LinesSplit(*args, **kwargs)
 
     def SetFoldMarginColour(*args, **kwargs):
-        """SetFoldMarginColour(bool useSetting, wxColour back)"""
+        """SetFoldMarginColour(bool useSetting, Colour back)"""
         return _stc.StyledTextCtrl_SetFoldMarginColour(*args, **kwargs)
 
     def SetFoldMarginHiColour(*args, **kwargs):
-        """SetFoldMarginHiColour(bool useSetting, wxColour fore)"""
+        """SetFoldMarginHiColour(bool useSetting, Colour fore)"""
         return _stc.StyledTextCtrl_SetFoldMarginHiColour(*args, **kwargs)
 
+    def LineDown(*args, **kwargs):
+        """
+        LineDown()
+
+        This is just a wrapper for ScrollLines(1).
+        """
+        return _stc.StyledTextCtrl_LineDown(*args, **kwargs)
+
+    def LineDownExtend(*args, **kwargs):
+        """LineDownExtend()"""
+        return _stc.StyledTextCtrl_LineDownExtend(*args, **kwargs)
+
+    def LineUp(*args, **kwargs):
+        """
+        LineUp()
+
+        This is just a wrapper for ScrollLines(-1).
+        """
+        return _stc.StyledTextCtrl_LineUp(*args, **kwargs)
+
+    def LineUpExtend(*args, **kwargs):
+        """LineUpExtend()"""
+        return _stc.StyledTextCtrl_LineUpExtend(*args, **kwargs)
+
+    def CharLeft(*args, **kwargs):
+        """CharLeft()"""
+        return _stc.StyledTextCtrl_CharLeft(*args, **kwargs)
+
+    def CharLeftExtend(*args, **kwargs):
+        """CharLeftExtend()"""
+        return _stc.StyledTextCtrl_CharLeftExtend(*args, **kwargs)
+
+    def CharRight(*args, **kwargs):
+        """CharRight()"""
+        return _stc.StyledTextCtrl_CharRight(*args, **kwargs)
+
+    def CharRightExtend(*args, **kwargs):
+        """CharRightExtend()"""
+        return _stc.StyledTextCtrl_CharRightExtend(*args, **kwargs)
+
+    def WordLeft(*args, **kwargs):
+        """WordLeft()"""
+        return _stc.StyledTextCtrl_WordLeft(*args, **kwargs)
+
+    def WordLeftExtend(*args, **kwargs):
+        """WordLeftExtend()"""
+        return _stc.StyledTextCtrl_WordLeftExtend(*args, **kwargs)
+
+    def WordRight(*args, **kwargs):
+        """WordRight()"""
+        return _stc.StyledTextCtrl_WordRight(*args, **kwargs)
+
+    def WordRightExtend(*args, **kwargs):
+        """WordRightExtend()"""
+        return _stc.StyledTextCtrl_WordRightExtend(*args, **kwargs)
+
+    def Home(*args, **kwargs):
+        """Home()"""
+        return _stc.StyledTextCtrl_Home(*args, **kwargs)
+
+    def HomeExtend(*args, **kwargs):
+        """HomeExtend()"""
+        return _stc.StyledTextCtrl_HomeExtend(*args, **kwargs)
+
+    def LineEnd(*args, **kwargs):
+        """LineEnd()"""
+        return _stc.StyledTextCtrl_LineEnd(*args, **kwargs)
+
+    def LineEndExtend(*args, **kwargs):
+        """LineEndExtend()"""
+        return _stc.StyledTextCtrl_LineEndExtend(*args, **kwargs)
+
+    def DocumentStart(*args, **kwargs):
+        """DocumentStart()"""
+        return _stc.StyledTextCtrl_DocumentStart(*args, **kwargs)
+
+    def DocumentStartExtend(*args, **kwargs):
+        """DocumentStartExtend()"""
+        return _stc.StyledTextCtrl_DocumentStartExtend(*args, **kwargs)
+
+    def DocumentEnd(*args, **kwargs):
+        """DocumentEnd()"""
+        return _stc.StyledTextCtrl_DocumentEnd(*args, **kwargs)
+
+    def DocumentEndExtend(*args, **kwargs):
+        """DocumentEndExtend()"""
+        return _stc.StyledTextCtrl_DocumentEndExtend(*args, **kwargs)
+
+    def PageUp(*args, **kwargs):
+        """
+        PageUp()
+
+        This is just a wrapper for ScrollPages(-1).
+        """
+        return _stc.StyledTextCtrl_PageUp(*args, **kwargs)
+
+    def PageUpExtend(*args, **kwargs):
+        """PageUpExtend()"""
+        return _stc.StyledTextCtrl_PageUpExtend(*args, **kwargs)
+
+    def PageDown(*args, **kwargs):
+        """
+        PageDown()
+
+        This is just a wrapper for ScrollPages(1).
+        """
+        return _stc.StyledTextCtrl_PageDown(*args, **kwargs)
+
+    def PageDownExtend(*args, **kwargs):
+        """PageDownExtend()"""
+        return _stc.StyledTextCtrl_PageDownExtend(*args, **kwargs)
+
+    def EditToggleOvertype(*args, **kwargs):
+        """EditToggleOvertype()"""
+        return _stc.StyledTextCtrl_EditToggleOvertype(*args, **kwargs)
+
+    def Cancel(*args, **kwargs):
+        """Cancel()"""
+        return _stc.StyledTextCtrl_Cancel(*args, **kwargs)
+
+    def DeleteBack(*args, **kwargs):
+        """DeleteBack()"""
+        return _stc.StyledTextCtrl_DeleteBack(*args, **kwargs)
+
+    def Tab(*args, **kwargs):
+        """Tab()"""
+        return _stc.StyledTextCtrl_Tab(*args, **kwargs)
+
+    def BackTab(*args, **kwargs):
+        """BackTab()"""
+        return _stc.StyledTextCtrl_BackTab(*args, **kwargs)
+
+    def NewLine(*args, **kwargs):
+        """NewLine()"""
+        return _stc.StyledTextCtrl_NewLine(*args, **kwargs)
+
+    def FormFeed(*args, **kwargs):
+        """FormFeed()"""
+        return _stc.StyledTextCtrl_FormFeed(*args, **kwargs)
+
+    def VCHome(*args, **kwargs):
+        """VCHome()"""
+        return _stc.StyledTextCtrl_VCHome(*args, **kwargs)
+
+    def VCHomeExtend(*args, **kwargs):
+        """VCHomeExtend()"""
+        return _stc.StyledTextCtrl_VCHomeExtend(*args, **kwargs)
+
+    def ZoomIn(*args, **kwargs):
+        """ZoomIn()"""
+        return _stc.StyledTextCtrl_ZoomIn(*args, **kwargs)
+
+    def ZoomOut(*args, **kwargs):
+        """ZoomOut()"""
+        return _stc.StyledTextCtrl_ZoomOut(*args, **kwargs)
+
+    def DelWordLeft(*args, **kwargs):
+        """DelWordLeft()"""
+        return _stc.StyledTextCtrl_DelWordLeft(*args, **kwargs)
+
+    def DelWordRight(*args, **kwargs):
+        """DelWordRight()"""
+        return _stc.StyledTextCtrl_DelWordRight(*args, **kwargs)
+
+    def LineCut(*args, **kwargs):
+        """LineCut()"""
+        return _stc.StyledTextCtrl_LineCut(*args, **kwargs)
+
+    def LineDelete(*args, **kwargs):
+        """LineDelete()"""
+        return _stc.StyledTextCtrl_LineDelete(*args, **kwargs)
+
+    def LineTranspose(*args, **kwargs):
+        """LineTranspose()"""
+        return _stc.StyledTextCtrl_LineTranspose(*args, **kwargs)
+
     def LineDuplicate(*args, **kwargs):
         """LineDuplicate()"""
         return _stc.StyledTextCtrl_LineDuplicate(*args, **kwargs)
 
+    def LowerCase(*args, **kwargs):
+        """LowerCase()"""
+        return _stc.StyledTextCtrl_LowerCase(*args, **kwargs)
+
+    def UpperCase(*args, **kwargs):
+        """UpperCase()"""
+        return _stc.StyledTextCtrl_UpperCase(*args, **kwargs)
+
+    def LineScrollDown(*args, **kwargs):
+        """LineScrollDown()"""
+        return _stc.StyledTextCtrl_LineScrollDown(*args, **kwargs)
+
+    def LineScrollUp(*args, **kwargs):
+        """LineScrollUp()"""
+        return _stc.StyledTextCtrl_LineScrollUp(*args, **kwargs)
+
+    def DeleteBackNotLine(*args, **kwargs):
+        """DeleteBackNotLine()"""
+        return _stc.StyledTextCtrl_DeleteBackNotLine(*args, **kwargs)
+
     def HomeDisplay(*args, **kwargs):
         """HomeDisplay()"""
         return _stc.StyledTextCtrl_HomeDisplay(*args, **kwargs)
@@ -1804,6 +2111,30 @@ class StyledTextCtrl(core.Control):
         """LineEndDisplayExtend()"""
         return _stc.StyledTextCtrl_LineEndDisplayExtend(*args, **kwargs)
 
+    def HomeWrap(*args, **kwargs):
+        """HomeWrap()"""
+        return _stc.StyledTextCtrl_HomeWrap(*args, **kwargs)
+
+    def HomeWrapExtend(*args, **kwargs):
+        """HomeWrapExtend()"""
+        return _stc.StyledTextCtrl_HomeWrapExtend(*args, **kwargs)
+
+    def LineEndWrap(*args, **kwargs):
+        """LineEndWrap()"""
+        return _stc.StyledTextCtrl_LineEndWrap(*args, **kwargs)
+
+    def LineEndWrapExtend(*args, **kwargs):
+        """LineEndWrapExtend()"""
+        return _stc.StyledTextCtrl_LineEndWrapExtend(*args, **kwargs)
+
+    def VCHomeWrap(*args, **kwargs):
+        """VCHomeWrap()"""
+        return _stc.StyledTextCtrl_VCHomeWrap(*args, **kwargs)
+
+    def VCHomeWrapExtend(*args, **kwargs):
+        """VCHomeWrapExtend()"""
+        return _stc.StyledTextCtrl_VCHomeWrapExtend(*args, **kwargs)
+
     def LineCopy(*args, **kwargs):
         """LineCopy()"""
         return _stc.StyledTextCtrl_LineCopy(*args, **kwargs)
@@ -1865,11 +2196,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SetEdgeMode(*args, **kwargs)
 
     def GetEdgeColour(*args, **kwargs):
-        """GetEdgeColour() -> wxColour"""
+        """GetEdgeColour() -> Colour"""
         return _stc.StyledTextCtrl_GetEdgeColour(*args, **kwargs)
 
     def SetEdgeColour(*args, **kwargs):
-        """SetEdgeColour(wxColour edgeColour)"""
+        """SetEdgeColour(Colour edgeColour)"""
         return _stc.StyledTextCtrl_SetEdgeColour(*args, **kwargs)
 
     def SearchAnchor(*args, **kwargs):
@@ -1877,11 +2208,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SearchAnchor(*args, **kwargs)
 
     def SearchNext(*args, **kwargs):
-        """SearchNext(int flags, wxString text) -> int"""
+        """SearchNext(int flags, String text) -> int"""
         return _stc.StyledTextCtrl_SearchNext(*args, **kwargs)
 
     def SearchPrev(*args, **kwargs):
-        """SearchPrev(int flags, wxString text) -> int"""
+        """SearchPrev(int flags, String text) -> int"""
         return _stc.StyledTextCtrl_SearchPrev(*args, **kwargs)
 
     def LinesOnScreen(*args, **kwargs):
@@ -2017,17 +2348,37 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetPrintWrapMode(*args, **kwargs)
 
     def SetHotspotActiveForeground(*args, **kwargs):
-        """SetHotspotActiveForeground(bool useSetting, wxColour fore)"""
+        """SetHotspotActiveForeground(bool useSetting, Colour fore)"""
         return _stc.StyledTextCtrl_SetHotspotActiveForeground(*args, **kwargs)
 
     def SetHotspotActiveBackground(*args, **kwargs):
-        """SetHotspotActiveBackground(bool useSetting, wxColour back)"""
+        """SetHotspotActiveBackground(bool useSetting, Colour back)"""
         return _stc.StyledTextCtrl_SetHotspotActiveBackground(*args, **kwargs)
 
     def SetHotspotActiveUnderline(*args, **kwargs):
         """SetHotspotActiveUnderline(bool underline)"""
         return _stc.StyledTextCtrl_SetHotspotActiveUnderline(*args, **kwargs)
 
+    def SetHotspotSingleLine(*args, **kwargs):
+        """SetHotspotSingleLine(bool singleLine)"""
+        return _stc.StyledTextCtrl_SetHotspotSingleLine(*args, **kwargs)
+
+    def ParaDown(*args, **kwargs):
+        """ParaDown()"""
+        return _stc.StyledTextCtrl_ParaDown(*args, **kwargs)
+
+    def ParaDownExtend(*args, **kwargs):
+        """ParaDownExtend()"""
+        return _stc.StyledTextCtrl_ParaDownExtend(*args, **kwargs)
+
+    def ParaUp(*args, **kwargs):
+        """ParaUp()"""
+        return _stc.StyledTextCtrl_ParaUp(*args, **kwargs)
+
+    def ParaUpExtend(*args, **kwargs):
+        """ParaUpExtend()"""
+        return _stc.StyledTextCtrl_ParaUpExtend(*args, **kwargs)
+
     def PositionBefore(*args, **kwargs):
         """PositionBefore(int pos) -> int"""
         return _stc.StyledTextCtrl_PositionBefore(*args, **kwargs)
@@ -2041,9 +2392,105 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_CopyRange(*args, **kwargs)
 
     def CopyText(*args, **kwargs):
-        """CopyText(int length, wxString text)"""
+        """CopyText(int length, String text)"""
         return _stc.StyledTextCtrl_CopyText(*args, **kwargs)
 
+    def SetSelectionMode(*args, **kwargs):
+        """SetSelectionMode(int mode)"""
+        return _stc.StyledTextCtrl_SetSelectionMode(*args, **kwargs)
+
+    def GetSelectionMode(*args, **kwargs):
+        """GetSelectionMode() -> int"""
+        return _stc.StyledTextCtrl_GetSelectionMode(*args, **kwargs)
+
+    def GetLineSelStartPosition(*args, **kwargs):
+        """GetLineSelStartPosition(int line) -> int"""
+        return _stc.StyledTextCtrl_GetLineSelStartPosition(*args, **kwargs)
+
+    def GetLineSelEndPosition(*args, **kwargs):
+        """GetLineSelEndPosition(int line) -> int"""
+        return _stc.StyledTextCtrl_GetLineSelEndPosition(*args, **kwargs)
+
+    def LineDownRectExtend(*args, **kwargs):
+        """LineDownRectExtend()"""
+        return _stc.StyledTextCtrl_LineDownRectExtend(*args, **kwargs)
+
+    def LineUpRectExtend(*args, **kwargs):
+        """LineUpRectExtend()"""
+        return _stc.StyledTextCtrl_LineUpRectExtend(*args, **kwargs)
+
+    def CharLeftRectExtend(*args, **kwargs):
+        """CharLeftRectExtend()"""
+        return _stc.StyledTextCtrl_CharLeftRectExtend(*args, **kwargs)
+
+    def CharRightRectExtend(*args, **kwargs):
+        """CharRightRectExtend()"""
+        return _stc.StyledTextCtrl_CharRightRectExtend(*args, **kwargs)
+
+    def HomeRectExtend(*args, **kwargs):
+        """HomeRectExtend()"""
+        return _stc.StyledTextCtrl_HomeRectExtend(*args, **kwargs)
+
+    def VCHomeRectExtend(*args, **kwargs):
+        """VCHomeRectExtend()"""
+        return _stc.StyledTextCtrl_VCHomeRectExtend(*args, **kwargs)
+
+    def LineEndRectExtend(*args, **kwargs):
+        """LineEndRectExtend()"""
+        return _stc.StyledTextCtrl_LineEndRectExtend(*args, **kwargs)
+
+    def PageUpRectExtend(*args, **kwargs):
+        """PageUpRectExtend()"""
+        return _stc.StyledTextCtrl_PageUpRectExtend(*args, **kwargs)
+
+    def PageDownRectExtend(*args, **kwargs):
+        """PageDownRectExtend()"""
+        return _stc.StyledTextCtrl_PageDownRectExtend(*args, **kwargs)
+
+    def StutteredPageUp(*args, **kwargs):
+        """StutteredPageUp()"""
+        return _stc.StyledTextCtrl_StutteredPageUp(*args, **kwargs)
+
+    def StutteredPageUpExtend(*args, **kwargs):
+        """StutteredPageUpExtend()"""
+        return _stc.StyledTextCtrl_StutteredPageUpExtend(*args, **kwargs)
+
+    def StutteredPageDown(*args, **kwargs):
+        """StutteredPageDown()"""
+        return _stc.StyledTextCtrl_StutteredPageDown(*args, **kwargs)
+
+    def StutteredPageDownExtend(*args, **kwargs):
+        """StutteredPageDownExtend()"""
+        return _stc.StyledTextCtrl_StutteredPageDownExtend(*args, **kwargs)
+
+    def WordLeftEnd(*args, **kwargs):
+        """WordLeftEnd()"""
+        return _stc.StyledTextCtrl_WordLeftEnd(*args, **kwargs)
+
+    def WordLeftEndExtend(*args, **kwargs):
+        """WordLeftEndExtend()"""
+        return _stc.StyledTextCtrl_WordLeftEndExtend(*args, **kwargs)
+
+    def WordRightEnd(*args, **kwargs):
+        """WordRightEnd()"""
+        return _stc.StyledTextCtrl_WordRightEnd(*args, **kwargs)
+
+    def WordRightEndExtend(*args, **kwargs):
+        """WordRightEndExtend()"""
+        return _stc.StyledTextCtrl_WordRightEndExtend(*args, **kwargs)
+
+    def SetWhitespaceChars(*args, **kwargs):
+        """SetWhitespaceChars(String characters)"""
+        return _stc.StyledTextCtrl_SetWhitespaceChars(*args, **kwargs)
+
+    def SetCharsDefault(*args, **kwargs):
+        """SetCharsDefault()"""
+        return _stc.StyledTextCtrl_SetCharsDefault(*args, **kwargs)
+
+    def AutoCompGetCurrent(*args, **kwargs):
+        """AutoCompGetCurrent() -> int"""
+        return _stc.StyledTextCtrl_AutoCompGetCurrent(*args, **kwargs)
+
     def StartRecord(*args, **kwargs):
         """StartRecord()"""
         return _stc.StyledTextCtrl_StartRecord(*args, **kwargs)
@@ -2065,15 +2512,15 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_Colourise(*args, **kwargs)
 
     def SetProperty(*args, **kwargs):
-        """SetProperty(wxString key, wxString value)"""
+        """SetProperty(String key, String value)"""
         return _stc.StyledTextCtrl_SetProperty(*args, **kwargs)
 
     def SetKeyWords(*args, **kwargs):
-        """SetKeyWords(int keywordSet, wxString keyWords)"""
+        """SetKeyWords(int keywordSet, String keyWords)"""
         return _stc.StyledTextCtrl_SetKeyWords(*args, **kwargs)
 
     def SetLexerLanguage(*args, **kwargs):
-        """SetLexerLanguage(wxString language)"""
+        """SetLexerLanguage(String language)"""
         return _stc.StyledTextCtrl_SetLexerLanguage(*args, **kwargs)
 
     def GetCurrentLine(*args, **kwargs):
@@ -2081,16 +2528,16 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetCurrentLine(*args, **kwargs)
 
     def StyleSetSpec(*args, **kwargs):
-        """StyleSetSpec(int styleNum, wxString spec)"""
+        """StyleSetSpec(int styleNum, String spec)"""
         return _stc.StyledTextCtrl_StyleSetSpec(*args, **kwargs)
 
     def StyleSetFont(*args, **kwargs):
-        """StyleSetFont(int styleNum, wxFont font)"""
+        """StyleSetFont(int styleNum, Font font)"""
         return _stc.StyledTextCtrl_StyleSetFont(*args, **kwargs)
 
     def StyleSetFontAttr(*args, **kwargs):
         """
-        StyleSetFontAttr(int styleNum, int size, wxString faceName, bool bold, 
+        StyleSetFontAttr(int styleNum, int size, String faceName, bool bold, 
             bool italic, bool underline)
         """
         return _stc.StyledTextCtrl_StyleSetFontAttr(*args, **kwargs)
@@ -2140,21 +2587,29 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SetLastKeydownProcessed(*args, **kwargs)
 
     def SaveFile(*args, **kwargs):
-        """SaveFile(wxString filename) -> bool"""
+        """SaveFile(String filename) -> bool"""
         return _stc.StyledTextCtrl_SaveFile(*args, **kwargs)
 
     def LoadFile(*args, **kwargs):
-        """LoadFile(wxString filename) -> bool"""
+        """LoadFile(String filename) -> bool"""
         return _stc.StyledTextCtrl_LoadFile(*args, **kwargs)
 
     def DoDragOver(*args, **kwargs):
-        """DoDragOver(int x, int y, wxDragResult def) -> wxDragResult"""
+        """DoDragOver(int x, int y, int def) -> int"""
         return _stc.StyledTextCtrl_DoDragOver(*args, **kwargs)
 
     def DoDropText(*args, **kwargs):
-        """DoDropText(long x, long y, wxString data) -> bool"""
+        """DoDropText(long x, long y, String data) -> bool"""
         return _stc.StyledTextCtrl_DoDropText(*args, **kwargs)
 
+    def SetUseAntiAliasing(*args, **kwargs):
+        """SetUseAntiAliasing(bool useAA)"""
+        return _stc.StyledTextCtrl_SetUseAntiAliasing(*args, **kwargs)
+
+    def GetUseAntiAliasing(*args, **kwargs):
+        """GetUseAntiAliasing() -> bool"""
+        return _stc.StyledTextCtrl_GetUseAntiAliasing(*args, **kwargs)
+
 
 class StyledTextCtrlPtr(StyledTextCtrl):
     def __init__(self, this):
@@ -2162,6 +2617,8 @@ class StyledTextCtrlPtr(StyledTextCtrl):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = StyledTextCtrl
 _stc.StyledTextCtrl_swigregister(StyledTextCtrlPtr)
+cvar = _stc.cvar
+STCNameStr = cvar.STCNameStr
 
 def PreStyledTextCtrl(*args, **kwargs):
     """PreStyledTextCtrl() -> StyledTextCtrl"""
@@ -2201,7 +2658,7 @@ class StyledTextEvent(core.CommandEvent):
         return _stc.StyledTextEvent_SetModificationType(*args, **kwargs)
 
     def SetText(*args, **kwargs):
-        """SetText(wxString t)"""
+        """SetText(String t)"""
         return _stc.StyledTextEvent_SetText(*args, **kwargs)
 
     def SetLength(*args, **kwargs):
@@ -2253,7 +2710,7 @@ class StyledTextEvent(core.CommandEvent):
         return _stc.StyledTextEvent_SetY(*args, **kwargs)
 
     def SetDragText(*args, **kwargs):
-        """SetDragText(wxString val)"""
+        """SetDragText(String val)"""
         return _stc.StyledTextEvent_SetDragText(*args, **kwargs)
 
     def SetDragAllowMove(*args, **kwargs):
@@ -2261,7 +2718,7 @@ class StyledTextEvent(core.CommandEvent):
         return _stc.StyledTextEvent_SetDragAllowMove(*args, **kwargs)
 
     def SetDragResult(*args, **kwargs):
-        """SetDragResult(wxDragResult val)"""
+        """SetDragResult(int val)"""
         return _stc.StyledTextEvent_SetDragResult(*args, **kwargs)
 
     def GetPosition(*args, **kwargs):
@@ -2281,7 +2738,7 @@ class StyledTextEvent(core.CommandEvent):
         return _stc.StyledTextEvent_GetModificationType(*args, **kwargs)
 
     def GetText(*args, **kwargs):
-        """GetText() -> wxString"""
+        """GetText() -> String"""
         return _stc.StyledTextEvent_GetText(*args, **kwargs)
 
     def GetLength(*args, **kwargs):
@@ -2333,7 +2790,7 @@ class StyledTextEvent(core.CommandEvent):
         return _stc.StyledTextEvent_GetY(*args, **kwargs)
 
     def GetDragText(*args, **kwargs):
-        """GetDragText() -> wxString"""
+        """GetDragText() -> String"""
         return _stc.StyledTextEvent_GetDragText(*args, **kwargs)
 
     def GetDragAllowMove(*args, **kwargs):
@@ -2341,7 +2798,7 @@ class StyledTextEvent(core.CommandEvent):
         return _stc.StyledTextEvent_GetDragAllowMove(*args, **kwargs)
 
     def GetDragResult(*args, **kwargs):
-        """GetDragResult() -> wxDragResult"""
+        """GetDragResult() -> int"""
         return _stc.StyledTextEvent_GetDragResult(*args, **kwargs)
 
     def GetShift(*args, **kwargs):