reSWIGged

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

diff --git a/wxPython/contrib/stc/_stc_rename.i b/wxPython/contrib/stc/_stc_rename.i
index 22cf8a17c1e3761d3cb4395010cd5813808eaaf3..82b6a2fbb5dc422698b1c3980f0ec782f7382614 100644 (file)
--- a/wxPython/contrib/stc/_stc_rename.i
+++ b/wxPython/contrib/stc/_stc_rename.i
@@ -243,6 +243,8 @@
 %rename(STC_LEX_AU3)                        wxSTC_LEX_AU3;
 %rename(STC_LEX_APDL)                       wxSTC_LEX_APDL;
 %rename(STC_LEX_BASH)                       wxSTC_LEX_BASH;
 %rename(STC_LEX_AU3)                        wxSTC_LEX_AU3;
 %rename(STC_LEX_APDL)                       wxSTC_LEX_APDL;
 %rename(STC_LEX_BASH)                       wxSTC_LEX_BASH;

+%rename(STC_LEX_ASN1)                       wxSTC_LEX_ASN1;
+%rename(STC_LEX_VHDL)                       wxSTC_LEX_VHDL;

 %rename(STC_LEX_AUTOMATIC)                  wxSTC_LEX_AUTOMATIC;
 %rename(STC_P_DEFAULT)                      wxSTC_P_DEFAULT;
 %rename(STC_P_COMMENTLINE)                  wxSTC_P_COMMENTLINE;
 %rename(STC_LEX_AUTOMATIC)                  wxSTC_LEX_AUTOMATIC;
 %rename(STC_P_DEFAULT)                      wxSTC_P_DEFAULT;
 %rename(STC_P_COMMENTLINE)                  wxSTC_P_COMMENTLINE;


@@ -484,6 +486,7 @@
 %rename(STC_ERR_IFORT)                      wxSTC_ERR_IFORT;
 %rename(STC_ERR_ABSF)                       wxSTC_ERR_ABSF;
 %rename(STC_ERR_TIDY)                       wxSTC_ERR_TIDY;
 %rename(STC_ERR_IFORT)                      wxSTC_ERR_IFORT;
 %rename(STC_ERR_ABSF)                       wxSTC_ERR_ABSF;
 %rename(STC_ERR_TIDY)                       wxSTC_ERR_TIDY;

+%rename(STC_ERR_JAVA_STACK)                 wxSTC_ERR_JAVA_STACK;

 %rename(STC_BAT_DEFAULT)                    wxSTC_BAT_DEFAULT;
 %rename(STC_BAT_COMMENT)                    wxSTC_BAT_COMMENT;
 %rename(STC_BAT_WORD)                       wxSTC_BAT_WORD;
 %rename(STC_BAT_DEFAULT)                    wxSTC_BAT_DEFAULT;
 %rename(STC_BAT_COMMENT)                    wxSTC_BAT_COMMENT;
 %rename(STC_BAT_WORD)                       wxSTC_BAT_WORD;


@@ -664,6 +667,7 @@
 %rename(STC_CSS_DIRECTIVE)                  wxSTC_CSS_DIRECTIVE;
 %rename(STC_CSS_DOUBLESTRING)               wxSTC_CSS_DOUBLESTRING;
 %rename(STC_CSS_SINGLESTRING)               wxSTC_CSS_SINGLESTRING;
 %rename(STC_CSS_DIRECTIVE)                  wxSTC_CSS_DIRECTIVE;
 %rename(STC_CSS_DOUBLESTRING)               wxSTC_CSS_DOUBLESTRING;
 %rename(STC_CSS_SINGLESTRING)               wxSTC_CSS_SINGLESTRING;

+%rename(STC_CSS_IDENTIFIER2)                wxSTC_CSS_IDENTIFIER2;

 %rename(STC_POV_DEFAULT)                    wxSTC_POV_DEFAULT;
 %rename(STC_POV_COMMENT)                    wxSTC_POV_COMMENT;
 %rename(STC_POV_COMMENTLINE)                wxSTC_POV_COMMENTLINE;
 %rename(STC_POV_DEFAULT)                    wxSTC_POV_DEFAULT;
 %rename(STC_POV_COMMENT)                    wxSTC_POV_COMMENT;
 %rename(STC_POV_COMMENTLINE)                wxSTC_POV_COMMENTLINE;


@@ -892,14 +896,19 @@
 %rename(STC_AU3_VARIABLE)                   wxSTC_AU3_VARIABLE;
 %rename(STC_AU3_SENT)                       wxSTC_AU3_SENT;
 %rename(STC_AU3_PREPROCESSOR)               wxSTC_AU3_PREPROCESSOR;
 %rename(STC_AU3_VARIABLE)                   wxSTC_AU3_VARIABLE;
 %rename(STC_AU3_SENT)                       wxSTC_AU3_SENT;
 %rename(STC_AU3_PREPROCESSOR)               wxSTC_AU3_PREPROCESSOR;

+%rename(STC_AU3_SPECIAL)                    wxSTC_AU3_SPECIAL;

 %rename(STC_APDL_DEFAULT)                   wxSTC_APDL_DEFAULT;
 %rename(STC_APDL_COMMENT)                   wxSTC_APDL_COMMENT;
 %rename(STC_APDL_COMMENTBLOCK)              wxSTC_APDL_COMMENTBLOCK;
 %rename(STC_APDL_NUMBER)                    wxSTC_APDL_NUMBER;
 %rename(STC_APDL_STRING)                    wxSTC_APDL_STRING;
 %rename(STC_APDL_DEFAULT)                   wxSTC_APDL_DEFAULT;
 %rename(STC_APDL_COMMENT)                   wxSTC_APDL_COMMENT;
 %rename(STC_APDL_COMMENTBLOCK)              wxSTC_APDL_COMMENTBLOCK;
 %rename(STC_APDL_NUMBER)                    wxSTC_APDL_NUMBER;
 %rename(STC_APDL_STRING)                    wxSTC_APDL_STRING;

+%rename(STC_APDL_OPERATOR)                  wxSTC_APDL_OPERATOR;

 %rename(STC_APDL_WORD)                      wxSTC_APDL_WORD;
 %rename(STC_APDL_WORD)                      wxSTC_APDL_WORD;

-%rename(STC_APDL_COMMAND)                   wxSTC_APDL_COMMAND;

 %rename(STC_APDL_PROCESSOR)                 wxSTC_APDL_PROCESSOR;
 %rename(STC_APDL_PROCESSOR)                 wxSTC_APDL_PROCESSOR;

+%rename(STC_APDL_COMMAND)                   wxSTC_APDL_COMMAND;
+%rename(STC_APDL_SLASHCOMMAND)              wxSTC_APDL_SLASHCOMMAND;
+%rename(STC_APDL_STARCOMMAND)               wxSTC_APDL_STARCOMMAND;
+%rename(STC_APDL_ARGUMENT)                  wxSTC_APDL_ARGUMENT;

 %rename(STC_APDL_FUNCTION)                  wxSTC_APDL_FUNCTION;
 %rename(STC_SH_DEFAULT)                     wxSTC_SH_DEFAULT;
 %rename(STC_SH_ERROR)                       wxSTC_SH_ERROR;
 %rename(STC_APDL_FUNCTION)                  wxSTC_APDL_FUNCTION;
 %rename(STC_SH_DEFAULT)                     wxSTC_SH_DEFAULT;
 %rename(STC_SH_ERROR)                       wxSTC_SH_ERROR;


@@ -915,6 +924,32 @@
 %rename(STC_SH_BACKTICKS)                   wxSTC_SH_BACKTICKS;
 %rename(STC_SH_HERE_DELIM)                  wxSTC_SH_HERE_DELIM;
 %rename(STC_SH_HERE_Q)                      wxSTC_SH_HERE_Q;
 %rename(STC_SH_BACKTICKS)                   wxSTC_SH_BACKTICKS;
 %rename(STC_SH_HERE_DELIM)                  wxSTC_SH_HERE_DELIM;
 %rename(STC_SH_HERE_Q)                      wxSTC_SH_HERE_Q;

