diff --git a/utils/wxPython/README.txt b/utils/wxPython/README.txt index d4e9c6cea6..6ada372f99 100644 --- a/utils/wxPython/README.txt +++ b/utils/wxPython/README.txt @@ -32,6 +32,15 @@ You can also get it independently from here: http://download.microsoft.com/download/platformsdk/Comctl32/5.80.2614.3600/W9XNT4/EN-US/50comupd.exe +Windows 95 users may also need the WinSock 2.0 and OpenGL libraries. +These can be found at these sites: + + +http://www.microsoft.com/windows95/downloads/contents/wuadmintools/s_wunetwo +rkingtools/w95sockets2/default.asp + +http://www.opengl.org/Downloads/Downloads.html + Getting Help diff --git a/utils/wxPython/demo/data/stc.h b/utils/wxPython/demo/data/stc.h index 797b5cce4b..7c70f14121 100644 --- a/utils/wxPython/demo/data/stc.h +++ b/utils/wxPython/demo/data/stc.h @@ -130,7 +130,9 @@ enum { wxSTC_CMD_LINEDELETE, wxSTC_CMD_LINETRANSPOSE, wxSTC_CMD_LOWERCASE, - wxSTC_CMD_UPPERCASE + wxSTC_CMD_UPPERCASE, + wxSTC_CMD_LINESCROLLDOWN, + wxSTC_CMD_LINESCROLLUP }; @@ -253,7 +255,11 @@ public: int GetLineStartPos(int line); int GetLineLengthAtPos(int pos); int GetLineLength(int line); - wxString GetCurrentLineText(); +#ifdef SWIG + wxString GetCurrentLineText(int* OUTPUT); +#else + wxString GetCurrentLineText(int* linePos); +#endif int GetCurrentLine(); int PositionFromPoint(wxPoint pt); int LineFromPoint(wxPoint pt); @@ -274,7 +280,10 @@ public: void EnsureCaretVisible(); void SetCaretPolicy(int policy, int slop=0); int GetSelectionType(); - + int GetLinesOnScreen(); + bool IsSelectionRectangle(); + void SetUseHorizontalScrollBar(bool use); + bool GetUseHorizontalScrollBar(); // Searching @@ -303,6 +312,8 @@ public: void StartStyling(int pos, int mask); void SetStyleFor(int length, int style); void SetStyleBytes(int length, char* styleBytes); + void SetLineState(int line, int value); + int GetLineState(int line); // Style Definition @@ -348,8 +359,15 @@ public: // Other settings void SetBufferedDraw(bool isBuffered); void SetTabWidth(int numChars); + void SetIndent(int numChars); + void SetUseTabs(bool usetabs); + void SetLineIndentation(int line, int indentation); + int GetLineIndentation(int line); + int GetLineIndentationPos(int line); void SetWordChars(const wxString& wordChars); + void SetUsePop(bool usepopup); + // Brace highlighting void BraceHighlight(int pos1, int pos2); @@ -387,7 +405,9 @@ public: int AutoCompPosAtStart(); void AutoCompComplete(); void AutoCompStopChars(const wxString& stopChars); - + void AutoCompSetSeparator(char separator); + char AutoCompGetSeparator(); + void AutoCompSelect(const wxString& stringtoselect); // Call tips void CallTipShow(int pos, const wxString& text); diff --git a/utils/wxPython/demo/wxStyledTextCtrl_2.py b/utils/wxPython/demo/wxStyledTextCtrl_2.py index e3b57e8e78..dbfbb714d4 100644 --- a/utils/wxPython/demo/wxStyledTextCtrl_2.py +++ b/utils/wxPython/demo/wxStyledTextCtrl_2.py @@ -2,6 +2,8 @@ from wxPython.wx import * from wxPython.stc import * +import keyword + #---------------------------------------------------------------------- demoText = """\ @@ -39,13 +41,17 @@ class PythonSTC(wxStyledTextCtrl): wxStyledTextCtrl.__init__(self, parent, ID) self.SetLexer(wxSTC_LEX_PYTHON) - self.SetKeywords(0, - "and assert break class continue def del elif else except " - "exec finally for from global if import in is lambda None " - "not or pass print raise return try while") - self.SetViewWhitespace(false) + self.SetKeywords(0, string.join(keyword.kwlist)) + self.SetProperty("fold", "1") - ##self.SetProperty("tab.timmy.whinge.level", "4") + self.SetProperty("tab.timmy.whinge.level", "1") + self.SetMargins(0,0) + + self.SetViewWhitespace(false) + #self.SetBufferedDraw(false) + + self.SetEdgeMode(wxSTC_EDGE_BACKGROUND) + self.SetEdgeColumn(78) # Setup a margin to hold fold markers #self.SetFoldFlags(16) ### WHAT IS THIS VALUE? WHAT ARE THE OTHER FLAGS? DOES IT MATTER? @@ -87,9 +93,9 @@ class PythonSTC(wxStyledTextCtrl): # Number self.StyleSetSpec(2, "fore:#007F7F") # String - self.StyleSetSpec(3, "fore:#7F007F,italics,face:%(times)s" % faces) + self.StyleSetSpec(3, "fore:#7F007F,italic,face:%(times)s" % faces) # Single quoted string - self.StyleSetSpec(4, "fore:#7F007F,italics,face:%(times)s" % faces) + self.StyleSetSpec(4, "fore:#7F007F,italic,face:%(times)s" % faces) # Keyword self.StyleSetSpec(5, "fore:#00007F,bold") # Triple quotes @@ -142,6 +148,8 @@ class PythonSTC(wxStyledTextCtrl): self.BraceBadlight(braceAtCaret) else: self.BraceHighlight(braceAtCaret, braceOpposite) + self.SetCurrentPosition(braceOpposite) + self.SetCurrentPosition(caretPos) def OnMarginClick(self, evt): diff --git a/utils/wxPython/modules/ogl/oglbasic.cpp b/utils/wxPython/modules/ogl/oglbasic.cpp index 2ee21a1e21..bf9da24d33 100644 --- a/utils/wxPython/modules/ogl/oglbasic.cpp +++ b/utils/wxPython/modules/ogl/oglbasic.cpp @@ -507,14 +507,20 @@ static PyObject *_wrap_wxShapeRegion_GetMinSize(PyObject *self, PyObject *args, PyObject * _resultobj; wxShapeRegion * _arg0; double * _arg1; + double temp; double * _arg2; + double temp0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; - char *_kwnames[] = { "self","x","y", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxShapeRegion_GetMinSize",_kwnames,&_argo0,&_argo1,&_argo2)) +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxShapeRegion_GetMinSize",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -523,20 +529,6 @@ static PyObject *_wrap_wxShapeRegion_GetMinSize(PyObject *self, PyObject *args, return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_double_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxShapeRegion_GetMinSize. Expected _double_p."); - return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_double_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxShapeRegion_GetMinSize. Expected _double_p."); - return NULL; - } - } { wxPy_BEGIN_ALLOW_THREADS; wxShapeRegion_GetMinSize(_arg0,_arg1,_arg2); @@ -544,6 +536,16 @@ static PyObject *_wrap_wxShapeRegion_GetMinSize(PyObject *self, PyObject *args, wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); _resultobj = Py_None; +{ + PyObject *o; + o = PyFloat_FromDouble((double) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyFloat_FromDouble((double) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} return _resultobj; } @@ -552,14 +554,20 @@ static PyObject *_wrap_wxShapeRegion_GetProportion(PyObject *self, PyObject *arg PyObject * _resultobj; wxShapeRegion * _arg0; double * _arg1; + double temp; double * _arg2; + double temp0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; - char *_kwnames[] = { "self","x","y", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxShapeRegion_GetProportion",_kwnames,&_argo0,&_argo1,&_argo2)) +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxShapeRegion_GetProportion",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -568,20 +576,6 @@ static PyObject *_wrap_wxShapeRegion_GetProportion(PyObject *self, PyObject *arg return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_double_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxShapeRegion_GetProportion. Expected _double_p."); - return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_double_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxShapeRegion_GetProportion. Expected _double_p."); - return NULL; - } - } { wxPy_BEGIN_ALLOW_THREADS; wxShapeRegion_GetProportion(_arg0,_arg1,_arg2); @@ -589,6 +583,16 @@ static PyObject *_wrap_wxShapeRegion_GetProportion(PyObject *self, PyObject *arg wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); _resultobj = Py_None; +{ + PyObject *o; + o = PyFloat_FromDouble((double) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyFloat_FromDouble((double) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} return _resultobj; } @@ -597,14 +601,20 @@ static PyObject *_wrap_wxShapeRegion_GetSize(PyObject *self, PyObject *args, PyO PyObject * _resultobj; wxShapeRegion * _arg0; double * _arg1; + double temp; double * _arg2; + double temp0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; - char *_kwnames[] = { "self","x","y", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxShapeRegion_GetSize",_kwnames,&_argo0,&_argo1,&_argo2)) +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxShapeRegion_GetSize",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -613,20 +623,6 @@ static PyObject *_wrap_wxShapeRegion_GetSize(PyObject *self, PyObject *args, PyO return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_double_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxShapeRegion_GetSize. Expected _double_p."); - return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_double_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxShapeRegion_GetSize. Expected _double_p."); - return NULL; - } - } { wxPy_BEGIN_ALLOW_THREADS; wxShapeRegion_GetSize(_arg0,_arg1,_arg2); @@ -634,6 +630,16 @@ static PyObject *_wrap_wxShapeRegion_GetSize(PyObject *self, PyObject *args, PyO wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); _resultobj = Py_None; +{ + PyObject *o; + o = PyFloat_FromDouble((double) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyFloat_FromDouble((double) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} return _resultobj; } @@ -642,14 +648,20 @@ static PyObject *_wrap_wxShapeRegion_GetPosition(PyObject *self, PyObject *args, PyObject * _resultobj; wxShapeRegion * _arg0; double * _arg1; + double temp; double * _arg2; + double temp0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; - char *_kwnames[] = { "self","xp","yp", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxShapeRegion_GetPosition",_kwnames,&_argo0,&_argo1,&_argo2)) +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxShapeRegion_GetPosition",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -658,20 +670,6 @@ static PyObject *_wrap_wxShapeRegion_GetPosition(PyObject *self, PyObject *args, return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_double_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxShapeRegion_GetPosition. Expected _double_p."); - return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_double_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxShapeRegion_GetPosition. Expected _double_p."); - return NULL; - } - } { wxPy_BEGIN_ALLOW_THREADS; wxShapeRegion_GetPosition(_arg0,_arg1,_arg2); @@ -679,6 +677,16 @@ static PyObject *_wrap_wxShapeRegion_GetPosition(PyObject *self, PyObject *args, wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); _resultobj = Py_None; +{ + PyObject *o; + o = PyFloat_FromDouble((double) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyFloat_FromDouble((double) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} return _resultobj; } @@ -5621,14 +5629,17 @@ static PyObject *_wrap_wxPyShape_FindRegion(PyObject *self, PyObject *args, PyOb wxPyShape * _arg0; wxString * _arg1; int * _arg2; + int temp; PyObject * _argo0 = 0; PyObject * _obj1 = 0; - PyObject * _argo2 = 0; - char *_kwnames[] = { "self","regionName","regionId", NULL }; + char *_kwnames[] = { "self","regionName", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyShape_FindRegion",_kwnames,&_argo0,&_obj1,&_argo2)) +{ + _arg2 = &temp; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyShape_FindRegion",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5644,13 +5655,6 @@ static PyObject *_wrap_wxPyShape_FindRegion(PyObject *self, PyObject *args, PyOb } _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_int_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPyShape_FindRegion. Expected _int_p."); - return NULL; - } - } { wxPy_BEGIN_ALLOW_THREADS; _result = (wxPyShape *)wxPyShape_FindRegion(_arg0,*_arg1,_arg2); @@ -5663,6 +5667,11 @@ static PyObject *_wrap_wxPyShape_FindRegion(PyObject *self, PyObject *args, PyOb Py_INCREF(Py_None); _resultobj = Py_None; } +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} { if (_obj1) delete _arg1; diff --git a/utils/wxPython/modules/ogl/oglbasic.i b/utils/wxPython/modules/ogl/oglbasic.i index c9706a42c5..1df3cc74ee 100644 --- a/utils/wxPython/modules/ogl/oglbasic.i +++ b/utils/wxPython/modules/ogl/oglbasic.i @@ -59,10 +59,10 @@ public: wxString GetText(); wxFont *GetFont(); - void GetMinSize(double *x, double *y); - void GetProportion(double *x, double *y); - void GetSize(double *x, double *y); - void GetPosition(double *xp, double *yp); + void GetMinSize(double *OUTPUT, double *OUTPUT); + void GetProportion(double *OUTPUT, double *OUTPUT); + void GetSize(double *OUTPUT, double *OUTPUT); + void GetPosition(double *OUTPUT, double *OUTPUT); int GetFormatMode(); wxString GetName(); wxString GetColour(); @@ -302,7 +302,7 @@ public: void AddRegion(wxShapeRegion *region); void ClearRegions(); void AssignNewIds(); - wxPyShape *FindRegion(const wxString& regionName, int *regionId); + wxPyShape *FindRegion(const wxString& regionName, int *OUTPUT); void FindRegionNames(wxStringList& list); void ClearText(int regionId = 0); void RemoveLine(wxPyLineShape *line); diff --git a/utils/wxPython/modules/ogl/oglbasic.py b/utils/wxPython/modules/ogl/oglbasic.py index 69e2b2c7f0..6f61e69c83 100644 --- a/utils/wxPython/modules/ogl/oglbasic.py +++ b/utils/wxPython/modules/ogl/oglbasic.py @@ -570,7 +570,6 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr): return val def FindRegion(self, *_args, **_kwargs): val = apply(oglbasicc.wxPyShape_FindRegion,(self,) + _args, _kwargs) - if val: val = wxPyShapePtr(val) return val def FindRegionNames(self, *_args, **_kwargs): val = apply(oglbasicc.wxPyShape_FindRegionNames,(self,) + _args, _kwargs) diff --git a/utils/wxPython/modules/stc/stc_.cpp b/utils/wxPython/modules/stc/stc_.cpp index 85ec92998b..f8c99eec2e 100644 --- a/utils/wxPython/modules/stc/stc_.cpp +++ b/utils/wxPython/modules/stc/stc_.cpp @@ -1508,15 +1508,20 @@ static PyObject *_wrap_wxStyledTextCtrl_GetLineLength(PyObject *self, PyObject * return _resultobj; } -#define wxStyledTextCtrl_GetCurrentLineText(_swigobj) (_swigobj->GetCurrentLineText()) +#define wxStyledTextCtrl_GetCurrentLineText(_swigobj,_swigarg0) (_swigobj->GetCurrentLineText(_swigarg0)) static PyObject *_wrap_wxStyledTextCtrl_GetCurrentLineText(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxString * _result; wxStyledTextCtrl * _arg0; + int * _arg1; + int temp; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; +{ + _arg1 = &temp; +} if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_GetCurrentLineText",_kwnames,&_argo0)) return NULL; if (_argo0) { @@ -1528,12 +1533,17 @@ static PyObject *_wrap_wxStyledTextCtrl_GetCurrentLineText(PyObject *self, PyObj } { wxPy_BEGIN_ALLOW_THREADS; - _result = new wxString (wxStyledTextCtrl_GetCurrentLineText(_arg0)); + _result = new wxString (wxStyledTextCtrl_GetCurrentLineText(_arg0,_arg1)); wxPy_END_ALLOW_THREADS; }{ _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} { delete _result; } @@ -2090,6 +2100,117 @@ static PyObject *_wrap_wxStyledTextCtrl_GetSelectionType(PyObject *self, PyObjec return _resultobj; } +#define wxStyledTextCtrl_GetLinesOnScreen(_swigobj) (_swigobj->GetLinesOnScreen()) +static PyObject *_wrap_wxStyledTextCtrl_GetLinesOnScreen(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxStyledTextCtrl * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_GetLinesOnScreen",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_GetLinesOnScreen. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxStyledTextCtrl_GetLinesOnScreen(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxStyledTextCtrl_IsSelectionRectangle(_swigobj) (_swigobj->IsSelectionRectangle()) +static PyObject *_wrap_wxStyledTextCtrl_IsSelectionRectangle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxStyledTextCtrl * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_IsSelectionRectangle",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_IsSelectionRectangle. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxStyledTextCtrl_IsSelectionRectangle(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxStyledTextCtrl_SetUseHorizontalScrollBar(_swigobj,_swigarg0) (_swigobj->SetUseHorizontalScrollBar(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_SetUseHorizontalScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextCtrl * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","use", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_SetUseHorizontalScrollBar",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_SetUseHorizontalScrollBar. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxStyledTextCtrl_SetUseHorizontalScrollBar(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxStyledTextCtrl_GetUseHorizontalScrollBar(_swigobj) (_swigobj->GetUseHorizontalScrollBar()) +static PyObject *_wrap_wxStyledTextCtrl_GetUseHorizontalScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxStyledTextCtrl * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_GetUseHorizontalScrollBar",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_GetUseHorizontalScrollBar. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxStyledTextCtrl_GetUseHorizontalScrollBar(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxStyledTextCtrl_FindText(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->FindText(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) static PyObject *_wrap_wxStyledTextCtrl_FindText(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2568,6 +2689,63 @@ static PyObject *_wrap_wxStyledTextCtrl_SetStyleBytes(PyObject *self, PyObject * return _resultobj; } +#define wxStyledTextCtrl_SetLineState(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetLineState(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxStyledTextCtrl_SetLineState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextCtrl * _arg0; + int _arg1; + int _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","line","value", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxStyledTextCtrl_SetLineState",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_SetLineState. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxStyledTextCtrl_SetLineState(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxStyledTextCtrl_GetLineState(_swigobj,_swigarg0) (_swigobj->GetLineState(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_GetLineState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxStyledTextCtrl * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","line", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_GetLineState",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_GetLineState. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxStyledTextCtrl_GetLineState(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxStyledTextCtrl_StyleClearAll(_swigobj) (_swigobj->StyleClearAll()) static PyObject *_wrap_wxStyledTextCtrl_StyleClearAll(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3514,6 +3692,149 @@ static PyObject *_wrap_wxStyledTextCtrl_SetTabWidth(PyObject *self, PyObject *ar return _resultobj; } +#define wxStyledTextCtrl_SetIndent(_swigobj,_swigarg0) (_swigobj->SetIndent(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_SetIndent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextCtrl * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","numChars", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_SetIndent",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_SetIndent. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxStyledTextCtrl_SetIndent(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxStyledTextCtrl_SetUseTabs(_swigobj,_swigarg0) (_swigobj->SetUseTabs(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_SetUseTabs(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextCtrl * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","usetabs", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_SetUseTabs",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_SetUseTabs. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxStyledTextCtrl_SetUseTabs(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxStyledTextCtrl_SetLineIndentation(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetLineIndentation(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxStyledTextCtrl_SetLineIndentation(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextCtrl * _arg0; + int _arg1; + int _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","line","indentation", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxStyledTextCtrl_SetLineIndentation",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_SetLineIndentation. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxStyledTextCtrl_SetLineIndentation(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxStyledTextCtrl_GetLineIndentation(_swigobj,_swigarg0) (_swigobj->GetLineIndentation(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_GetLineIndentation(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxStyledTextCtrl * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","line", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_GetLineIndentation",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_GetLineIndentation. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxStyledTextCtrl_GetLineIndentation(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxStyledTextCtrl_GetLineIndentationPos(_swigobj,_swigarg0) (_swigobj->GetLineIndentationPos(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_GetLineIndentationPos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxStyledTextCtrl * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","line", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_GetLineIndentationPos",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_GetLineIndentationPos. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxStyledTextCtrl_GetLineIndentationPos(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxStyledTextCtrl_SetWordChars(_swigobj,_swigarg0) (_swigobj->SetWordChars(_swigarg0)) static PyObject *_wrap_wxStyledTextCtrl_SetWordChars(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3554,6 +3875,36 @@ static PyObject *_wrap_wxStyledTextCtrl_SetWordChars(PyObject *self, PyObject *a return _resultobj; } +#define wxStyledTextCtrl_SetUsePop(_swigobj,_swigarg0) (_swigobj->SetUsePop(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_SetUsePop(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextCtrl * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","usepopup", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_SetUsePop",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_SetUsePop. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxStyledTextCtrl_SetUsePop(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxStyledTextCtrl_BraceHighlight(_swigobj,_swigarg0,_swigarg1) (_swigobj->BraceHighlight(_swigarg0,_swigarg1)) static PyObject *_wrap_wxStyledTextCtrl_BraceHighlight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -4295,6 +4646,101 @@ static PyObject *_wrap_wxStyledTextCtrl_AutoCompStopChars(PyObject *self, PyObje return _resultobj; } +#define wxStyledTextCtrl_AutoCompSetSeparator(_swigobj,_swigarg0) (_swigobj->AutoCompSetSeparator(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_AutoCompSetSeparator(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextCtrl * _arg0; + char _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","separator", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oc:wxStyledTextCtrl_AutoCompSetSeparator",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_AutoCompSetSeparator. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxStyledTextCtrl_AutoCompSetSeparator(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxStyledTextCtrl_AutoCompGetSeparator(_swigobj) (_swigobj->AutoCompGetSeparator()) +static PyObject *_wrap_wxStyledTextCtrl_AutoCompGetSeparator(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char _result; + wxStyledTextCtrl * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_AutoCompGetSeparator",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_AutoCompGetSeparator. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (char )wxStyledTextCtrl_AutoCompGetSeparator(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("c",_result); + return _resultobj; +} + +#define wxStyledTextCtrl_AutoCompSelect(_swigobj,_swigarg0) (_swigobj->AutoCompSelect(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_AutoCompSelect(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextCtrl * _arg0; + wxString * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","stringtoselect", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStyledTextCtrl_AutoCompSelect",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_AutoCompSelect. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxStyledTextCtrl_AutoCompSelect(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxStyledTextCtrl_CallTipShow(_swigobj,_swigarg0,_swigarg1) (_swigobj->CallTipShow(_swigarg0,_swigarg1)) static PyObject *_wrap_wxStyledTextCtrl_CallTipShow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6517,6 +6963,9 @@ static PyMethodDef stc_cMethods[] = { { "wxStyledTextCtrl_CallTipActive", (PyCFunction) _wrap_wxStyledTextCtrl_CallTipActive, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_CallTipCancel", (PyCFunction) _wrap_wxStyledTextCtrl_CallTipCancel, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_CallTipShow", (PyCFunction) _wrap_wxStyledTextCtrl_CallTipShow, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_AutoCompSelect", (PyCFunction) _wrap_wxStyledTextCtrl_AutoCompSelect, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_AutoCompGetSeparator", (PyCFunction) _wrap_wxStyledTextCtrl_AutoCompGetSeparator, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_AutoCompSetSeparator", (PyCFunction) _wrap_wxStyledTextCtrl_AutoCompSetSeparator, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_AutoCompStopChars", (PyCFunction) _wrap_wxStyledTextCtrl_AutoCompStopChars, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_AutoCompComplete", (PyCFunction) _wrap_wxStyledTextCtrl_AutoCompComplete, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_AutoCompPosAtStart", (PyCFunction) _wrap_wxStyledTextCtrl_AutoCompPosAtStart, METH_VARARGS | METH_KEYWORDS }, @@ -6541,7 +6990,13 @@ static PyMethodDef stc_cMethods[] = { { "wxStyledTextCtrl_BraceMatch", (PyCFunction) _wrap_wxStyledTextCtrl_BraceMatch, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_BraceBadlight", (PyCFunction) _wrap_wxStyledTextCtrl_BraceBadlight, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_BraceHighlight", (PyCFunction) _wrap_wxStyledTextCtrl_BraceHighlight, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_SetUsePop", (PyCFunction) _wrap_wxStyledTextCtrl_SetUsePop, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetWordChars", (PyCFunction) _wrap_wxStyledTextCtrl_SetWordChars, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_GetLineIndentationPos", (PyCFunction) _wrap_wxStyledTextCtrl_GetLineIndentationPos, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_GetLineIndentation", (PyCFunction) _wrap_wxStyledTextCtrl_GetLineIndentation, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_SetLineIndentation", (PyCFunction) _wrap_wxStyledTextCtrl_SetLineIndentation, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_SetUseTabs", (PyCFunction) _wrap_wxStyledTextCtrl_SetUseTabs, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_SetIndent", (PyCFunction) _wrap_wxStyledTextCtrl_SetIndent, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetTabWidth", (PyCFunction) _wrap_wxStyledTextCtrl_SetTabWidth, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetBufferedDraw", (PyCFunction) _wrap_wxStyledTextCtrl_SetBufferedDraw, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetCaretPeriod", (PyCFunction) _wrap_wxStyledTextCtrl_SetCaretPeriod, METH_VARARGS | METH_KEYWORDS }, @@ -6572,6 +7027,8 @@ static PyMethodDef stc_cMethods[] = { { "wxStyledTextCtrl_StyleSetSpec", (PyCFunction) _wrap_wxStyledTextCtrl_StyleSetSpec, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_StyleResetDefault", (PyCFunction) _wrap_wxStyledTextCtrl_StyleResetDefault, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_StyleClearAll", (PyCFunction) _wrap_wxStyledTextCtrl_StyleClearAll, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_GetLineState", (PyCFunction) _wrap_wxStyledTextCtrl_GetLineState, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_SetLineState", (PyCFunction) _wrap_wxStyledTextCtrl_SetLineState, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetStyleBytes", (PyCFunction) _wrap_wxStyledTextCtrl_SetStyleBytes, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetStyleFor", (PyCFunction) _wrap_wxStyledTextCtrl_SetStyleFor, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_StartStyling", (PyCFunction) _wrap_wxStyledTextCtrl_StartStyling, METH_VARARGS | METH_KEYWORDS }, @@ -6587,6 +7044,10 @@ static PyMethodDef stc_cMethods[] = { { "wxStyledTextCtrl_SearchNext", (PyCFunction) _wrap_wxStyledTextCtrl_SearchNext, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SearchAnchor", (PyCFunction) _wrap_wxStyledTextCtrl_SearchAnchor, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_FindText", (PyCFunction) _wrap_wxStyledTextCtrl_FindText, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_GetUseHorizontalScrollBar", (PyCFunction) _wrap_wxStyledTextCtrl_GetUseHorizontalScrollBar, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_SetUseHorizontalScrollBar", (PyCFunction) _wrap_wxStyledTextCtrl_SetUseHorizontalScrollBar, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_IsSelectionRectangle", (PyCFunction) _wrap_wxStyledTextCtrl_IsSelectionRectangle, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_GetLinesOnScreen", (PyCFunction) _wrap_wxStyledTextCtrl_GetLinesOnScreen, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_GetSelectionType", (PyCFunction) _wrap_wxStyledTextCtrl_GetSelectionType, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetCaretPolicy", (PyCFunction) _wrap_wxStyledTextCtrl_SetCaretPolicy, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_EnsureCaretVisible", (PyCFunction) _wrap_wxStyledTextCtrl_EnsureCaretVisible, METH_VARARGS | METH_KEYWORDS }, @@ -7203,6 +7664,8 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxSTC_CMD_LINETRANSPOSE", PyInt_FromLong((long) wxSTC_CMD_LINETRANSPOSE)); PyDict_SetItemString(d,"wxSTC_CMD_LOWERCASE", PyInt_FromLong((long) wxSTC_CMD_LOWERCASE)); PyDict_SetItemString(d,"wxSTC_CMD_UPPERCASE", PyInt_FromLong((long) wxSTC_CMD_UPPERCASE)); + PyDict_SetItemString(d,"wxSTC_CMD_LINESCROLLDOWN", PyInt_FromLong((long) wxSTC_CMD_LINESCROLLDOWN)); + PyDict_SetItemString(d,"wxSTC_CMD_LINESCROLLUP", PyInt_FromLong((long) wxSTC_CMD_LINESCROLLUP)); PyDict_SetItemString(d,"wxSTC_LEX_CONTAINER", PyInt_FromLong((long) wxSTC_LEX_CONTAINER)); PyDict_SetItemString(d,"wxSTC_LEX_NULL", PyInt_FromLong((long) wxSTC_LEX_NULL)); PyDict_SetItemString(d,"wxSTC_LEX_PYTHON", PyInt_FromLong((long) wxSTC_LEX_PYTHON)); diff --git a/utils/wxPython/modules/stc/stc_.py b/utils/wxPython/modules/stc/stc_.py index 1d0d745a4b..e7c76c47c4 100644 --- a/utils/wxPython/modules/stc/stc_.py +++ b/utils/wxPython/modules/stc/stc_.py @@ -274,6 +274,18 @@ class wxStyledTextCtrlPtr(wxControlPtr): def GetSelectionType(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextCtrl_GetSelectionType,(self,) + _args, _kwargs) return val + def GetLinesOnScreen(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_GetLinesOnScreen,(self,) + _args, _kwargs) + return val + def IsSelectionRectangle(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_IsSelectionRectangle,(self,) + _args, _kwargs) + return val + def SetUseHorizontalScrollBar(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_SetUseHorizontalScrollBar,(self,) + _args, _kwargs) + return val + def GetUseHorizontalScrollBar(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_GetUseHorizontalScrollBar,(self,) + _args, _kwargs) + return val def FindText(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextCtrl_FindText,(self,) + _args, _kwargs) return val @@ -319,6 +331,12 @@ class wxStyledTextCtrlPtr(wxControlPtr): def SetStyleBytes(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextCtrl_SetStyleBytes,(self,) + _args, _kwargs) return val + def SetLineState(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_SetLineState,(self,) + _args, _kwargs) + return val + def GetLineState(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_GetLineState,(self,) + _args, _kwargs) + return val def StyleClearAll(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextCtrl_StyleClearAll,(self,) + _args, _kwargs) return val @@ -409,9 +427,27 @@ class wxStyledTextCtrlPtr(wxControlPtr): def SetTabWidth(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextCtrl_SetTabWidth,(self,) + _args, _kwargs) return val + def SetIndent(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_SetIndent,(self,) + _args, _kwargs) + return val + def SetUseTabs(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_SetUseTabs,(self,) + _args, _kwargs) + return val + def SetLineIndentation(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_SetLineIndentation,(self,) + _args, _kwargs) + return val + def GetLineIndentation(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_GetLineIndentation,(self,) + _args, _kwargs) + return val + def GetLineIndentationPos(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_GetLineIndentationPos,(self,) + _args, _kwargs) + return val def SetWordChars(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextCtrl_SetWordChars,(self,) + _args, _kwargs) return val + def SetUsePop(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_SetUsePop,(self,) + _args, _kwargs) + return val def BraceHighlight(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextCtrl_BraceHighlight,(self,) + _args, _kwargs) return val @@ -484,6 +520,15 @@ class wxStyledTextCtrlPtr(wxControlPtr): def AutoCompStopChars(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextCtrl_AutoCompStopChars,(self,) + _args, _kwargs) return val + def AutoCompSetSeparator(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_AutoCompSetSeparator,(self,) + _args, _kwargs) + return val + def AutoCompGetSeparator(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_AutoCompGetSeparator,(self,) + _args, _kwargs) + return val + def AutoCompSelect(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextCtrl_AutoCompSelect,(self,) + _args, _kwargs) + return val def CallTipShow(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextCtrl_CallTipShow,(self,) + _args, _kwargs) return val @@ -813,6 +858,8 @@ wxSTC_CMD_LINEDELETE = stc_c.wxSTC_CMD_LINEDELETE wxSTC_CMD_LINETRANSPOSE = stc_c.wxSTC_CMD_LINETRANSPOSE wxSTC_CMD_LOWERCASE = stc_c.wxSTC_CMD_LOWERCASE wxSTC_CMD_UPPERCASE = stc_c.wxSTC_CMD_UPPERCASE +wxSTC_CMD_LINESCROLLDOWN = stc_c.wxSTC_CMD_LINESCROLLDOWN +wxSTC_CMD_LINESCROLLUP = stc_c.wxSTC_CMD_LINESCROLLUP wxSTC_LEX_CONTAINER = stc_c.wxSTC_LEX_CONTAINER wxSTC_LEX_NULL = stc_c.wxSTC_LEX_NULL wxSTC_LEX_PYTHON = stc_c.wxSTC_LEX_PYTHON diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i index e80e0c0c18..afb97c931a 100644 --- a/utils/wxPython/src/gdi.i +++ b/utils/wxPython/src/gdi.i @@ -88,6 +88,15 @@ public: int GetQuality(); void SetQuality(int q); #endif + + %pragma(python) addtoclass = " + def __del__(self,gdic=gdic): + try: + if self.thisown == 1 : + gdic.delete_wxBitmap(self) + except: + pass +" }; @@ -160,6 +169,15 @@ public: #ifdef __WXMSW__ void SetSize(const wxSize& size); #endif + %pragma(python) addtoclass = " + def __del__(self,gdic=gdic): + try: + if self.thisown == 1 : + gdic.delete_wxIcon(self) + except: + pass +" + }; diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py index 4271464a7d..9b00110ccf 100644 --- a/utils/wxPython/src/msw/gdi.py +++ b/utils/wxPython/src/msw/gdi.py @@ -77,6 +77,14 @@ class wxBitmapPtr : return val def __repr__(self): return "" % (self.this,) + + def __del__(self,gdic=gdic): + try: + if self.thisown == 1 : + gdic.delete_wxBitmap(self) + except: + pass + class wxBitmap(wxBitmapPtr): def __init__(self,*_args,**_kwargs): self.this = apply(gdic.new_wxBitmap,_args,_kwargs) @@ -141,6 +149,14 @@ class wxIconPtr : return val def __repr__(self): return "" % (self.this,) + + def __del__(self,gdic=gdic): + try: + if self.thisown == 1 : + gdic.delete_wxIcon(self) + except: + pass + class wxIcon(wxIconPtr): def __init__(self,*_args,**_kwargs): self.this = apply(gdic.new_wxIcon,_args,_kwargs)