+%rename(STC_ASN1_DEFAULT)                   wxSTC_ASN1_DEFAULT;
+%rename(STC_ASN1_COMMENT)                   wxSTC_ASN1_COMMENT;
+%rename(STC_ASN1_IDENTIFIER)                wxSTC_ASN1_IDENTIFIER;
+%rename(STC_ASN1_STRING)                    wxSTC_ASN1_STRING;
+%rename(STC_ASN1_OID)                       wxSTC_ASN1_OID;
+%rename(STC_ASN1_SCALAR)                    wxSTC_ASN1_SCALAR;
+%rename(STC_ASN1_KEYWORD)                   wxSTC_ASN1_KEYWORD;
+%rename(STC_ASN1_ATTRIBUTE)                 wxSTC_ASN1_ATTRIBUTE;
+%rename(STC_ASN1_DESCRIPTOR)                wxSTC_ASN1_DESCRIPTOR;
+%rename(STC_ASN1_TYPE)                      wxSTC_ASN1_TYPE;
+%rename(STC_ASN1_OPERATOR)                  wxSTC_ASN1_OPERATOR;
+%rename(STC_VHDL_DEFAULT)                   wxSTC_VHDL_DEFAULT;
+%rename(STC_VHDL_COMMENT)                   wxSTC_VHDL_COMMENT;
+%rename(STC_VHDL_COMMENTLINEBANG)           wxSTC_VHDL_COMMENTLINEBANG;
+%rename(STC_VHDL_NUMBER)                    wxSTC_VHDL_NUMBER;
+%rename(STC_VHDL_STRING)                    wxSTC_VHDL_STRING;
+%rename(STC_VHDL_OPERATOR)                  wxSTC_VHDL_OPERATOR;
+%rename(STC_VHDL_IDENTIFIER)                wxSTC_VHDL_IDENTIFIER;
+%rename(STC_VHDL_STRINGEOL)                 wxSTC_VHDL_STRINGEOL;
+%rename(STC_VHDL_KEYWORD)                   wxSTC_VHDL_KEYWORD;
+%rename(STC_VHDL_STDOPERATOR)               wxSTC_VHDL_STDOPERATOR;
+%rename(STC_VHDL_ATTRIBUTE)                 wxSTC_VHDL_ATTRIBUTE;
+%rename(STC_VHDL_STDFUNCTION)               wxSTC_VHDL_STDFUNCTION;
+%rename(STC_VHDL_STDPACKAGE)                wxSTC_VHDL_STDPACKAGE;
+%rename(STC_VHDL_STDTYPE)                   wxSTC_VHDL_STDTYPE;
+%rename(STC_VHDL_USERWORD)                  wxSTC_VHDL_USERWORD;

 %rename(STC_CMD_REDO)                       wxSTC_CMD_REDO;
 %rename(STC_CMD_SELECTALL)                  wxSTC_CMD_SELECTALL;
 %rename(STC_CMD_UNDO)                       wxSTC_CMD_UNDO;
 %rename(STC_CMD_REDO)                       wxSTC_CMD_REDO;
 %rename(STC_CMD_SELECTALL)                  wxSTC_CMD_SELECTALL;
 %rename(STC_CMD_UNDO)                       wxSTC_CMD_UNDO;

diff --git a/wxPython/contrib/stc/gtk/stc.py b/wxPython/contrib/stc/gtk/stc.py
index ffaf3bcfa9d898d23b52957ea4f6fef1c7dcf522..481ac536fa8edfa084fadd531fd0b28f18a7c21d 100644 (file)
--- a/wxPython/contrib/stc/gtk/stc.py
+++ b/wxPython/contrib/stc/gtk/stc.py
@@ -295,6 +295,8 @@ STC_LEX_SPECMAN = _stc.STC_LEX_SPECMAN
 STC_LEX_AU3 = _stc.STC_LEX_AU3
 STC_LEX_APDL = _stc.STC_LEX_APDL
 STC_LEX_BASH = _stc.STC_LEX_BASH
 STC_LEX_AU3 = _stc.STC_LEX_AU3
 STC_LEX_APDL = _stc.STC_LEX_APDL
 STC_LEX_BASH = _stc.STC_LEX_BASH

+STC_LEX_ASN1 = _stc.STC_LEX_ASN1
+STC_LEX_VHDL = _stc.STC_LEX_VHDL

 STC_LEX_AUTOMATIC = _stc.STC_LEX_AUTOMATIC
 STC_P_DEFAULT = _stc.STC_P_DEFAULT
 STC_P_COMMENTLINE = _stc.STC_P_COMMENTLINE
 STC_LEX_AUTOMATIC = _stc.STC_LEX_AUTOMATIC
 STC_P_DEFAULT = _stc.STC_P_DEFAULT
 STC_P_COMMENTLINE = _stc.STC_P_COMMENTLINE


@@ -536,6 +538,7 @@ STC_ERR_IFC = _stc.STC_ERR_IFC
 STC_ERR_IFORT = _stc.STC_ERR_IFORT
 STC_ERR_ABSF = _stc.STC_ERR_ABSF
 STC_ERR_TIDY = _stc.STC_ERR_TIDY
 STC_ERR_IFORT = _stc.STC_ERR_IFORT
 STC_ERR_ABSF = _stc.STC_ERR_ABSF
 STC_ERR_TIDY = _stc.STC_ERR_TIDY

+STC_ERR_JAVA_STACK = _stc.STC_ERR_JAVA_STACK

 STC_BAT_DEFAULT = _stc.STC_BAT_DEFAULT
 STC_BAT_COMMENT = _stc.STC_BAT_COMMENT
 STC_BAT_WORD = _stc.STC_BAT_WORD
 STC_BAT_DEFAULT = _stc.STC_BAT_DEFAULT
 STC_BAT_COMMENT = _stc.STC_BAT_COMMENT
 STC_BAT_WORD = _stc.STC_BAT_WORD


@@ -716,6 +719,7 @@ STC_CSS_IMPORTANT = _stc.STC_CSS_IMPORTANT
 STC_CSS_DIRECTIVE = _stc.STC_CSS_DIRECTIVE
 STC_CSS_DOUBLESTRING = _stc.STC_CSS_DOUBLESTRING
 STC_CSS_SINGLESTRING = _stc.STC_CSS_SINGLESTRING
 STC_CSS_DIRECTIVE = _stc.STC_CSS_DIRECTIVE
 STC_CSS_DOUBLESTRING = _stc.STC_CSS_DOUBLESTRING
 STC_CSS_SINGLESTRING = _stc.STC_CSS_SINGLESTRING

+STC_CSS_IDENTIFIER2 = _stc.STC_CSS_IDENTIFIER2

 STC_POV_DEFAULT = _stc.STC_POV_DEFAULT
 STC_POV_COMMENT = _stc.STC_POV_COMMENT
 STC_POV_COMMENTLINE = _stc.STC_POV_COMMENTLINE
 STC_POV_DEFAULT = _stc.STC_POV_DEFAULT
 STC_POV_COMMENT = _stc.STC_POV_COMMENT
 STC_POV_COMMENTLINE = _stc.STC_POV_COMMENTLINE


@@ -944,14 +948,19 @@ STC_AU3_OPERATOR = _stc.STC_AU3_OPERATOR
 STC_AU3_VARIABLE = _stc.STC_AU3_VARIABLE
 STC_AU3_SENT = _stc.STC_AU3_SENT
 STC_AU3_PREPROCESSOR = _stc.STC_AU3_PREPROCESSOR
 STC_AU3_VARIABLE = _stc.STC_AU3_VARIABLE
 STC_AU3_SENT = _stc.STC_AU3_SENT
 STC_AU3_PREPROCESSOR = _stc.STC_AU3_PREPROCESSOR

+STC_AU3_SPECIAL = _stc.STC_AU3_SPECIAL

 STC_APDL_DEFAULT = _stc.STC_APDL_DEFAULT
 STC_APDL_COMMENT = _stc.STC_APDL_COMMENT
 STC_APDL_COMMENTBLOCK = _stc.STC_APDL_COMMENTBLOCK
 STC_APDL_NUMBER = _stc.STC_APDL_NUMBER
 STC_APDL_STRING = _stc.STC_APDL_STRING
 STC_APDL_DEFAULT = _stc.STC_APDL_DEFAULT
 STC_APDL_COMMENT = _stc.STC_APDL_COMMENT
 STC_APDL_COMMENTBLOCK = _stc.STC_APDL_COMMENTBLOCK
 STC_APDL_NUMBER = _stc.STC_APDL_NUMBER
 STC_APDL_STRING = _stc.STC_APDL_STRING

+STC_APDL_OPERATOR = _stc.STC_APDL_OPERATOR

 STC_APDL_WORD = _stc.STC_APDL_WORD
 STC_APDL_WORD = _stc.STC_APDL_WORD

-STC_APDL_COMMAND = _stc.STC_APDL_COMMAND

 STC_APDL_PROCESSOR = _stc.STC_APDL_PROCESSOR
 STC_APDL_PROCESSOR = _stc.STC_APDL_PROCESSOR

+STC_APDL_COMMAND = _stc.STC_APDL_COMMAND
+STC_APDL_SLASHCOMMAND = _stc.STC_APDL_SLASHCOMMAND
+STC_APDL_STARCOMMAND = _stc.STC_APDL_STARCOMMAND
+STC_APDL_ARGUMENT = _stc.STC_APDL_ARGUMENT

 STC_APDL_FUNCTION = _stc.STC_APDL_FUNCTION
 STC_SH_DEFAULT = _stc.STC_SH_DEFAULT
 STC_SH_ERROR = _stc.STC_SH_ERROR
 STC_APDL_FUNCTION = _stc.STC_APDL_FUNCTION
 STC_SH_DEFAULT = _stc.STC_SH_DEFAULT
 STC_SH_ERROR = _stc.STC_SH_ERROR


@@ -967,6 +976,32 @@ STC_SH_PARAM = _stc.STC_SH_PARAM
 STC_SH_BACKTICKS = _stc.STC_SH_BACKTICKS
 STC_SH_HERE_DELIM = _stc.STC_SH_HERE_DELIM
 STC_SH_HERE_Q = _stc.STC_SH_HERE_Q
 STC_SH_BACKTICKS = _stc.STC_SH_BACKTICKS
 STC_SH_HERE_DELIM = _stc.STC_SH_HERE_DELIM
 STC_SH_HERE_Q = _stc.STC_SH_HERE_Q

+STC_ASN1_DEFAULT = _stc.STC_ASN1_DEFAULT
+STC_ASN1_COMMENT = _stc.STC_ASN1_COMMENT
+STC_ASN1_IDENTIFIER = _stc.STC_ASN1_IDENTIFIER
+STC_ASN1_STRING = _stc.STC_ASN1_STRING
+STC_ASN1_OID = _stc.STC_ASN1_OID
+STC_ASN1_SCALAR = _stc.STC_ASN1_SCALAR
+STC_ASN1_KEYWORD = _stc.STC_ASN1_KEYWORD
+STC_ASN1_ATTRIBUTE = _stc.STC_ASN1_ATTRIBUTE
+STC_ASN1_DESCRIPTOR = _stc.STC_ASN1_DESCRIPTOR
+STC_ASN1_TYPE = _stc.STC_ASN1_TYPE
+STC_ASN1_OPERATOR = _stc.STC_ASN1_OPERATOR
+STC_VHDL_DEFAULT = _stc.STC_VHDL_DEFAULT
+STC_VHDL_COMMENT = _stc.STC_VHDL_COMMENT
+STC_VHDL_COMMENTLINEBANG = _stc.STC_VHDL_COMMENTLINEBANG
+STC_VHDL_NUMBER = _stc.STC_VHDL_NUMBER
+STC_VHDL_STRING = _stc.STC_VHDL_STRING
+STC_VHDL_OPERATOR = _stc.STC_VHDL_OPERATOR
+STC_VHDL_IDENTIFIER = _stc.STC_VHDL_IDENTIFIER
+STC_VHDL_STRINGEOL = _stc.STC_VHDL_STRINGEOL
+STC_VHDL_KEYWORD = _stc.STC_VHDL_KEYWORD
+STC_VHDL_STDOPERATOR = _stc.STC_VHDL_STDOPERATOR
+STC_VHDL_ATTRIBUTE = _stc.STC_VHDL_ATTRIBUTE
+STC_VHDL_STDFUNCTION = _stc.STC_VHDL_STDFUNCTION
+STC_VHDL_STDPACKAGE = _stc.STC_VHDL_STDPACKAGE
+STC_VHDL_STDTYPE = _stc.STC_VHDL_STDTYPE
+STC_VHDL_USERWORD = _stc.STC_VHDL_USERWORD

 STC_CMD_REDO = _stc.STC_CMD_REDO
 STC_CMD_SELECTALL = _stc.STC_CMD_SELECTALL
 STC_CMD_UNDO = _stc.STC_CMD_UNDO
 STC_CMD_REDO = _stc.STC_CMD_REDO
 STC_CMD_SELECTALL = _stc.STC_CMD_SELECTALL
 STC_CMD_UNDO = _stc.STC_CMD_UNDO


@@ -2690,6 +2725,10 @@ class StyledTextCtrl(_core.Control):
         """Allocate(self, int bytes)"""
         return _stc.StyledTextCtrl_Allocate(*args, **kwargs)
 
         """Allocate(self, int bytes)"""
         return _stc.StyledTextCtrl_Allocate(*args, **kwargs)
 

+    def FindColumn(*args, **kwargs):
+        """FindColumn(self, int line, int column) -> int"""
+        return _stc.StyledTextCtrl_FindColumn(*args, **kwargs)
+

     def StartRecord(*args, **kwargs):
         """StartRecord(self)"""
         return _stc.StyledTextCtrl_StartRecord(*args, **kwargs)
     def StartRecord(*args, **kwargs):
         """StartRecord(self)"""
         return _stc.StyledTextCtrl_StartRecord(*args, **kwargs)

diff --git a/wxPython/contrib/stc/gtk/stc_wrap.cpp b/wxPython/contrib/stc/gtk/stc_wrap.cpp
index 674081f0c0356ad7d5ce4338b7549ebc6feefe4d..3f66219e14ba9004fc5f916ee952ea4bd633ad5b 100644 (file)
--- a/wxPython/contrib/stc/gtk/stc_wrap.cpp
+++ b/wxPython/contrib/stc/gtk/stc_wrap.cpp
@@ -14179,6 +14179,46 @@ static PyObject *_wrap_StyledTextCtrl_Allocate(PyObject *, PyObject *args, PyObj
 }
 
 
 }
 
 

+static PyObject *_wrap_StyledTextCtrl_FindColumn(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    int arg2 ;
+    int arg3 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "line",(char *) "column", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_FindColumn",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    {
+        arg3 = (int)(SWIG_As_int(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)(arg1)->FindColumn(arg2,arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+

 static PyObject *_wrap_StyledTextCtrl_StartRecord(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
 static PyObject *_wrap_StyledTextCtrl_StartRecord(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;


@@ -17068,6 +17108,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"StyledTextCtrl_SetCharsDefault", (PyCFunction) _wrap_StyledTextCtrl_SetCharsDefault, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_AutoCompGetCurrent", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetCurrent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_Allocate", (PyCFunction) _wrap_StyledTextCtrl_Allocate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_SetCharsDefault", (PyCFunction) _wrap_StyledTextCtrl_SetCharsDefault, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_AutoCompGetCurrent", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetCurrent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_Allocate", (PyCFunction) _wrap_StyledTextCtrl_Allocate, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"StyledTextCtrl_FindColumn", (PyCFunction) _wrap_StyledTextCtrl_FindColumn, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"StyledTextCtrl_StartRecord", (PyCFunction) _wrap_StyledTextCtrl_StartRecord, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_StopRecord", (PyCFunction) _wrap_StyledTextCtrl_StopRecord, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_SetLexer", (PyCFunction) _wrap_StyledTextCtrl_SetLexer, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_StartRecord", (PyCFunction) _wrap_StyledTextCtrl_StartRecord, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_StopRecord", (PyCFunction) _wrap_StyledTextCtrl_StopRecord, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_SetLexer", (PyCFunction) _wrap_StyledTextCtrl_SetLexer, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -18737,6 +18778,12 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"STC_LEX_BASH", SWIG_From_int((int)(62))); 
     }
     {
         PyDict_SetItemString(d,"STC_LEX_BASH", SWIG_From_int((int)(62))); 
     }

+    {
+        PyDict_SetItemString(d,"STC_LEX_ASN1", SWIG_From_int((int)(63))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_LEX_VHDL", SWIG_From_int((int)(64))); 
+    }

     {
         PyDict_SetItemString(d,"STC_LEX_AUTOMATIC", SWIG_From_int((int)(1000))); 
     }
     {
         PyDict_SetItemString(d,"STC_LEX_AUTOMATIC", SWIG_From_int((int)(1000))); 
     }


@@ -19460,6 +19507,9 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"STC_ERR_TIDY", SWIG_From_int((int)(19))); 
     }
     {
         PyDict_SetItemString(d,"STC_ERR_TIDY", SWIG_From_int((int)(19))); 
     }

+    {
+        PyDict_SetItemString(d,"STC_ERR_JAVA_STACK", SWIG_From_int((int)(20))); 
+    }

     {
         PyDict_SetItemString(d,"STC_BAT_DEFAULT", SWIG_From_int((int)(0))); 
     }
     {
         PyDict_SetItemString(d,"STC_BAT_DEFAULT", SWIG_From_int((int)(0))); 
     }


@@ -20000,6 +20050,9 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"STC_CSS_SINGLESTRING", SWIG_From_int((int)(14))); 
     }
     {
         PyDict_SetItemString(d,"STC_CSS_SINGLESTRING", SWIG_From_int((int)(14))); 
     }

+    {
+        PyDict_SetItemString(d,"STC_CSS_IDENTIFIER2", SWIG_From_int((int)(15))); 
+    }

     {
         PyDict_SetItemString(d,"STC_POV_DEFAULT", SWIG_From_int((int)(0))); 
     }
     {
         PyDict_SetItemString(d,"STC_POV_DEFAULT", SWIG_From_int((int)(0))); 
     }


@@ -20684,6 +20737,9 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"STC_AU3_PREPROCESSOR", SWIG_From_int((int)(11))); 
     }
     {
         PyDict_SetItemString(d,"STC_AU3_PREPROCESSOR", SWIG_From_int((int)(11))); 
     }

+    {
+        PyDict_SetItemString(d,"STC_AU3_SPECIAL", SWIG_From_int((int)(12))); 
+    }

     {
         PyDict_SetItemString(d,"STC_APDL_DEFAULT", SWIG_From_int((int)(0))); 
     }
     {
         PyDict_SetItemString(d,"STC_APDL_DEFAULT", SWIG_From_int((int)(0))); 
     }


@@ -20700,16 +20756,28 @@ SWIGEXPORT(void) SWIG_init(void) {
         PyDict_SetItemString(d,"STC_APDL_STRING", SWIG_From_int((int)(4))); 
     }
     {
         PyDict_SetItemString(d,"STC_APDL_STRING", SWIG_From_int((int)(4))); 
     }
     {

-        PyDict_SetItemString(d,"STC_APDL_WORD", SWIG_From_int((int)(5))); 
+        PyDict_SetItemString(d,"STC_APDL_OPERATOR", SWIG_From_int((int)(5))); 

     }
     {
     }
     {

-        PyDict_SetItemString(d,"STC_APDL_COMMAND", SWIG_From_int((int)(6))); 
+        PyDict_SetItemString(d,"STC_APDL_WORD", SWIG_From_int((int)(6))); 

     }
     {
         PyDict_SetItemString(d,"STC_APDL_PROCESSOR", SWIG_From_int((int)(7))); 
     }
     {
     }
     {
         PyDict_SetItemString(d,"STC_APDL_PROCESSOR", SWIG_From_int((int)(7))); 
     }
     {

-        PyDict_SetItemString(d,"STC_APDL_FUNCTION", SWIG_From_int((int)(8))); 
+        PyDict_SetItemString(d,"STC_APDL_COMMAND", SWIG_From_int((int)(8))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_APDL_SLASHCOMMAND", SWIG_From_int((int)(9))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_APDL_STARCOMMAND", SWIG_From_int((int)(10))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_APDL_ARGUMENT", SWIG_From_int((int)(11))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_APDL_FUNCTION", SWIG_From_int((int)(12))); 

     }
     {
         PyDict_SetItemString(d,"STC_SH_DEFAULT", SWIG_From_int((int)(0))); 
     }
     {
         PyDict_SetItemString(d,"STC_SH_DEFAULT", SWIG_From_int((int)(0))); 


@@ -20753,6 +20821,84 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"STC_SH_HERE_Q", SWIG_From_int((int)(13))); 
     }
     {
         PyDict_SetItemString(d,"STC_SH_HERE_Q", SWIG_From_int((int)(13))); 
     }

+    {
+        PyDict_SetItemString(d,"STC_ASN1_DEFAULT", SWIG_From_int((int)(0))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_COMMENT", SWIG_From_int((int)(1))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_IDENTIFIER", SWIG_From_int((int)(2))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_STRING", SWIG_From_int((int)(3))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_OID", SWIG_From_int((int)(4))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_SCALAR", SWIG_From_int((int)(5))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_KEYWORD", SWIG_From_int((int)(6))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_ATTRIBUTE", SWIG_From_int((int)(7))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_DESCRIPTOR", SWIG_From_int((int)(8))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_TYPE", SWIG_From_int((int)(9))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_OPERATOR", SWIG_From_int((int)(10))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_DEFAULT", SWIG_From_int((int)(0))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_COMMENT", SWIG_From_int((int)(1))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_COMMENTLINEBANG", SWIG_From_int((int)(2))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_NUMBER", SWIG_From_int((int)(3))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_STRING", SWIG_From_int((int)(4))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_OPERATOR", SWIG_From_int((int)(5))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_IDENTIFIER", SWIG_From_int((int)(6))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_STRINGEOL", SWIG_From_int((int)(7))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_KEYWORD", SWIG_From_int((int)(8))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_STDOPERATOR", SWIG_From_int((int)(9))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_ATTRIBUTE", SWIG_From_int((int)(10))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_STDFUNCTION", SWIG_From_int((int)(11))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_STDPACKAGE", SWIG_From_int((int)(12))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_STDTYPE", SWIG_From_int((int)(13))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_USERWORD", SWIG_From_int((int)(14))); 
+    }

     {
         PyDict_SetItemString(d,"STC_CMD_REDO", SWIG_From_int((int)(2011))); 
     }
     {
         PyDict_SetItemString(d,"STC_CMD_REDO", SWIG_From_int((int)(2011))); 
     }

diff --git a/wxPython/contrib/stc/msw/stc.py b/wxPython/contrib/stc/msw/stc.py
index ffaf3bcfa9d898d23b52957ea4f6fef1c7dcf522..481ac536fa8edfa084fadd531fd0b28f18a7c21d 100644 (file)
--- a/wxPython/contrib/stc/msw/stc.py
+++ b/wxPython/contrib/stc/msw/stc.py
@@ -295,6 +295,8 @@ STC_LEX_SPECMAN = _stc.STC_LEX_SPECMAN
 STC_LEX_AU3 = _stc.STC_LEX_AU3
 STC_LEX_APDL = _stc.STC_LEX_APDL
 STC_LEX_BASH = _stc.STC_LEX_BASH
 STC_LEX_AU3 = _stc.STC_LEX_AU3
 STC_LEX_APDL = _stc.STC_LEX_APDL
 STC_LEX_BASH = _stc.STC_LEX_BASH

+STC_LEX_ASN1 = _stc.STC_LEX_ASN1
+STC_LEX_VHDL = _stc.STC_LEX_VHDL

 STC_LEX_AUTOMATIC = _stc.STC_LEX_AUTOMATIC
 STC_P_DEFAULT = _stc.STC_P_DEFAULT
 STC_P_COMMENTLINE = _stc.STC_P_COMMENTLINE
 STC_LEX_AUTOMATIC = _stc.STC_LEX_AUTOMATIC
 STC_P_DEFAULT = _stc.STC_P_DEFAULT
 STC_P_COMMENTLINE = _stc.STC_P_COMMENTLINE


@@ -536,6 +538,7 @@ STC_ERR_IFC = _stc.STC_ERR_IFC
 STC_ERR_IFORT = _stc.STC_ERR_IFORT
 STC_ERR_ABSF = _stc.STC_ERR_ABSF
 STC_ERR_TIDY = _stc.STC_ERR_TIDY
 STC_ERR_IFORT = _stc.STC_ERR_IFORT
 STC_ERR_ABSF = _stc.STC_ERR_ABSF
 STC_ERR_TIDY = _stc.STC_ERR_TIDY

+STC_ERR_JAVA_STACK = _stc.STC_ERR_JAVA_STACK

 STC_BAT_DEFAULT = _stc.STC_BAT_DEFAULT
 STC_BAT_COMMENT = _stc.STC_BAT_COMMENT
 STC_BAT_WORD = _stc.STC_BAT_WORD
 STC_BAT_DEFAULT = _stc.STC_BAT_DEFAULT
 STC_BAT_COMMENT = _stc.STC_BAT_COMMENT
 STC_BAT_WORD = _stc.STC_BAT_WORD


@@ -716,6 +719,7 @@ STC_CSS_IMPORTANT = _stc.STC_CSS_IMPORTANT
 STC_CSS_DIRECTIVE = _stc.STC_CSS_DIRECTIVE
 STC_CSS_DOUBLESTRING = _stc.STC_CSS_DOUBLESTRING
 STC_CSS_SINGLESTRING = _stc.STC_CSS_SINGLESTRING
 STC_CSS_DIRECTIVE = _stc.STC_CSS_DIRECTIVE
 STC_CSS_DOUBLESTRING = _stc.STC_CSS_DOUBLESTRING
 STC_CSS_SINGLESTRING = _stc.STC_CSS_SINGLESTRING

+STC_CSS_IDENTIFIER2 = _stc.STC_CSS_IDENTIFIER2

 STC_POV_DEFAULT = _stc.STC_POV_DEFAULT
 STC_POV_COMMENT = _stc.STC_POV_COMMENT
 STC_POV_COMMENTLINE = _stc.STC_POV_COMMENTLINE
 STC_POV_DEFAULT = _stc.STC_POV_DEFAULT
 STC_POV_COMMENT = _stc.STC_POV_COMMENT
 STC_POV_COMMENTLINE = _stc.STC_POV_COMMENTLINE


@@ -944,14 +948,19 @@ STC_AU3_OPERATOR = _stc.STC_AU3_OPERATOR
 STC_AU3_VARIABLE = _stc.STC_AU3_VARIABLE
 STC_AU3_SENT = _stc.STC_AU3_SENT
 STC_AU3_PREPROCESSOR = _stc.STC_AU3_PREPROCESSOR
 STC_AU3_VARIABLE = _stc.STC_AU3_VARIABLE
 STC_AU3_SENT = _stc.STC_AU3_SENT
 STC_AU3_PREPROCESSOR = _stc.STC_AU3_PREPROCESSOR

+STC_AU3_SPECIAL = _stc.STC_AU3_SPECIAL

 STC_APDL_DEFAULT = _stc.STC_APDL_DEFAULT
 STC_APDL_COMMENT = _stc.STC_APDL_COMMENT
 STC_APDL_COMMENTBLOCK = _stc.STC_APDL_COMMENTBLOCK
 STC_APDL_NUMBER = _stc.STC_APDL_NUMBER
 STC_APDL_STRING = _stc.STC_APDL_STRING
 STC_APDL_DEFAULT = _stc.STC_APDL_DEFAULT
 STC_APDL_COMMENT = _stc.STC_APDL_COMMENT
 STC_APDL_COMMENTBLOCK = _stc.STC_APDL_COMMENTBLOCK
 STC_APDL_NUMBER = _stc.STC_APDL_NUMBER
 STC_APDL_STRING = _stc.STC_APDL_STRING

+STC_APDL_OPERATOR = _stc.STC_APDL_OPERATOR

 STC_APDL_WORD = _stc.STC_APDL_WORD
 STC_APDL_WORD = _stc.STC_APDL_WORD

-STC_APDL_COMMAND = _stc.STC_APDL_COMMAND

 STC_APDL_PROCESSOR = _stc.STC_APDL_PROCESSOR
 STC_APDL_PROCESSOR = _stc.STC_APDL_PROCESSOR

+STC_APDL_COMMAND = _stc.STC_APDL_COMMAND
+STC_APDL_SLASHCOMMAND = _stc.STC_APDL_SLASHCOMMAND
+STC_APDL_STARCOMMAND = _stc.STC_APDL_STARCOMMAND
+STC_APDL_ARGUMENT = _stc.STC_APDL_ARGUMENT

 STC_APDL_FUNCTION = _stc.STC_APDL_FUNCTION
 STC_SH_DEFAULT = _stc.STC_SH_DEFAULT
 STC_SH_ERROR = _stc.STC_SH_ERROR
 STC_APDL_FUNCTION = _stc.STC_APDL_FUNCTION
 STC_SH_DEFAULT = _stc.STC_SH_DEFAULT
 STC_SH_ERROR = _stc.STC_SH_ERROR


@@ -967,6 +976,32 @@ STC_SH_PARAM = _stc.STC_SH_PARAM
 STC_SH_BACKTICKS = _stc.STC_SH_BACKTICKS
 STC_SH_HERE_DELIM = _stc.STC_SH_HERE_DELIM
 STC_SH_HERE_Q = _stc.STC_SH_HERE_Q
 STC_SH_BACKTICKS = _stc.STC_SH_BACKTICKS
 STC_SH_HERE_DELIM = _stc.STC_SH_HERE_DELIM
 STC_SH_HERE_Q = _stc.STC_SH_HERE_Q

+STC_ASN1_DEFAULT = _stc.STC_ASN1_DEFAULT
+STC_ASN1_COMMENT = _stc.STC_ASN1_COMMENT
+STC_ASN1_IDENTIFIER = _stc.STC_ASN1_IDENTIFIER
+STC_ASN1_STRING = _stc.STC_ASN1_STRING
+STC_ASN1_OID = _stc.STC_ASN1_OID
+STC_ASN1_SCALAR = _stc.STC_ASN1_SCALAR
+STC_ASN1_KEYWORD = _stc.STC_ASN1_KEYWORD
+STC_ASN1_ATTRIBUTE = _stc.STC_ASN1_ATTRIBUTE
+STC_ASN1_DESCRIPTOR = _stc.STC_ASN1_DESCRIPTOR
+STC_ASN1_TYPE = _stc.STC_ASN1_TYPE
+STC_ASN1_OPERATOR = _stc.STC_ASN1_OPERATOR
+STC_VHDL_DEFAULT = _stc.STC_VHDL_DEFAULT
+STC_VHDL_COMMENT = _stc.STC_VHDL_COMMENT
+STC_VHDL_COMMENTLINEBANG = _stc.STC_VHDL_COMMENTLINEBANG
+STC_VHDL_NUMBER = _stc.STC_VHDL_NUMBER
+STC_VHDL_STRING = _stc.STC_VHDL_STRING
+STC_VHDL_OPERATOR = _stc.STC_VHDL_OPERATOR
+STC_VHDL_IDENTIFIER = _stc.STC_VHDL_IDENTIFIER
+STC_VHDL_STRINGEOL = _stc.STC_VHDL_STRINGEOL
+STC_VHDL_KEYWORD = _stc.STC_VHDL_KEYWORD
+STC_VHDL_STDOPERATOR = _stc.STC_VHDL_STDOPERATOR
+STC_VHDL_ATTRIBUTE = _stc.STC_VHDL_ATTRIBUTE
+STC_VHDL_STDFUNCTION = _stc.STC_VHDL_STDFUNCTION
+STC_VHDL_STDPACKAGE = _stc.STC_VHDL_STDPACKAGE
+STC_VHDL_STDTYPE = _stc.STC_VHDL_STDTYPE
+STC_VHDL_USERWORD = _stc.STC_VHDL_USERWORD

 STC_CMD_REDO = _stc.STC_CMD_REDO
 STC_CMD_SELECTALL = _stc.STC_CMD_SELECTALL
 STC_CMD_UNDO = _stc.STC_CMD_UNDO
 STC_CMD_REDO = _stc.STC_CMD_REDO
 STC_CMD_SELECTALL = _stc.STC_CMD_SELECTALL
 STC_CMD_UNDO = _stc.STC_CMD_UNDO


@@ -2690,6 +2725,10 @@ class StyledTextCtrl(_core.Control):
         """Allocate(self, int bytes)"""
         return _stc.StyledTextCtrl_Allocate(*args, **kwargs)
 
         """Allocate(self, int bytes)"""
         return _stc.StyledTextCtrl_Allocate(*args, **kwargs)
 

+    def FindColumn(*args, **kwargs):
+        """FindColumn(self, int line, int column) -> int"""
+        return _stc.StyledTextCtrl_FindColumn(*args, **kwargs)
+

     def StartRecord(*args, **kwargs):
         """StartRecord(self)"""
         return _stc.StyledTextCtrl_StartRecord(*args, **kwargs)
     def StartRecord(*args, **kwargs):
         """StartRecord(self)"""
         return _stc.StyledTextCtrl_StartRecord(*args, **kwargs)

diff --git a/wxPython/contrib/stc/msw/stc_wrap.cpp b/wxPython/contrib/stc/msw/stc_wrap.cpp
index 80826cc0b78bee18f7ffbe27323bf3107dbc9fb7..bcb3645551494bd0a1bd15fa77e8afef28f6cd4e 100644 (file)
--- a/wxPython/contrib/stc/msw/stc_wrap.cpp
+++ b/wxPython/contrib/stc/msw/stc_wrap.cpp
@@ -14179,6 +14179,46 @@ static PyObject *_wrap_StyledTextCtrl_Allocate(PyObject *, PyObject *args, PyObj
 }
 
 
 }
 
 

+static PyObject *_wrap_StyledTextCtrl_FindColumn(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    int arg2 ;
+    int arg3 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "line",(char *) "column", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_FindColumn",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    {
+        arg3 = (int)(SWIG_As_int(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)(arg1)->FindColumn(arg2,arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+

 static PyObject *_wrap_StyledTextCtrl_StartRecord(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
 static PyObject *_wrap_StyledTextCtrl_StartRecord(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;


@@ -17068,6 +17108,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"StyledTextCtrl_SetCharsDefault", (PyCFunction) _wrap_StyledTextCtrl_SetCharsDefault, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_AutoCompGetCurrent", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetCurrent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_Allocate", (PyCFunction) _wrap_StyledTextCtrl_Allocate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_SetCharsDefault", (PyCFunction) _wrap_StyledTextCtrl_SetCharsDefault, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_AutoCompGetCurrent", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetCurrent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_Allocate", (PyCFunction) _wrap_StyledTextCtrl_Allocate, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"StyledTextCtrl_FindColumn", (PyCFunction) _wrap_StyledTextCtrl_FindColumn, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"StyledTextCtrl_StartRecord", (PyCFunction) _wrap_StyledTextCtrl_StartRecord, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_StopRecord", (PyCFunction) _wrap_StyledTextCtrl_StopRecord, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_SetLexer", (PyCFunction) _wrap_StyledTextCtrl_SetLexer, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_StartRecord", (PyCFunction) _wrap_StyledTextCtrl_StartRecord, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_StopRecord", (PyCFunction) _wrap_StyledTextCtrl_StopRecord, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_SetLexer", (PyCFunction) _wrap_StyledTextCtrl_SetLexer, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -18737,6 +18778,12 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"STC_LEX_BASH", SWIG_From_int((int)(62))); 
     }
     {
         PyDict_SetItemString(d,"STC_LEX_BASH", SWIG_From_int((int)(62))); 
     }

+    {
+        PyDict_SetItemString(d,"STC_LEX_ASN1", SWIG_From_int((int)(63))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_LEX_VHDL", SWIG_From_int((int)(64))); 
+    }

     {
         PyDict_SetItemString(d,"STC_LEX_AUTOMATIC", SWIG_From_int((int)(1000))); 
     }
     {
         PyDict_SetItemString(d,"STC_LEX_AUTOMATIC", SWIG_From_int((int)(1000))); 
     }


@@ -19460,6 +19507,9 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"STC_ERR_TIDY", SWIG_From_int((int)(19))); 
     }
     {
         PyDict_SetItemString(d,"STC_ERR_TIDY", SWIG_From_int((int)(19))); 
     }

+    {
+        PyDict_SetItemString(d,"STC_ERR_JAVA_STACK", SWIG_From_int((int)(20))); 
+    }

     {
         PyDict_SetItemString(d,"STC_BAT_DEFAULT", SWIG_From_int((int)(0))); 
     }
     {
         PyDict_SetItemString(d,"STC_BAT_DEFAULT", SWIG_From_int((int)(0))); 
     }


@@ -20000,6 +20050,9 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"STC_CSS_SINGLESTRING", SWIG_From_int((int)(14))); 
     }
     {
         PyDict_SetItemString(d,"STC_CSS_SINGLESTRING", SWIG_From_int((int)(14))); 
     }

+    {
+        PyDict_SetItemString(d,"STC_CSS_IDENTIFIER2", SWIG_From_int((int)(15))); 
+    }

     {
         PyDict_SetItemString(d,"STC_POV_DEFAULT", SWIG_From_int((int)(0))); 
     }
     {
         PyDict_SetItemString(d,"STC_POV_DEFAULT", SWIG_From_int((int)(0))); 
     }


@@ -20684,6 +20737,9 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"STC_AU3_PREPROCESSOR", SWIG_From_int((int)(11))); 
     }
     {
         PyDict_SetItemString(d,"STC_AU3_PREPROCESSOR", SWIG_From_int((int)(11))); 
     }

+    {
+        PyDict_SetItemString(d,"STC_AU3_SPECIAL", SWIG_From_int((int)(12))); 
+    }

     {
         PyDict_SetItemString(d,"STC_APDL_DEFAULT", SWIG_From_int((int)(0))); 
     }
     {
         PyDict_SetItemString(d,"STC_APDL_DEFAULT", SWIG_From_int((int)(0))); 
     }


@@ -20700,16 +20756,28 @@ SWIGEXPORT(void) SWIG_init(void) {
         PyDict_SetItemString(d,"STC_APDL_STRING", SWIG_From_int((int)(4))); 
     }
     {
         PyDict_SetItemString(d,"STC_APDL_STRING", SWIG_From_int((int)(4))); 
     }
     {

-        PyDict_SetItemString(d,"STC_APDL_WORD", SWIG_From_int((int)(5))); 
+        PyDict_SetItemString(d,"STC_APDL_OPERATOR", SWIG_From_int((int)(5))); 

     }
     {
     }
     {

-        PyDict_SetItemString(d,"STC_APDL_COMMAND", SWIG_From_int((int)(6))); 
+        PyDict_SetItemString(d,"STC_APDL_WORD", SWIG_From_int((int)(6))); 

     }
     {
         PyDict_SetItemString(d,"STC_APDL_PROCESSOR", SWIG_From_int((int)(7))); 
     }
     {
     }
     {
         PyDict_SetItemString(d,"STC_APDL_PROCESSOR", SWIG_From_int((int)(7))); 
     }
     {

-        PyDict_SetItemString(d,"STC_APDL_FUNCTION", SWIG_From_int((int)(8))); 
+        PyDict_SetItemString(d,"STC_APDL_COMMAND", SWIG_From_int((int)(8))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_APDL_SLASHCOMMAND", SWIG_From_int((int)(9))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_APDL_STARCOMMAND", SWIG_From_int((int)(10))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_APDL_ARGUMENT", SWIG_From_int((int)(11))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_APDL_FUNCTION", SWIG_From_int((int)(12))); 

     }
     {
         PyDict_SetItemString(d,"STC_SH_DEFAULT", SWIG_From_int((int)(0))); 
     }
     {
         PyDict_SetItemString(d,"STC_SH_DEFAULT", SWIG_From_int((int)(0))); 


@@ -20753,6 +20821,84 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"STC_SH_HERE_Q", SWIG_From_int((int)(13))); 
     }
     {
         PyDict_SetItemString(d,"STC_SH_HERE_Q", SWIG_From_int((int)(13))); 
     }

+    {
+        PyDict_SetItemString(d,"STC_ASN1_DEFAULT", SWIG_From_int((int)(0))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_COMMENT", SWIG_From_int((int)(1))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_IDENTIFIER", SWIG_From_int((int)(2))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_STRING", SWIG_From_int((int)(3))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_OID", SWIG_From_int((int)(4))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_SCALAR", SWIG_From_int((int)(5))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_KEYWORD", SWIG_From_int((int)(6))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_ATTRIBUTE", SWIG_From_int((int)(7))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_DESCRIPTOR", SWIG_From_int((int)(8))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_TYPE", SWIG_From_int((int)(9))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_ASN1_OPERATOR", SWIG_From_int((int)(10))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_DEFAULT", SWIG_From_int((int)(0))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_COMMENT", SWIG_From_int((int)(1))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_COMMENTLINEBANG", SWIG_From_int((int)(2))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_NUMBER", SWIG_From_int((int)(3))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_STRING", SWIG_From_int((int)(4))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_OPERATOR", SWIG_From_int((int)(5))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_IDENTIFIER", SWIG_From_int((int)(6))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_STRINGEOL", SWIG_From_int((int)(7))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_KEYWORD", SWIG_From_int((int)(8))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_STDOPERATOR", SWIG_From_int((int)(9))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_ATTRIBUTE", SWIG_From_int((int)(10))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_STDFUNCTION", SWIG_From_int((int)(11))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_STDPACKAGE", SWIG_From_int((int)(12))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_STDTYPE", SWIG_From_int((int)(13))); 
+    }
+    {
+        PyDict_SetItemString(d,"STC_VHDL_USERWORD", SWIG_From_int((int)(14))); 
+    }

     {
         PyDict_SetItemString(d,"STC_CMD_REDO", SWIG_From_int((int)(2011))); 
     }
     {
         PyDict_SetItemString(d,"STC_CMD_REDO", SWIG_From_int((int)(2011))); 
     }

diff --git a/wxPython/wxPython/stc.py b/wxPython/wxPython/stc.py
index ceb8e3a510e96b1309cfc3e5324ddf5213b09aae..4548a750704161a927139fa0e037443a507b0732 100644 (file)
--- a/wxPython/wxPython/stc.py
+++ b/wxPython/wxPython/stc.py
@@ -261,6 +261,8 @@ wxSTC_LEX_SPECMAN = wx.stc.STC_LEX_SPECMAN
 wxSTC_LEX_AU3 = wx.stc.STC_LEX_AU3
 wxSTC_LEX_APDL = wx.stc.STC_LEX_APDL
 wxSTC_LEX_BASH = wx.stc.STC_LEX_BASH
 wxSTC_LEX_AU3 = wx.stc.STC_LEX_AU3
 wxSTC_LEX_APDL = wx.stc.STC_LEX_APDL
 wxSTC_LEX_BASH = wx.stc.STC_LEX_BASH

+wxSTC_LEX_ASN1 = wx.stc.STC_LEX_ASN1
+wxSTC_LEX_VHDL = wx.stc.STC_LEX_VHDL

 wxSTC_LEX_AUTOMATIC = wx.stc.STC_LEX_AUTOMATIC
 wxSTC_P_DEFAULT = wx.stc.STC_P_DEFAULT
 wxSTC_P_COMMENTLINE = wx.stc.STC_P_COMMENTLINE
 wxSTC_LEX_AUTOMATIC = wx.stc.STC_LEX_AUTOMATIC
 wxSTC_P_DEFAULT = wx.stc.STC_P_DEFAULT
 wxSTC_P_COMMENTLINE = wx.stc.STC_P_COMMENTLINE


@@ -502,6 +504,7 @@ wxSTC_ERR_IFC = wx.stc.STC_ERR_IFC
 wxSTC_ERR_IFORT = wx.stc.STC_ERR_IFORT
 wxSTC_ERR_ABSF = wx.stc.STC_ERR_ABSF
 wxSTC_ERR_TIDY = wx.stc.STC_ERR_TIDY
 wxSTC_ERR_IFORT = wx.stc.STC_ERR_IFORT
 wxSTC_ERR_ABSF = wx.stc.STC_ERR_ABSF
 wxSTC_ERR_TIDY = wx.stc.STC_ERR_TIDY

+wxSTC_ERR_JAVA_STACK = wx.stc.STC_ERR_JAVA_STACK

 wxSTC_BAT_DEFAULT = wx.stc.STC_BAT_DEFAULT
 wxSTC_BAT_COMMENT = wx.stc.STC_BAT_COMMENT
 wxSTC_BAT_WORD = wx.stc.STC_BAT_WORD
 wxSTC_BAT_DEFAULT = wx.stc.STC_BAT_DEFAULT
 wxSTC_BAT_COMMENT = wx.stc.STC_BAT_COMMENT
 wxSTC_BAT_WORD = wx.stc.STC_BAT_WORD


@@ -682,6 +685,7 @@ wxSTC_CSS_IMPORTANT = wx.stc.STC_CSS_IMPORTANT
 wxSTC_CSS_DIRECTIVE = wx.stc.STC_CSS_DIRECTIVE
 wxSTC_CSS_DOUBLESTRING = wx.stc.STC_CSS_DOUBLESTRING
 wxSTC_CSS_SINGLESTRING = wx.stc.STC_CSS_SINGLESTRING
 wxSTC_CSS_DIRECTIVE = wx.stc.STC_CSS_DIRECTIVE
 wxSTC_CSS_DOUBLESTRING = wx.stc.STC_CSS_DOUBLESTRING
 wxSTC_CSS_SINGLESTRING = wx.stc.STC_CSS_SINGLESTRING

+wxSTC_CSS_IDENTIFIER2 = wx.stc.STC_CSS_IDENTIFIER2

 wxSTC_POV_DEFAULT = wx.stc.STC_POV_DEFAULT
 wxSTC_POV_COMMENT = wx.stc.STC_POV_COMMENT
 wxSTC_POV_COMMENTLINE = wx.stc.STC_POV_COMMENTLINE
 wxSTC_POV_DEFAULT = wx.stc.STC_POV_DEFAULT
 wxSTC_POV_COMMENT = wx.stc.STC_POV_COMMENT
 wxSTC_POV_COMMENTLINE = wx.stc.STC_POV_COMMENTLINE


@@ -910,14 +914,19 @@ wxSTC_AU3_OPERATOR = wx.stc.STC_AU3_OPERATOR
 wxSTC_AU3_VARIABLE = wx.stc.STC_AU3_VARIABLE
 wxSTC_AU3_SENT = wx.stc.STC_AU3_SENT
 wxSTC_AU3_PREPROCESSOR = wx.stc.STC_AU3_PREPROCESSOR
 wxSTC_AU3_VARIABLE = wx.stc.STC_AU3_VARIABLE
 wxSTC_AU3_SENT = wx.stc.STC_AU3_SENT
 wxSTC_AU3_PREPROCESSOR = wx.stc.STC_AU3_PREPROCESSOR

+wxSTC_AU3_SPECIAL = wx.stc.STC_AU3_SPECIAL

 wxSTC_APDL_DEFAULT = wx.stc.STC_APDL_DEFAULT
 wxSTC_APDL_COMMENT = wx.stc.STC_APDL_COMMENT
 wxSTC_APDL_COMMENTBLOCK = wx.stc.STC_APDL_COMMENTBLOCK
 wxSTC_APDL_NUMBER = wx.stc.STC_APDL_NUMBER
 wxSTC_APDL_STRING = wx.stc.STC_APDL_STRING
 wxSTC_APDL_DEFAULT = wx.stc.STC_APDL_DEFAULT
 wxSTC_APDL_COMMENT = wx.stc.STC_APDL_COMMENT
 wxSTC_APDL_COMMENTBLOCK = wx.stc.STC_APDL_COMMENTBLOCK
 wxSTC_APDL_NUMBER = wx.stc.STC_APDL_NUMBER
 wxSTC_APDL_STRING = wx.stc.STC_APDL_STRING

+wxSTC_APDL_OPERATOR = wx.stc.STC_APDL_OPERATOR

 wxSTC_APDL_WORD = wx.stc.STC_APDL_WORD
 wxSTC_APDL_WORD = wx.stc.STC_APDL_WORD

-wxSTC_APDL_COMMAND = wx.stc.STC_APDL_COMMAND

 wxSTC_APDL_PROCESSOR = wx.stc.STC_APDL_PROCESSOR
 wxSTC_APDL_PROCESSOR = wx.stc.STC_APDL_PROCESSOR

+wxSTC_APDL_COMMAND = wx.stc.STC_APDL_COMMAND
+wxSTC_APDL_SLASHCOMMAND = wx.stc.STC_APDL_SLASHCOMMAND
+wxSTC_APDL_STARCOMMAND = wx.stc.STC_APDL_STARCOMMAND
+wxSTC_APDL_ARGUMENT = wx.stc.STC_APDL_ARGUMENT

 wxSTC_APDL_FUNCTION = wx.stc.STC_APDL_FUNCTION
 wxSTC_SH_DEFAULT = wx.stc.STC_SH_DEFAULT
 wxSTC_SH_ERROR = wx.stc.STC_SH_ERROR
 wxSTC_APDL_FUNCTION = wx.stc.STC_APDL_FUNCTION
 wxSTC_SH_DEFAULT = wx.stc.STC_SH_DEFAULT
 wxSTC_SH_ERROR = wx.stc.STC_SH_ERROR


@@ -933,6 +942,32 @@ wxSTC_SH_PARAM = wx.stc.STC_SH_PARAM
 wxSTC_SH_BACKTICKS = wx.stc.STC_SH_BACKTICKS
 wxSTC_SH_HERE_DELIM = wx.stc.STC_SH_HERE_DELIM
 wxSTC_SH_HERE_Q = wx.stc.STC_SH_HERE_Q
 wxSTC_SH_BACKTICKS = wx.stc.STC_SH_BACKTICKS
 wxSTC_SH_HERE_DELIM = wx.stc.STC_SH_HERE_DELIM
 wxSTC_SH_HERE_Q = wx.stc.STC_SH_HERE_Q

+wxSTC_ASN1_DEFAULT = wx.stc.STC_ASN1_DEFAULT
+wxSTC_ASN1_COMMENT = wx.stc.STC_ASN1_COMMENT
+wxSTC_ASN1_IDENTIFIER = wx.stc.STC_ASN1_IDENTIFIER
+wxSTC_ASN1_STRING = wx.stc.STC_ASN1_STRING
+wxSTC_ASN1_OID = wx.stc.STC_ASN1_OID
+wxSTC_ASN1_SCALAR = wx.stc.STC_ASN1_SCALAR
+wxSTC_ASN1_KEYWORD = wx.stc.STC_ASN1_KEYWORD
+wxSTC_ASN1_ATTRIBUTE = wx.stc.STC_ASN1_ATTRIBUTE
+wxSTC_ASN1_DESCRIPTOR = wx.stc.STC_ASN1_DESCRIPTOR
+wxSTC_ASN1_TYPE = wx.stc.STC_ASN1_TYPE
+wxSTC_ASN1_OPERATOR = wx.stc.STC_ASN1_OPERATOR
+wxSTC_VHDL_DEFAULT = wx.stc.STC_VHDL_DEFAULT
+wxSTC_VHDL_COMMENT = wx.stc.STC_VHDL_COMMENT
+wxSTC_VHDL_COMMENTLINEBANG = wx.stc.STC_VHDL_COMMENTLINEBANG
+wxSTC_VHDL_NUMBER = wx.stc.STC_VHDL_NUMBER
+wxSTC_VHDL_STRING = wx.stc.STC_VHDL_STRING
+wxSTC_VHDL_OPERATOR = wx.stc.STC_VHDL_OPERATOR
+wxSTC_VHDL_IDENTIFIER = wx.stc.STC_VHDL_IDENTIFIER
+wxSTC_VHDL_STRINGEOL = wx.stc.STC_VHDL_STRINGEOL
+wxSTC_VHDL_KEYWORD = wx.stc.STC_VHDL_KEYWORD
+wxSTC_VHDL_STDOPERATOR = wx.stc.STC_VHDL_STDOPERATOR
+wxSTC_VHDL_ATTRIBUTE = wx.stc.STC_VHDL_ATTRIBUTE
+wxSTC_VHDL_STDFUNCTION = wx.stc.STC_VHDL_STDFUNCTION
+wxSTC_VHDL_STDPACKAGE = wx.stc.STC_VHDL_STDPACKAGE
+wxSTC_VHDL_STDTYPE = wx.stc.STC_VHDL_STDTYPE
+wxSTC_VHDL_USERWORD = wx.stc.STC_VHDL_USERWORD

 wxSTC_CMD_REDO = wx.stc.STC_CMD_REDO
 wxSTC_CMD_SELECTALL = wx.stc.STC_CMD_SELECTALL
 wxSTC_CMD_UNDO = wx.stc.STC_CMD_UNDO
 wxSTC_CMD_REDO = wx.stc.STC_CMD_REDO
 wxSTC_CMD_SELECTALL = wx.stc.STC_CMD_SELECTALL
 wxSTC_CMD_UNDO = wx.stc.STC_CMD_UNDO