This commit was manufactured by cvs2svn to create tag

'wxPy_2_4_merge_2'.

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

wxPython/BUILD.osx.txt

@@ -63,27 +63,6 @@ get things from various CVS repositories as needed.
 7. Figure out what's wrong, figure out how to fix it, and then send
    the patches to me.  <wink>
 
-
-
-NOTE: If you get a compile error while building the wxGLCanvas module
-then this is likely due to a bug in one of Apple's header files.  This
-one character patch to
-/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/fp.h
-will take care of it:
-
-
---- fp.h.orig	2003-06-23 13:17:16.000000000 -0700
-+++ fp.h	2003-06-23 13:51:46.000000000 -0700
-@@ -1893,7 +1893,7 @@
- extern long double  scalbl(long double x, long n);
- #if TYPE_LONGDOUBLE_IS_DOUBLE
-   #ifdef __cplusplus
--    inline long double scalbl(long double x, long n) { return (long double) scalb((double)(x), (n)); }
-+    inline long double scalbl(long double x, long n) { return (long double) scalbl((double)(x), (n)); }
-   #else
-     #define scalbl(x, n) ((long double) scalb((double)(x), (n)))
-   #endif
-
 --Robin
 
 

wxPython/CHANGES.txt

@@ -7,7 +7,6 @@ CHANGES.txt for wxPython
 
 Use wxSTC in the demo for displaying the soucre code of the samples.
 
-Updated to Scintilla 1.53.
 
 
 

wxPython/b.bat

@@ -2,7 +2,6 @@
 REM ----------------------------------------------------------------------
 REM Note:  This is a 4NT script
 REM ----------------------------------------------------------------------
-call wxset.btm
 setlocal
 
 set FLAGS=USE_SWIG=1 IN_CVS_TREE=1

wxPython/contrib/gizmos/gizmos.i

@@ -553,15 +553,9 @@ public:
     void SetImageList(wxImageList *imageList);
     void SetStateImageList(wxImageList *imageList);
     void SetButtonsImageList(wxImageList *imageList);
-
     void AssignImageList(wxImageList *imageList);
-    %pragma(python) addtomethod = "AssignImageList:_args[0].thisown = 0"
-
     void AssignStateImageList(wxImageList *imageList);
-    %pragma(python) addtomethod = "AssignStateImageList:_args[0].thisown = 0"
-
     void AssignButtonsImageList(wxImageList *imageList);
-    %pragma(python) addtomethod = "AssignButtonsImageList:_args[0].thisown = 0"
 
 
 

wxPython/contrib/gizmos/gizmos.py

@@ -375,15 +375,12 @@ class wxTreeListCtrlPtr(wxControlPtr):
         return val
     def AssignImageList(self, *_args, **_kwargs):
         val = gizmosc.wxTreeListCtrl_AssignImageList(self, *_args, **_kwargs)
-        _args[0].thisown = 0
         return val
     def AssignStateImageList(self, *_args, **_kwargs):
         val = gizmosc.wxTreeListCtrl_AssignStateImageList(self, *_args, **_kwargs)
-        _args[0].thisown = 0
         return val
     def AssignButtonsImageList(self, *_args, **_kwargs):
         val = gizmosc.wxTreeListCtrl_AssignButtonsImageList(self, *_args, **_kwargs)
-        _args[0].thisown = 0
         return val
     def AddColumn(self, *_args, **_kwargs):
         val = gizmosc.wxTreeListCtrl_AddColumn(self, *_args, **_kwargs)

wxPython/contrib/glcanvas/glcanvas.i

@@ -15,11 +15,6 @@
 
 %{
 #include "wxPython.h"
-
-#ifdef __WXMAC__  // avoid a bug in Carbon headers
-#define scalb scalbn
-#endif
-
 #ifdef __WXMSW__
 #include "myglcanvas.h"
 #else

wxPython/contrib/stc/gtk/stc_.cpp

@@ -7933,34 +7933,6 @@ static PyObject *_wrap_wxStyledTextCtrl_LineEndDisplayExtend(PyObject *self, PyO
     return _resultobj;
 }
 
-#define wxStyledTextCtrl_LineCopy(_swigobj)  (_swigobj->LineCopy())
-static PyObject *_wrap_wxStyledTextCtrl_LineCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxStyledTextCtrl * _arg0;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_LineCopy",_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_LineCopy. Expected _wxStyledTextCtrl_p.");
-        return NULL;
-        }
-    }
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxStyledTextCtrl_LineCopy(_arg0);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
 #define wxStyledTextCtrl_MoveCaretInsideView(_swigobj)  (_swigobj->MoveCaretInsideView())
 static PyObject *_wrap_wxStyledTextCtrl_MoveCaretInsideView(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -9633,134 +9605,6 @@ static PyObject *_wrap_wxStyledTextCtrl_SetHotspotActiveUnderline(PyObject *self
     return _resultobj;
 }
 
-#define wxStyledTextCtrl_PositionBefore(_swigobj,_swigarg0)  (_swigobj->PositionBefore(_swigarg0))
-static PyObject *_wrap_wxStyledTextCtrl_PositionBefore(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    int  _result;
-    wxStyledTextCtrl * _arg0;
-    int  _arg1;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self","pos", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_PositionBefore",_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_PositionBefore. Expected _wxStyledTextCtrl_p.");
-        return NULL;
-        }
-    }
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = (int )wxStyledTextCtrl_PositionBefore(_arg0,_arg1);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxStyledTextCtrl_PositionAfter(_swigobj,_swigarg0)  (_swigobj->PositionAfter(_swigarg0))
-static PyObject *_wrap_wxStyledTextCtrl_PositionAfter(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    int  _result;
-    wxStyledTextCtrl * _arg0;
-    int  _arg1;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self","pos", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_PositionAfter",_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_PositionAfter. Expected _wxStyledTextCtrl_p.");
-        return NULL;
-        }
-    }
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = (int )wxStyledTextCtrl_PositionAfter(_arg0,_arg1);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxStyledTextCtrl_CopyRange(_swigobj,_swigarg0,_swigarg1)  (_swigobj->CopyRange(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxStyledTextCtrl_CopyRange(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxStyledTextCtrl * _arg0;
-    int  _arg1;
-    int  _arg2;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self","start","end", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxStyledTextCtrl_CopyRange",_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_CopyRange. Expected _wxStyledTextCtrl_p.");
-        return NULL;
-        }
-    }
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxStyledTextCtrl_CopyRange(_arg0,_arg1,_arg2);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxStyledTextCtrl_CopyText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->CopyText(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxStyledTextCtrl_CopyText(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxStyledTextCtrl * _arg0;
-    int  _arg1;
-    wxString * _arg2;
-    PyObject * _argo0 = 0;
-    PyObject * _obj2 = 0;
-    char *_kwnames[] = { "self","length","text", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxStyledTextCtrl_CopyText",_kwnames,&_argo0,&_arg1,&_obj2)) 
-        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_CopyText. Expected _wxStyledTextCtrl_p.");
-        return NULL;
-        }
-    }
-{
-    _arg2 = wxString_in_helper(_obj2);
-    if (_arg2 == NULL)
-        return NULL;
-}
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxStyledTextCtrl_CopyText(_arg0,_arg1,*_arg2);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-{
-    if (_obj2)
-        delete _arg2;
-}
-    return _resultobj;
-}
-
 #define wxStyledTextCtrl_StartRecord(_swigobj)  (_swigobj->StartRecord())
 static PyObject *_wrap_wxStyledTextCtrl_StartRecord(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -12077,10 +11921,6 @@ static PyMethodDef stc_cMethods[] = {
 	 { "wxStyledTextCtrl_SetLexer", (PyCFunction) _wrap_wxStyledTextCtrl_SetLexer, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_StopRecord", (PyCFunction) _wrap_wxStyledTextCtrl_StopRecord, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_StartRecord", (PyCFunction) _wrap_wxStyledTextCtrl_StartRecord, METH_VARARGS | METH_KEYWORDS },
-	 { "wxStyledTextCtrl_CopyText", (PyCFunction) _wrap_wxStyledTextCtrl_CopyText, METH_VARARGS | METH_KEYWORDS },
-	 { "wxStyledTextCtrl_CopyRange", (PyCFunction) _wrap_wxStyledTextCtrl_CopyRange, METH_VARARGS | METH_KEYWORDS },
-	 { "wxStyledTextCtrl_PositionAfter", (PyCFunction) _wrap_wxStyledTextCtrl_PositionAfter, METH_VARARGS | METH_KEYWORDS },
-	 { "wxStyledTextCtrl_PositionBefore", (PyCFunction) _wrap_wxStyledTextCtrl_PositionBefore, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_SetHotspotActiveUnderline", (PyCFunction) _wrap_wxStyledTextCtrl_SetHotspotActiveUnderline, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_SetHotspotActiveBackground", (PyCFunction) _wrap_wxStyledTextCtrl_SetHotspotActiveBackground, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_SetHotspotActiveForeground", (PyCFunction) _wrap_wxStyledTextCtrl_SetHotspotActiveForeground, METH_VARARGS | METH_KEYWORDS },
@@ -12136,7 +11976,6 @@ static PyMethodDef stc_cMethods[] = {
 	 { "wxStyledTextCtrl_BraceHighlight", (PyCFunction) _wrap_wxStyledTextCtrl_BraceHighlight, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_LineLength", (PyCFunction) _wrap_wxStyledTextCtrl_LineLength, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_MoveCaretInsideView", (PyCFunction) _wrap_wxStyledTextCtrl_MoveCaretInsideView, METH_VARARGS | METH_KEYWORDS },
-	 { "wxStyledTextCtrl_LineCopy", (PyCFunction) _wrap_wxStyledTextCtrl_LineCopy, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_LineEndDisplayExtend", (PyCFunction) _wrap_wxStyledTextCtrl_LineEndDisplayExtend, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_LineEndDisplay", (PyCFunction) _wrap_wxStyledTextCtrl_LineEndDisplay, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_HomeDisplayExtend", (PyCFunction) _wrap_wxStyledTextCtrl_HomeDisplayExtend, METH_VARARGS | METH_KEYWORDS },
@@ -12720,8 +12559,6 @@ SWIGEXPORT(void) initstc_c() {
 	 PyDict_SetItemString(d,"wxSTC_LEX_F77", PyInt_FromLong((long) 37));
 	 PyDict_SetItemString(d,"wxSTC_LEX_CSS", PyInt_FromLong((long) 38));
 	 PyDict_SetItemString(d,"wxSTC_LEX_POV", PyInt_FromLong((long) 39));
-	 PyDict_SetItemString(d,"wxSTC_LEX_LOUT", PyInt_FromLong((long) 40));
-	 PyDict_SetItemString(d,"wxSTC_LEX_ESCRIPT", PyInt_FromLong((long) 41));
 	 PyDict_SetItemString(d,"wxSTC_LEX_AUTOMATIC", PyInt_FromLong((long) 1000));
 	 PyDict_SetItemString(d,"wxSTC_P_DEFAULT", PyInt_FromLong((long) 0));
 	 PyDict_SetItemString(d,"wxSTC_P_COMMENTLINE", PyInt_FromLong((long) 1));
@@ -12756,7 +12593,6 @@ SWIGEXPORT(void) initstc_c() {
 	 PyDict_SetItemString(d,"wxSTC_C_WORD2", PyInt_FromLong((long) 16));
 	 PyDict_SetItemString(d,"wxSTC_C_COMMENTDOCKEYWORD", PyInt_FromLong((long) 17));
 	 PyDict_SetItemString(d,"wxSTC_C_COMMENTDOCKEYWORDERROR", PyInt_FromLong((long) 18));
-	 PyDict_SetItemString(d,"wxSTC_C_GLOBALCLASS", PyInt_FromLong((long) 19));
 	 PyDict_SetItemString(d,"wxSTC_H_DEFAULT", PyInt_FromLong((long) 0));
 	 PyDict_SetItemString(d,"wxSTC_H_TAG", PyInt_FromLong((long) 1));
 	 PyDict_SetItemString(d,"wxSTC_H_TAGUNKNOWN", PyInt_FromLong((long) 2));
@@ -13129,29 +12965,6 @@ SWIGEXPORT(void) initstc_c() {
 	 PyDict_SetItemString(d,"wxSTC_POV_IDENTIFIER", PyInt_FromLong((long) 8));
 	 PyDict_SetItemString(d,"wxSTC_POV_BRACE", PyInt_FromLong((long) 9));
 	 PyDict_SetItemString(d,"wxSTC_POV_WORD2", PyInt_FromLong((long) 10));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_DEFAULT", PyInt_FromLong((long) 0));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_COMMENT", PyInt_FromLong((long) 1));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_NUMBER", PyInt_FromLong((long) 2));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_WORD", PyInt_FromLong((long) 3));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_WORD2", PyInt_FromLong((long) 4));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_WORD3", PyInt_FromLong((long) 5));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_WORD4", PyInt_FromLong((long) 6));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_STRING", PyInt_FromLong((long) 7));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_OPERATOR", PyInt_FromLong((long) 8));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_IDENTIFIER", PyInt_FromLong((long) 9));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_STRINGEOL", PyInt_FromLong((long) 10));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_DEFAULT", PyInt_FromLong((long) 0));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_COMMENT", PyInt_FromLong((long) 1));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_COMMENTLINE", PyInt_FromLong((long) 2));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_COMMENTDOC", PyInt_FromLong((long) 3));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_NUMBER", PyInt_FromLong((long) 4));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD", PyInt_FromLong((long) 5));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_STRING", PyInt_FromLong((long) 6));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_OPERATOR", PyInt_FromLong((long) 7));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_IDENTIFIER", PyInt_FromLong((long) 8));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_BRACE", PyInt_FromLong((long) 9));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD2", PyInt_FromLong((long) 10));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD3", PyInt_FromLong((long) 11));
 	 PyDict_SetItemString(d,"wxSTC_CMD_REDO", PyInt_FromLong((long) 2011));
 	 PyDict_SetItemString(d,"wxSTC_CMD_SELECTALL", PyInt_FromLong((long) 2013));
 	 PyDict_SetItemString(d,"wxSTC_CMD_UNDO", PyInt_FromLong((long) 2176));

wxPython/contrib/stc/gtk/stc_.py

@@ -878,9 +878,6 @@ class wxStyledTextCtrlPtr(wxControlPtr):
     def LineEndDisplayExtend(self, *_args, **_kwargs):
         val = stc_c.wxStyledTextCtrl_LineEndDisplayExtend(self, *_args, **_kwargs)
         return val
-    def LineCopy(self, *_args, **_kwargs):
-        val = stc_c.wxStyledTextCtrl_LineCopy(self, *_args, **_kwargs)
-        return val
     def MoveCaretInsideView(self, *_args, **_kwargs):
         val = stc_c.wxStyledTextCtrl_MoveCaretInsideView(self, *_args, **_kwargs)
         return val
@@ -1047,18 +1044,6 @@ class wxStyledTextCtrlPtr(wxControlPtr):
     def SetHotspotActiveUnderline(self, *_args, **_kwargs):
         val = stc_c.wxStyledTextCtrl_SetHotspotActiveUnderline(self, *_args, **_kwargs)
         return val
-    def PositionBefore(self, *_args, **_kwargs):
-        val = stc_c.wxStyledTextCtrl_PositionBefore(self, *_args, **_kwargs)
-        return val
-    def PositionAfter(self, *_args, **_kwargs):
-        val = stc_c.wxStyledTextCtrl_PositionAfter(self, *_args, **_kwargs)
-        return val
-    def CopyRange(self, *_args, **_kwargs):
-        val = stc_c.wxStyledTextCtrl_CopyRange(self, *_args, **_kwargs)
-        return val
-    def CopyText(self, *_args, **_kwargs):
-        val = stc_c.wxStyledTextCtrl_CopyText(self, *_args, **_kwargs)
-        return val
     def StartRecord(self, *_args, **_kwargs):
         val = stc_c.wxStyledTextCtrl_StartRecord(self, *_args, **_kwargs)
         return val
@@ -1512,8 +1497,6 @@ wxSTC_LEX_FORTRAN = stc_c.wxSTC_LEX_FORTRAN
 wxSTC_LEX_F77 = stc_c.wxSTC_LEX_F77
 wxSTC_LEX_CSS = stc_c.wxSTC_LEX_CSS
 wxSTC_LEX_POV = stc_c.wxSTC_LEX_POV
-wxSTC_LEX_LOUT = stc_c.wxSTC_LEX_LOUT
-wxSTC_LEX_ESCRIPT = stc_c.wxSTC_LEX_ESCRIPT
 wxSTC_LEX_AUTOMATIC = stc_c.wxSTC_LEX_AUTOMATIC
 wxSTC_P_DEFAULT = stc_c.wxSTC_P_DEFAULT
 wxSTC_P_COMMENTLINE = stc_c.wxSTC_P_COMMENTLINE
@@ -1548,7 +1531,6 @@ wxSTC_C_COMMENTLINEDOC = stc_c.wxSTC_C_COMMENTLINEDOC
 wxSTC_C_WORD2 = stc_c.wxSTC_C_WORD2
 wxSTC_C_COMMENTDOCKEYWORD = stc_c.wxSTC_C_COMMENTDOCKEYWORD
 wxSTC_C_COMMENTDOCKEYWORDERROR = stc_c.wxSTC_C_COMMENTDOCKEYWORDERROR
-wxSTC_C_GLOBALCLASS = stc_c.wxSTC_C_GLOBALCLASS
 wxSTC_H_DEFAULT = stc_c.wxSTC_H_DEFAULT
 wxSTC_H_TAG = stc_c.wxSTC_H_TAG
 wxSTC_H_TAGUNKNOWN = stc_c.wxSTC_H_TAGUNKNOWN
@@ -1921,29 +1903,6 @@ wxSTC_POV_OPERATOR = stc_c.wxSTC_POV_OPERATOR
 wxSTC_POV_IDENTIFIER = stc_c.wxSTC_POV_IDENTIFIER
 wxSTC_POV_BRACE = stc_c.wxSTC_POV_BRACE
 wxSTC_POV_WORD2 = stc_c.wxSTC_POV_WORD2
-wxSTC_LOUT_DEFAULT = stc_c.wxSTC_LOUT_DEFAULT
-wxSTC_LOUT_COMMENT = stc_c.wxSTC_LOUT_COMMENT
-wxSTC_LOUT_NUMBER = stc_c.wxSTC_LOUT_NUMBER
-wxSTC_LOUT_WORD = stc_c.wxSTC_LOUT_WORD
-wxSTC_LOUT_WORD2 = stc_c.wxSTC_LOUT_WORD2
-wxSTC_LOUT_WORD3 = stc_c.wxSTC_LOUT_WORD3
-wxSTC_LOUT_WORD4 = stc_c.wxSTC_LOUT_WORD4
-wxSTC_LOUT_STRING = stc_c.wxSTC_LOUT_STRING
-wxSTC_LOUT_OPERATOR = stc_c.wxSTC_LOUT_OPERATOR
-wxSTC_LOUT_IDENTIFIER = stc_c.wxSTC_LOUT_IDENTIFIER
-wxSTC_LOUT_STRINGEOL = stc_c.wxSTC_LOUT_STRINGEOL
-wxSTC_ESCRIPT_DEFAULT = stc_c.wxSTC_ESCRIPT_DEFAULT
-wxSTC_ESCRIPT_COMMENT = stc_c.wxSTC_ESCRIPT_COMMENT
-wxSTC_ESCRIPT_COMMENTLINE = stc_c.wxSTC_ESCRIPT_COMMENTLINE
-wxSTC_ESCRIPT_COMMENTDOC = stc_c.wxSTC_ESCRIPT_COMMENTDOC
-wxSTC_ESCRIPT_NUMBER = stc_c.wxSTC_ESCRIPT_NUMBER
-wxSTC_ESCRIPT_WORD = stc_c.wxSTC_ESCRIPT_WORD
-wxSTC_ESCRIPT_STRING = stc_c.wxSTC_ESCRIPT_STRING
-wxSTC_ESCRIPT_OPERATOR = stc_c.wxSTC_ESCRIPT_OPERATOR
-wxSTC_ESCRIPT_IDENTIFIER = stc_c.wxSTC_ESCRIPT_IDENTIFIER
-wxSTC_ESCRIPT_BRACE = stc_c.wxSTC_ESCRIPT_BRACE
-wxSTC_ESCRIPT_WORD2 = stc_c.wxSTC_ESCRIPT_WORD2
-wxSTC_ESCRIPT_WORD3 = stc_c.wxSTC_ESCRIPT_WORD3
 wxSTC_CMD_REDO = stc_c.wxSTC_CMD_REDO
 wxSTC_CMD_SELECTALL = stc_c.wxSTC_CMD_SELECTALL
 wxSTC_CMD_UNDO = stc_c.wxSTC_CMD_UNDO

wxPython/contrib/stc/msw/stc_.cpp

@@ -7933,34 +7933,6 @@ static PyObject *_wrap_wxStyledTextCtrl_LineEndDisplayExtend(PyObject *self, PyO
     return _resultobj;
 }
 
-#define wxStyledTextCtrl_LineCopy(_swigobj)  (_swigobj->LineCopy())
-static PyObject *_wrap_wxStyledTextCtrl_LineCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxStyledTextCtrl * _arg0;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_LineCopy",_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_LineCopy. Expected _wxStyledTextCtrl_p.");
-        return NULL;
-        }
-    }
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxStyledTextCtrl_LineCopy(_arg0);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
 #define wxStyledTextCtrl_MoveCaretInsideView(_swigobj)  (_swigobj->MoveCaretInsideView())
 static PyObject *_wrap_wxStyledTextCtrl_MoveCaretInsideView(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -9633,134 +9605,6 @@ static PyObject *_wrap_wxStyledTextCtrl_SetHotspotActiveUnderline(PyObject *self
     return _resultobj;
 }
 
-#define wxStyledTextCtrl_PositionBefore(_swigobj,_swigarg0)  (_swigobj->PositionBefore(_swigarg0))
-static PyObject *_wrap_wxStyledTextCtrl_PositionBefore(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    int  _result;
-    wxStyledTextCtrl * _arg0;
-    int  _arg1;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self","pos", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_PositionBefore",_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_PositionBefore. Expected _wxStyledTextCtrl_p.");
-        return NULL;
-        }
-    }
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = (int )wxStyledTextCtrl_PositionBefore(_arg0,_arg1);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxStyledTextCtrl_PositionAfter(_swigobj,_swigarg0)  (_swigobj->PositionAfter(_swigarg0))
-static PyObject *_wrap_wxStyledTextCtrl_PositionAfter(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    int  _result;
-    wxStyledTextCtrl * _arg0;
-    int  _arg1;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self","pos", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_PositionAfter",_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_PositionAfter. Expected _wxStyledTextCtrl_p.");
-        return NULL;
-        }
-    }
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = (int )wxStyledTextCtrl_PositionAfter(_arg0,_arg1);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxStyledTextCtrl_CopyRange(_swigobj,_swigarg0,_swigarg1)  (_swigobj->CopyRange(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxStyledTextCtrl_CopyRange(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxStyledTextCtrl * _arg0;
-    int  _arg1;
-    int  _arg2;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self","start","end", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxStyledTextCtrl_CopyRange",_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_CopyRange. Expected _wxStyledTextCtrl_p.");
-        return NULL;
-        }
-    }
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxStyledTextCtrl_CopyRange(_arg0,_arg1,_arg2);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxStyledTextCtrl_CopyText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->CopyText(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxStyledTextCtrl_CopyText(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxStyledTextCtrl * _arg0;
-    int  _arg1;
-    wxString * _arg2;
-    PyObject * _argo0 = 0;
-    PyObject * _obj2 = 0;
-    char *_kwnames[] = { "self","length","text", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxStyledTextCtrl_CopyText",_kwnames,&_argo0,&_arg1,&_obj2)) 
-        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_CopyText. Expected _wxStyledTextCtrl_p.");
-        return NULL;
-        }
-    }
-{
-    _arg2 = wxString_in_helper(_obj2);
-    if (_arg2 == NULL)
-        return NULL;
-}
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxStyledTextCtrl_CopyText(_arg0,_arg1,*_arg2);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-{
-    if (_obj2)
-        delete _arg2;
-}
-    return _resultobj;
-}
-
 #define wxStyledTextCtrl_StartRecord(_swigobj)  (_swigobj->StartRecord())
 static PyObject *_wrap_wxStyledTextCtrl_StartRecord(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -12077,10 +11921,6 @@ static PyMethodDef stc_cMethods[] = {
 	 { "wxStyledTextCtrl_SetLexer", (PyCFunction) _wrap_wxStyledTextCtrl_SetLexer, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_StopRecord", (PyCFunction) _wrap_wxStyledTextCtrl_StopRecord, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_StartRecord", (PyCFunction) _wrap_wxStyledTextCtrl_StartRecord, METH_VARARGS | METH_KEYWORDS },
-	 { "wxStyledTextCtrl_CopyText", (PyCFunction) _wrap_wxStyledTextCtrl_CopyText, METH_VARARGS | METH_KEYWORDS },
-	 { "wxStyledTextCtrl_CopyRange", (PyCFunction) _wrap_wxStyledTextCtrl_CopyRange, METH_VARARGS | METH_KEYWORDS },
-	 { "wxStyledTextCtrl_PositionAfter", (PyCFunction) _wrap_wxStyledTextCtrl_PositionAfter, METH_VARARGS | METH_KEYWORDS },
-	 { "wxStyledTextCtrl_PositionBefore", (PyCFunction) _wrap_wxStyledTextCtrl_PositionBefore, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_SetHotspotActiveUnderline", (PyCFunction) _wrap_wxStyledTextCtrl_SetHotspotActiveUnderline, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_SetHotspotActiveBackground", (PyCFunction) _wrap_wxStyledTextCtrl_SetHotspotActiveBackground, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_SetHotspotActiveForeground", (PyCFunction) _wrap_wxStyledTextCtrl_SetHotspotActiveForeground, METH_VARARGS | METH_KEYWORDS },
@@ -12136,7 +11976,6 @@ static PyMethodDef stc_cMethods[] = {
 	 { "wxStyledTextCtrl_BraceHighlight", (PyCFunction) _wrap_wxStyledTextCtrl_BraceHighlight, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_LineLength", (PyCFunction) _wrap_wxStyledTextCtrl_LineLength, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_MoveCaretInsideView", (PyCFunction) _wrap_wxStyledTextCtrl_MoveCaretInsideView, METH_VARARGS | METH_KEYWORDS },
-	 { "wxStyledTextCtrl_LineCopy", (PyCFunction) _wrap_wxStyledTextCtrl_LineCopy, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_LineEndDisplayExtend", (PyCFunction) _wrap_wxStyledTextCtrl_LineEndDisplayExtend, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_LineEndDisplay", (PyCFunction) _wrap_wxStyledTextCtrl_LineEndDisplay, METH_VARARGS | METH_KEYWORDS },
 	 { "wxStyledTextCtrl_HomeDisplayExtend", (PyCFunction) _wrap_wxStyledTextCtrl_HomeDisplayExtend, METH_VARARGS | METH_KEYWORDS },
@@ -12720,8 +12559,6 @@ SWIGEXPORT(void) initstc_c() {
 	 PyDict_SetItemString(d,"wxSTC_LEX_F77", PyInt_FromLong((long) 37));
 	 PyDict_SetItemString(d,"wxSTC_LEX_CSS", PyInt_FromLong((long) 38));
 	 PyDict_SetItemString(d,"wxSTC_LEX_POV", PyInt_FromLong((long) 39));
-	 PyDict_SetItemString(d,"wxSTC_LEX_LOUT", PyInt_FromLong((long) 40));
-	 PyDict_SetItemString(d,"wxSTC_LEX_ESCRIPT", PyInt_FromLong((long) 41));
 	 PyDict_SetItemString(d,"wxSTC_LEX_AUTOMATIC", PyInt_FromLong((long) 1000));
 	 PyDict_SetItemString(d,"wxSTC_P_DEFAULT", PyInt_FromLong((long) 0));
 	 PyDict_SetItemString(d,"wxSTC_P_COMMENTLINE", PyInt_FromLong((long) 1));
@@ -12756,7 +12593,6 @@ SWIGEXPORT(void) initstc_c() {
 	 PyDict_SetItemString(d,"wxSTC_C_WORD2", PyInt_FromLong((long) 16));
 	 PyDict_SetItemString(d,"wxSTC_C_COMMENTDOCKEYWORD", PyInt_FromLong((long) 17));
 	 PyDict_SetItemString(d,"wxSTC_C_COMMENTDOCKEYWORDERROR", PyInt_FromLong((long) 18));
-	 PyDict_SetItemString(d,"wxSTC_C_GLOBALCLASS", PyInt_FromLong((long) 19));
 	 PyDict_SetItemString(d,"wxSTC_H_DEFAULT", PyInt_FromLong((long) 0));
 	 PyDict_SetItemString(d,"wxSTC_H_TAG", PyInt_FromLong((long) 1));
 	 PyDict_SetItemString(d,"wxSTC_H_TAGUNKNOWN", PyInt_FromLong((long) 2));
@@ -13129,29 +12965,6 @@ SWIGEXPORT(void) initstc_c() {
 	 PyDict_SetItemString(d,"wxSTC_POV_IDENTIFIER", PyInt_FromLong((long) 8));
 	 PyDict_SetItemString(d,"wxSTC_POV_BRACE", PyInt_FromLong((long) 9));
 	 PyDict_SetItemString(d,"wxSTC_POV_WORD2", PyInt_FromLong((long) 10));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_DEFAULT", PyInt_FromLong((long) 0));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_COMMENT", PyInt_FromLong((long) 1));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_NUMBER", PyInt_FromLong((long) 2));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_WORD", PyInt_FromLong((long) 3));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_WORD2", PyInt_FromLong((long) 4));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_WORD3", PyInt_FromLong((long) 5));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_WORD4", PyInt_FromLong((long) 6));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_STRING", PyInt_FromLong((long) 7));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_OPERATOR", PyInt_FromLong((long) 8));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_IDENTIFIER", PyInt_FromLong((long) 9));
-	 PyDict_SetItemString(d,"wxSTC_LOUT_STRINGEOL", PyInt_FromLong((long) 10));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_DEFAULT", PyInt_FromLong((long) 0));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_COMMENT", PyInt_FromLong((long) 1));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_COMMENTLINE", PyInt_FromLong((long) 2));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_COMMENTDOC", PyInt_FromLong((long) 3));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_NUMBER", PyInt_FromLong((long) 4));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD", PyInt_FromLong((long) 5));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_STRING", PyInt_FromLong((long) 6));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_OPERATOR", PyInt_FromLong((long) 7));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_IDENTIFIER", PyInt_FromLong((long) 8));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_BRACE", PyInt_FromLong((long) 9));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD2", PyInt_FromLong((long) 10));
-	 PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD3", PyInt_FromLong((long) 11));
 	 PyDict_SetItemString(d,"wxSTC_CMD_REDO", PyInt_FromLong((long) 2011));
 	 PyDict_SetItemString(d,"wxSTC_CMD_SELECTALL", PyInt_FromLong((long) 2013));
 	 PyDict_SetItemString(d,"wxSTC_CMD_UNDO", PyInt_FromLong((long) 2176));

wxPython/contrib/stc/msw/stc_.py

@@ -878,9 +878,6 @@ class wxStyledTextCtrlPtr(wxControlPtr):
     def LineEndDisplayExtend(self, *_args, **_kwargs):
         val = stc_c.wxStyledTextCtrl_LineEndDisplayExtend(self, *_args, **_kwargs)
         return val
-    def LineCopy(self, *_args, **_kwargs):
-        val = stc_c.wxStyledTextCtrl_LineCopy(self, *_args, **_kwargs)
-        return val
     def MoveCaretInsideView(self, *_args, **_kwargs):
         val = stc_c.wxStyledTextCtrl_MoveCaretInsideView(self, *_args, **_kwargs)
         return val
@@ -1047,18 +1044,6 @@ class wxStyledTextCtrlPtr(wxControlPtr):
     def SetHotspotActiveUnderline(self, *_args, **_kwargs):
         val = stc_c.wxStyledTextCtrl_SetHotspotActiveUnderline(self, *_args, **_kwargs)
         return val
-    def PositionBefore(self, *_args, **_kwargs):
-        val = stc_c.wxStyledTextCtrl_PositionBefore(self, *_args, **_kwargs)
-        return val
-    def PositionAfter(self, *_args, **_kwargs):
-        val = stc_c.wxStyledTextCtrl_PositionAfter(self, *_args, **_kwargs)
-        return val
-    def CopyRange(self, *_args, **_kwargs):
-        val = stc_c.wxStyledTextCtrl_CopyRange(self, *_args, **_kwargs)
-        return val
-    def CopyText(self, *_args, **_kwargs):
-        val = stc_c.wxStyledTextCtrl_CopyText(self, *_args, **_kwargs)
-        return val
     def StartRecord(self, *_args, **_kwargs):
         val = stc_c.wxStyledTextCtrl_StartRecord(self, *_args, **_kwargs)
         return val
@@ -1512,8 +1497,6 @@ wxSTC_LEX_FORTRAN = stc_c.wxSTC_LEX_FORTRAN
 wxSTC_LEX_F77 = stc_c.wxSTC_LEX_F77
 wxSTC_LEX_CSS = stc_c.wxSTC_LEX_CSS
 wxSTC_LEX_POV = stc_c.wxSTC_LEX_POV
-wxSTC_LEX_LOUT = stc_c.wxSTC_LEX_LOUT
-wxSTC_LEX_ESCRIPT = stc_c.wxSTC_LEX_ESCRIPT
 wxSTC_LEX_AUTOMATIC = stc_c.wxSTC_LEX_AUTOMATIC
 wxSTC_P_DEFAULT = stc_c.wxSTC_P_DEFAULT
 wxSTC_P_COMMENTLINE = stc_c.wxSTC_P_COMMENTLINE
@@ -1548,7 +1531,6 @@ wxSTC_C_COMMENTLINEDOC = stc_c.wxSTC_C_COMMENTLINEDOC
 wxSTC_C_WORD2 = stc_c.wxSTC_C_WORD2
 wxSTC_C_COMMENTDOCKEYWORD = stc_c.wxSTC_C_COMMENTDOCKEYWORD
 wxSTC_C_COMMENTDOCKEYWORDERROR = stc_c.wxSTC_C_COMMENTDOCKEYWORDERROR
-wxSTC_C_GLOBALCLASS = stc_c.wxSTC_C_GLOBALCLASS
 wxSTC_H_DEFAULT = stc_c.wxSTC_H_DEFAULT
 wxSTC_H_TAG = stc_c.wxSTC_H_TAG
 wxSTC_H_TAGUNKNOWN = stc_c.wxSTC_H_TAGUNKNOWN
@@ -1921,29 +1903,6 @@ wxSTC_POV_OPERATOR = stc_c.wxSTC_POV_OPERATOR
 wxSTC_POV_IDENTIFIER = stc_c.wxSTC_POV_IDENTIFIER
 wxSTC_POV_BRACE = stc_c.wxSTC_POV_BRACE
 wxSTC_POV_WORD2 = stc_c.wxSTC_POV_WORD2
-wxSTC_LOUT_DEFAULT = stc_c.wxSTC_LOUT_DEFAULT
-wxSTC_LOUT_COMMENT = stc_c.wxSTC_LOUT_COMMENT
-wxSTC_LOUT_NUMBER = stc_c.wxSTC_LOUT_NUMBER
-wxSTC_LOUT_WORD = stc_c.wxSTC_LOUT_WORD
-wxSTC_LOUT_WORD2 = stc_c.wxSTC_LOUT_WORD2
-wxSTC_LOUT_WORD3 = stc_c.wxSTC_LOUT_WORD3
-wxSTC_LOUT_WORD4 = stc_c.wxSTC_LOUT_WORD4
-wxSTC_LOUT_STRING = stc_c.wxSTC_LOUT_STRING
-wxSTC_LOUT_OPERATOR = stc_c.wxSTC_LOUT_OPERATOR
-wxSTC_LOUT_IDENTIFIER = stc_c.wxSTC_LOUT_IDENTIFIER
-wxSTC_LOUT_STRINGEOL = stc_c.wxSTC_LOUT_STRINGEOL
-wxSTC_ESCRIPT_DEFAULT = stc_c.wxSTC_ESCRIPT_DEFAULT
-wxSTC_ESCRIPT_COMMENT = stc_c.wxSTC_ESCRIPT_COMMENT
-wxSTC_ESCRIPT_COMMENTLINE = stc_c.wxSTC_ESCRIPT_COMMENTLINE
-wxSTC_ESCRIPT_COMMENTDOC = stc_c.wxSTC_ESCRIPT_COMMENTDOC
-wxSTC_ESCRIPT_NUMBER = stc_c.wxSTC_ESCRIPT_NUMBER
-wxSTC_ESCRIPT_WORD = stc_c.wxSTC_ESCRIPT_WORD
-wxSTC_ESCRIPT_STRING = stc_c.wxSTC_ESCRIPT_STRING
-wxSTC_ESCRIPT_OPERATOR = stc_c.wxSTC_ESCRIPT_OPERATOR
-wxSTC_ESCRIPT_IDENTIFIER = stc_c.wxSTC_ESCRIPT_IDENTIFIER
-wxSTC_ESCRIPT_BRACE = stc_c.wxSTC_ESCRIPT_BRACE
-wxSTC_ESCRIPT_WORD2 = stc_c.wxSTC_ESCRIPT_WORD2
-wxSTC_ESCRIPT_WORD3 = stc_c.wxSTC_ESCRIPT_WORD3
 wxSTC_CMD_REDO = stc_c.wxSTC_CMD_REDO
 wxSTC_CMD_SELECTALL = stc_c.wxSTC_CMD_SELECTALL
 wxSTC_CMD_UNDO = stc_c.wxSTC_CMD_UNDO

wxPython/demo/run.py

@@ -18,7 +18,6 @@ on the command line.
 """
 
 import wx                  # This module uses the new wx namespace
-print "wx.VERSION_STRING = ", wx.VERSION_STRING
 
 import sys, os
 

wxPython/demo/simple.py

@@ -33,6 +33,7 @@ class MyFrame(wx.Frame):
         sizer.Add(text, 0, wx.ALL, 10)
         sizer.Add(btn, 0, wx.ALL, 10)
         panel.SetSizer(sizer)
+        panel.SetAutoLayout(True)
         panel.Layout()
 
         wx.EVT_BUTTON(self, btn.GetId(), self.OnButton)
@@ -46,6 +47,6 @@ class MyFrame(wx.Frame):
 
 app = wx.PySimpleApp()
 frame = MyFrame(None, "Simple wxPython App")
-frame.Show()
+frame.Show(True)
 app.MainLoop()
 

wxPython/demo/wxListCtrl.py

@@ -292,7 +292,7 @@ class TestListCtrlPanel(wxPanel, wxColumnSorterMixin):
         menu = wxMenu()
         # add some items
         menu.Append(self.popupID1, "FindItem tests")
-        menu.Append(self.popupID2, "Iterate Selected")
+#        menu.Append(self.popupID2, "Two")
         menu.Append(self.popupID3, "ClearAll and repopulate")
         menu.Append(self.popupID4, "DeleteAllItems")
         menu.Append(self.popupID5, "GetItem")
@@ -310,11 +310,7 @@ class TestListCtrlPanel(wxPanel, wxColumnSorterMixin):
         print "FindItemData:", self.list.FindItemData(-1, 11)
 
     def OnPopupTwo(self, event):
-        self.log.WriteText("Selected items:\n")
-        index = self.list.GetFirstSelected()
-        while index != -1:
-            self.log.WriteText("      %s: %s\n" % (self.list.GetItemText(index), self.getColumnText(index, 1)))
-            index = self.list.GetNextSelected(index)
+        self.log.WriteText("Popup two\n")
 
     def OnPopupThree(self, event):
         self.log.WriteText("Popup three\n")

wxPython/demo/wxMenu.py

@@ -6,7 +6,7 @@
 #-------------------------------------------------------------------
 
 from wxPython.wx import *
-import images
+
 import time
 
 #-------------------------------------------------------------------
@@ -69,11 +69,6 @@ check the source for this sample to see how to implement them.
         menuBar.Append(menu4, "Chec&k")
 
         menu5 = wxMenu()
-        # Show how to put an icon in the menu
-        item = wxMenuItem(menu5, 500, "&Smile!\tCtrl+S", "This one has an icon")
-        item.SetBitmap(images.getSmilesBitmap())
-        menu5.AppendItem(item)
-
         menu5.Append(501, "Interesting thing\tCtrl+A", "Note the shortcut!")
         menu5.AppendSeparator()
         menu5.Append(502, "Hello\tShift+H")
@@ -112,7 +107,6 @@ check the source for this sample to see how to implement them.
 
         EVT_MENU_RANGE(self, 401, 403, self.Menu401To403)
 
-        EVT_MENU(self, 500, self.Menu500)
         EVT_MENU(self, 501, self.Menu501)
         EVT_MENU(self, 502, self.Menu502)
         EVT_MENU(self, 503, self.TestRemove)
@@ -174,9 +168,6 @@ check the source for this sample to see how to implement them.
     def Menu401To403(self, event):
         self.log.write('From a EVT_MENU_RANGE event\n')
 
-    def Menu500(self, event):
-        self.log.write('Have a happy day!\n')
-
     def Menu501(self, event):
         self.log.write('Look in the code how the shortcut has been realized\n')
 

wxPython/demo/wxStyledTextCtrl_1.py

@@ -6,7 +6,7 @@ import images
 
 #----------------------------------------------------------------------
 
-debug = 0
+debug = 1
 
 
 demoText = """\
@@ -167,7 +167,7 @@ def runTest(frame, nb, log):
     #ed.SetBufferedDraw(False)
     #ed.StyleClearAll()
     #ed.SetScrollWidth(800)
-    #ed.SetWrapMode(wxSTC_WRAP_WORD)
+    #ed.SetWrapMode(True)
 
     ed.SetText(demoText)
     if wxUSE_UNICODE:

wxPython/demo/wxStyledTextCtrl_2.py

@@ -51,10 +51,9 @@ class PythonSTC(wxStyledTextCtrl):
         self.SetProperty("tab.timmy.whinge.level", "1")
         self.SetMargins(0,0)
 
-        #self.SetViewWhiteSpace(True)
+        self.SetViewWhiteSpace(False)
         #self.SetBufferedDraw(False)
         #self.SetViewEOL(True)
-        #self.SetTwoPhaseDraw(False)
 
         self.SetEdgeMode(wxSTC_EDGE_BACKGROUND)
         self.SetEdgeColumn(78)

wxPython/setup.py

@@ -16,8 +16,8 @@ from distutils.command.install_data import install_data
 VER_MAJOR        = 2      # The first three must match wxWindows
 VER_MINOR        = 4
 VER_RELEASE      = 1
-VER_SUBREL       = 3      # wxPython release num for x.y.z release of wxWindows
-VER_FLAGS        = "p"     # release flags, such as prerelease num, unicode, etc.
+VER_SUBREL       = 2      # wxPython release num for x.y.z release of wxWindows
+VER_FLAGS        = ""     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
@@ -838,7 +838,6 @@ if BUILD_STC:
                      '%s/scintilla/src/Document.cxx' % STCLOC,
                      '%s/scintilla/src/DocumentAccessor.cxx' % STCLOC,
                      '%s/scintilla/src/Editor.cxx' % STCLOC,
-                     '%s/scintilla/src/ExternalLexer.cxx' % STCLOC,
                      '%s/scintilla/src/Indicator.cxx' % STCLOC,
                      '%s/scintilla/src/KeyMap.cxx' % STCLOC,
                      '%s/scintilla/src/KeyWords.cxx' % STCLOC,

wxPython/src/__version__.py

@@ -1,12 +1,12 @@
 # This file was generated by setup.py...
 
-wxVERSION_STRING  = '2.4.1.3p'
+wxVERSION_STRING  = '2.4.1.2'
 wxMAJOR_VERSION   = 2
 wxMINOR_VERSION   = 4
 wxRELEASE_VERSION = 1
-wxSUBREL_VERSION  = 3
+wxSUBREL_VERSION  = 2
 
 wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION,
-             wxSUBREL_VERSION, 'p')
+             wxSUBREL_VERSION, '')
 
 wxRELEASE_NUMBER = wxRELEASE_VERSION  # for compatibility

wxPython/src/_extras.py

@@ -970,15 +970,6 @@ of your Mac."""
         if redirect:
             self.RedirectStdio(filename)
 
-        # Set the default handler for SIGINT.  This fixes a problem
-        # where if Ctrl-C is pressed in the console that started this
-        # app then it will not appear to do anything, (not even send
-        # KeyboardInterrupt???)  but will later segfault on exit.  By
-        # setting the default handler then the app will exit, as
-        # expected (depending on platform.)
-        import signal
-        signal.signal(signal.SIGINT, signal.SIG_DFL)
-
         # this initializes wxWindows and then calls our OnInit
         _wxStart(self.OnInit)
 

wxPython/src/filesys.i

@@ -141,23 +141,13 @@ public:
     static void AddHandler(wxFileSystemHandler *handler);
     static void CleanUpHandlers();
 
-    // Returns the file URL for a native path
-    static wxString FileNameToURL(const wxString& filename);
+//     // Returns the native path for a file URL
+//     static wxFileName URLToFileName(const wxString& url);
 
-    // Returns the native path for a file URL
-    //static wxFileName URLToFileName(const wxString& url);  *** See below
+//     // Returns the file URL for a native path
+//     static wxString FileNameToURL(const wxFileName& filename);
 };
 
-
-// Returns the native path for a file URL
-wxString wxFileSystem_URLToFileName(const wxString& url);
-%{
-    wxString wxFileSystem_URLToFileName(const wxString& url) {
-        wxFileName fname = wxFileSystem::URLToFileName(url);
-        return fname.GetFullPath();
-    }
-%}
-
 //---------------------------------------------------------------------------
 
 class wxInternetFSHandler : public wxFileSystemHandler {

wxPython/src/gtk/controls2.py

@@ -642,7 +642,7 @@ class wxListCtrlPtr(wxControlPtr):
         return "<%s.%s instance; proxy of C++ wxListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     
     def GetColumn(self, *_args, **_kwargs):
-        val = controls2c.wxListCtrl_GetColumn(self, *_args, **_kwargs)
+        val = ontrols2c.wxListCtrl_GetColumn(self, *_args, **_kwargs)
         if val is not None: val.thisown = 1
         return val
     

wxPython/src/gtk/filesys.cpp

@@ -128,11 +128,6 @@ IMP_PYCALLBACK_FSF_FSSTRING_pure(wxPyFileSystemHandler, wxFileSystemHandler, Ope
 IMP_PYCALLBACK_STRING_STRINGINT_pure(wxPyFileSystemHandler, wxFileSystemHandler, FindFirst);
 IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext);
 
-    wxString wxFileSystem_URLToFileName(const wxString& url) {
-        wxFileName fname = wxFileSystem::URLToFileName(url);
-        return fname.GetFullPath();
-    }
-
 void __wxMemoryFSHandler_AddFile_wxImage(const wxString& filename,
                                          wxImage& image,
                                          long type) {
@@ -156,44 +151,6 @@ void __wxMemoryFSHandler_AddFile_Data(const wxString& filename,
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_wxFileSystem_URLToFileName(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxString * _result;
-    wxString * _arg0;
-    PyObject * _obj0 = 0;
-    char *_kwnames[] = { "url", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileSystem_URLToFileName",_kwnames,&_obj0)) 
-        return NULL;
-{
-    _arg0 = wxString_in_helper(_obj0);
-    if (_arg0 == NULL)
-        return NULL;
-}
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = new wxString (wxFileSystem_URLToFileName(*_arg0));
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}{
-#if wxUSE_UNICODE
-    _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len());
-#else
-    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
-#endif
-}
-{
-    if (_obj0)
-        delete _arg0;
-}
-{
-    delete _result;
-}
-    return _resultobj;
-}
-
 static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _arg0;
@@ -1354,44 +1311,6 @@ static PyObject *_wrap_wxFileSystem_CleanUpHandlers(PyObject *self, PyObject *ar
     return _resultobj;
 }
 
-static PyObject *_wrap_wxFileSystem_FileNameToURL(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxString * _result;
-    wxString * _arg0;
-    PyObject * _obj0 = 0;
-    char *_kwnames[] = { "filename", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileSystem_FileNameToURL",_kwnames,&_obj0)) 
-        return NULL;
-{
-    _arg0 = wxString_in_helper(_obj0);
-    if (_arg0 == NULL)
-        return NULL;
-}
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = new wxString (wxFileSystem::FileNameToURL(*_arg0));
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}{
-#if wxUSE_UNICODE
-    _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len());
-#else
-    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
-#endif
-}
-{
-    if (_obj0)
-        delete _arg0;
-}
-{
-    delete _result;
-}
-    return _resultobj;
-}
-
 static void *SwigwxInternetFSHandlerTowxFileSystemHandler(void *ptr) {
     wxInternetFSHandler *src;
     wxFileSystemHandler *dest;
@@ -1992,7 +1911,6 @@ static PyMethodDef filesyscMethods[] = {
 	 { "wxInternetFSHandler_OpenFile", (PyCFunction) _wrap_wxInternetFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS },
 	 { "wxInternetFSHandler_CanOpen", (PyCFunction) _wrap_wxInternetFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS },
 	 { "new_wxInternetFSHandler", (PyCFunction) _wrap_new_wxInternetFSHandler, METH_VARARGS | METH_KEYWORDS },
-	 { "wxFileSystem_FileNameToURL", (PyCFunction) _wrap_wxFileSystem_FileNameToURL, METH_VARARGS | METH_KEYWORDS },
 	 { "wxFileSystem_CleanUpHandlers", (PyCFunction) _wrap_wxFileSystem_CleanUpHandlers, METH_VARARGS | METH_KEYWORDS },
 	 { "wxFileSystem_AddHandler", (PyCFunction) _wrap_wxFileSystem_AddHandler, METH_VARARGS | METH_KEYWORDS },
 	 { "wxFileSystem_FindNext", (PyCFunction) _wrap_wxFileSystem_FindNext, METH_VARARGS | METH_KEYWORDS },
@@ -2021,7 +1939,6 @@ static PyMethodDef filesyscMethods[] = {
 	 { "__wxMemoryFSHandler_AddFile_Data", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_Data, METH_VARARGS | METH_KEYWORDS },
 	 { "__wxMemoryFSHandler_AddFile_wxBitmap", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxBitmap, METH_VARARGS | METH_KEYWORDS },
 	 { "__wxMemoryFSHandler_AddFile_wxImage", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxImage, METH_VARARGS | METH_KEYWORDS },
-	 { "wxFileSystem_URLToFileName", (PyCFunction) _wrap_wxFileSystem_URLToFileName, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus

wxPython/src/gtk/filesys.py

@@ -218,8 +218,6 @@ class wxMemoryFSHandler(wxMemoryFSHandlerPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
-wxFileSystem_URLToFileName = filesysc.wxFileSystem_URLToFileName
-
 __wxMemoryFSHandler_AddFile_wxImage = filesysc.__wxMemoryFSHandler_AddFile_wxImage
 
 __wxMemoryFSHandler_AddFile_wxBitmap = filesysc.__wxMemoryFSHandler_AddFile_wxBitmap
@@ -230,8 +228,6 @@ wxFileSystem_AddHandler = filesysc.wxFileSystem_AddHandler
 
 wxFileSystem_CleanUpHandlers = filesysc.wxFileSystem_CleanUpHandlers
 
-wxFileSystem_FileNameToURL = filesysc.wxFileSystem_FileNameToURL
-
 wxMemoryFSHandler_RemoveFile = filesysc.wxMemoryFSHandler_RemoveFile
 
 

wxPython/src/gtk/wx.py

@@ -1935,15 +1935,6 @@ of your Mac."""
         if redirect:
             self.RedirectStdio(filename)
 
-        # Set the default handler for SIGINT.  This fixes a problem
-        # where if Ctrl-C is pressed in the console that started this
-        # app then it will not appear to do anything, (not even send
-        # KeyboardInterrupt???)  but will later segfault on exit.  By
-        # setting the default handler then the app will exit, as
-        # expected (depending on platform.)
-        import signal
-        signal.signal(signal.SIGINT, signal.SIG_DFL)
-
         # this initializes wxWindows and then calls our OnInit
         _wxStart(self.OnInit)
 

wxPython/src/helpers.cpp

@@ -386,7 +386,10 @@ void __wxPreStart(PyObject* moduleDict)
     wxPyTMutex = new wxMutex;
 #endif
 
-    // Ensure that the build options in the DLL (or whatever) match this build
+     // Restore default signal handlers, (prevents crash upon Ctrl-C in the
+     // console that launched a wxPython app...)
+    PyOS_FiniInterrupts();
+
     wxApp::CheckBuildOptions(wxBuildOptions());
 
     wxPyAssertionError = PyErr_NewException("wxPython.wxc.wxPyAssertionError",
@@ -1225,50 +1228,29 @@ void wxPyCallback::EventThunker(wxEvent& event) {
     PyObject*       result;
     PyObject*       arg;
     PyObject*       tuple;
-    bool            checkSkip = FALSE;
+
 
     wxPyBeginBlockThreads();
     wxString className = event.GetClassInfo()->GetClassName();
 
-    // If the event is one of these types then pass the original
-    // event object instead of the one passed to us.
-    if ( className == wxT("wxPyEvent") ) {
+    if (className == wxT("wxPyEvent"))
         arg = ((wxPyEvent*)&event)->GetSelf();
-        checkSkip = ((wxPyEvent*)&event)->GetCloned();
-    }
-    else if ( className == wxT("wxPyCommandEvent") ) {
+    else if (className == wxT("wxPyCommandEvent"))
         arg = ((wxPyCommandEvent*)&event)->GetSelf();
-        checkSkip = ((wxPyCommandEvent*)&event)->GetCloned();
-    }
     else {
         arg = wxPyConstructObject((void*)&event, className);
     }
 
-    // Call the event handler, passing the event object
     tuple = PyTuple_New(1);
-    PyTuple_SET_ITEM(tuple, 0, arg);  // steals ref to arg
+    PyTuple_SET_ITEM(tuple, 0, arg);
     result = PyEval_CallObject(func, tuple);
+    Py_DECREF(tuple);
     if (result) {
-        Py_DECREF(result);   // result is ignored, but we still need to decref it
+        Py_DECREF(result);
         PyErr_Clear();       // Just in case...
     } else {
         PyErr_Print();
     }
-
-    if ( checkSkip ) {
-        // if the event object was one of our special types and
-        // it had been cloned, then we need to extract the Skipped
-        // value from the original and set it in the clone.
-        result = PyObject_CallMethod(arg, "GetSkipped", "");
-        if ( result ) {
-            event.Skip(PyInt_AsLong(result));
-            Py_DECREF(result);
-        } else {
-            PyErr_Print();
-        }
-    }
-
-    Py_DECREF(tuple);
     wxPyEndBlockThreads();
 }
 

wxPython/src/helpers.h

@@ -181,7 +181,6 @@ public:
 
     void SetSelf(PyObject* self, bool clone=FALSE);
     PyObject* GetSelf() const;
-    bool GetCloned() const { return m_cloned; }
 
 protected:
     PyObject*   m_self;

wxPython/src/mac/controls2.py

@@ -642,7 +642,7 @@ class wxListCtrlPtr(wxControlPtr):
         return "<%s.%s instance; proxy of C++ wxListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     
     def GetColumn(self, *_args, **_kwargs):
-        val = controls2c.wxListCtrl_GetColumn(self, *_args, **_kwargs)
+        val = ontrols2c.wxListCtrl_GetColumn(self, *_args, **_kwargs)
         if val is not None: val.thisown = 1
         return val
     

wxPython/src/mac/filesys.cpp

@@ -128,11 +128,6 @@ IMP_PYCALLBACK_FSF_FSSTRING_pure(wxPyFileSystemHandler, wxFileSystemHandler, Ope
 IMP_PYCALLBACK_STRING_STRINGINT_pure(wxPyFileSystemHandler, wxFileSystemHandler, FindFirst);
 IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext);
 
-    wxString wxFileSystem_URLToFileName(const wxString& url) {
-        wxFileName fname = wxFileSystem::URLToFileName(url);
-        return fname.GetFullPath();
-    }
-
 void __wxMemoryFSHandler_AddFile_wxImage(const wxString& filename,
                                          wxImage& image,
                                          long type) {
@@ -156,44 +151,6 @@ void __wxMemoryFSHandler_AddFile_Data(const wxString& filename,
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_wxFileSystem_URLToFileName(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxString * _result;
-    wxString * _arg0;
-    PyObject * _obj0 = 0;
-    char *_kwnames[] = { "url", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileSystem_URLToFileName",_kwnames,&_obj0)) 
-        return NULL;
-{
-    _arg0 = wxString_in_helper(_obj0);
-    if (_arg0 == NULL)
-        return NULL;
-}
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = new wxString (wxFileSystem_URLToFileName(*_arg0));
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}{
-#if wxUSE_UNICODE
-    _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len());
-#else
-    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
-#endif
-}
-{
-    if (_obj0)
-        delete _arg0;
-}
-{
-    delete _result;
-}
-    return _resultobj;
-}
-
 static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _arg0;
@@ -1354,44 +1311,6 @@ static PyObject *_wrap_wxFileSystem_CleanUpHandlers(PyObject *self, PyObject *ar
     return _resultobj;
 }
 
-static PyObject *_wrap_wxFileSystem_FileNameToURL(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxString * _result;
-    wxString * _arg0;
-    PyObject * _obj0 = 0;
-    char *_kwnames[] = { "filename", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileSystem_FileNameToURL",_kwnames,&_obj0)) 
-        return NULL;
-{
-    _arg0 = wxString_in_helper(_obj0);
-    if (_arg0 == NULL)
-        return NULL;
-}
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = new wxString (wxFileSystem::FileNameToURL(*_arg0));
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}{
-#if wxUSE_UNICODE
-    _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len());
-#else
-    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
-#endif
-}
-{
-    if (_obj0)
-        delete _arg0;
-}
-{
-    delete _result;
-}
-    return _resultobj;
-}
-
 static void *SwigwxInternetFSHandlerTowxFileSystemHandler(void *ptr) {
     wxInternetFSHandler *src;
     wxFileSystemHandler *dest;
@@ -1992,7 +1911,6 @@ static PyMethodDef filesyscMethods[] = {
 	 { "wxInternetFSHandler_OpenFile", (PyCFunction) _wrap_wxInternetFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS },
 	 { "wxInternetFSHandler_CanOpen", (PyCFunction) _wrap_wxInternetFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS },
 	 { "new_wxInternetFSHandler", (PyCFunction) _wrap_new_wxInternetFSHandler, METH_VARARGS | METH_KEYWORDS },
-	 { "wxFileSystem_FileNameToURL", (PyCFunction) _wrap_wxFileSystem_FileNameToURL, METH_VARARGS | METH_KEYWORDS },
 	 { "wxFileSystem_CleanUpHandlers", (PyCFunction) _wrap_wxFileSystem_CleanUpHandlers, METH_VARARGS | METH_KEYWORDS },
 	 { "wxFileSystem_AddHandler", (PyCFunction) _wrap_wxFileSystem_AddHandler, METH_VARARGS | METH_KEYWORDS },
 	 { "wxFileSystem_FindNext", (PyCFunction) _wrap_wxFileSystem_FindNext, METH_VARARGS | METH_KEYWORDS },
@@ -2021,7 +1939,6 @@ static PyMethodDef filesyscMethods[] = {
 	 { "__wxMemoryFSHandler_AddFile_Data", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_Data, METH_VARARGS | METH_KEYWORDS },
 	 { "__wxMemoryFSHandler_AddFile_wxBitmap", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxBitmap, METH_VARARGS | METH_KEYWORDS },
 	 { "__wxMemoryFSHandler_AddFile_wxImage", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxImage, METH_VARARGS | METH_KEYWORDS },
-	 { "wxFileSystem_URLToFileName", (PyCFunction) _wrap_wxFileSystem_URLToFileName, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus

wxPython/src/mac/filesys.py

@@ -218,8 +218,6 @@ class wxMemoryFSHandler(wxMemoryFSHandlerPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
-wxFileSystem_URLToFileName = filesysc.wxFileSystem_URLToFileName
-
 __wxMemoryFSHandler_AddFile_wxImage = filesysc.__wxMemoryFSHandler_AddFile_wxImage
 
 __wxMemoryFSHandler_AddFile_wxBitmap = filesysc.__wxMemoryFSHandler_AddFile_wxBitmap
@@ -230,8 +228,6 @@ wxFileSystem_AddHandler = filesysc.wxFileSystem_AddHandler
 
 wxFileSystem_CleanUpHandlers = filesysc.wxFileSystem_CleanUpHandlers
 
-wxFileSystem_FileNameToURL = filesysc.wxFileSystem_FileNameToURL
-
 wxMemoryFSHandler_RemoveFile = filesysc.wxMemoryFSHandler_RemoveFile
 
 

wxPython/src/mac/wx.py

@@ -1935,15 +1935,6 @@ of your Mac."""
         if redirect:
             self.RedirectStdio(filename)
 
-        # Set the default handler for SIGINT.  This fixes a problem
-        # where if Ctrl-C is pressed in the console that started this
-        # app then it will not appear to do anything, (not even send
-        # KeyboardInterrupt???)  but will later segfault on exit.  By
-        # setting the default handler then the app will exit, as
-        # expected (depending on platform.)
-        import signal
-        signal.signal(signal.SIGINT, signal.SIG_DFL)
-
         # this initializes wxWindows and then calls our OnInit
         _wxStart(self.OnInit)
 

wxPython/src/msw/controls2.py

@@ -645,7 +645,7 @@ class wxListCtrlPtr(wxControlPtr):
         return "<%s.%s instance; proxy of C++ wxListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     
     def GetColumn(self, *_args, **_kwargs):
-        val = controls2c.wxListCtrl_GetColumn(self, *_args, **_kwargs)
+        val = ontrols2c.wxListCtrl_GetColumn(self, *_args, **_kwargs)
         if val is not None: val.thisown = 1
         return val
     

wxPython/src/msw/filesys.cpp

@@ -128,11 +128,6 @@ IMP_PYCALLBACK_FSF_FSSTRING_pure(wxPyFileSystemHandler, wxFileSystemHandler, Ope
 IMP_PYCALLBACK_STRING_STRINGINT_pure(wxPyFileSystemHandler, wxFileSystemHandler, FindFirst);
 IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext);
 
-    wxString wxFileSystem_URLToFileName(const wxString& url) {
-        wxFileName fname = wxFileSystem::URLToFileName(url);
-        return fname.GetFullPath();
-    }
-
 void __wxMemoryFSHandler_AddFile_wxImage(const wxString& filename,
                                          wxImage& image,
                                          long type) {
@@ -156,44 +151,6 @@ void __wxMemoryFSHandler_AddFile_Data(const wxString& filename,
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_wxFileSystem_URLToFileName(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxString * _result;
-    wxString * _arg0;
-    PyObject * _obj0 = 0;
-    char *_kwnames[] = { "url", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileSystem_URLToFileName",_kwnames,&_obj0)) 
-        return NULL;
-{
-    _arg0 = wxString_in_helper(_obj0);
-    if (_arg0 == NULL)
-        return NULL;
-}
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = new wxString (wxFileSystem_URLToFileName(*_arg0));
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}{
-#if wxUSE_UNICODE
-    _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len());
-#else
-    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
-#endif
-}
-{
-    if (_obj0)
-        delete _arg0;
-}
-{
-    delete _result;
-}
-    return _resultobj;
-}
-
 static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _arg0;
@@ -1354,44 +1311,6 @@ static PyObject *_wrap_wxFileSystem_CleanUpHandlers(PyObject *self, PyObject *ar
     return _resultobj;
 }
 
-static PyObject *_wrap_wxFileSystem_FileNameToURL(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxString * _result;
-    wxString * _arg0;
-    PyObject * _obj0 = 0;
-    char *_kwnames[] = { "filename", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileSystem_FileNameToURL",_kwnames,&_obj0)) 
-        return NULL;
-{
-    _arg0 = wxString_in_helper(_obj0);
-    if (_arg0 == NULL)
-        return NULL;
-}
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = new wxString (wxFileSystem::FileNameToURL(*_arg0));
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}{
-#if wxUSE_UNICODE
-    _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len());
-#else
-    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
-#endif
-}
-{
-    if (_obj0)
-        delete _arg0;
-}
-{
-    delete _result;
-}
-    return _resultobj;
-}
-
 static void *SwigwxInternetFSHandlerTowxFileSystemHandler(void *ptr) {
     wxInternetFSHandler *src;
     wxFileSystemHandler *dest;
@@ -1992,7 +1911,6 @@ static PyMethodDef filesyscMethods[] = {
 	 { "wxInternetFSHandler_OpenFile", (PyCFunction) _wrap_wxInternetFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS },
 	 { "wxInternetFSHandler_CanOpen", (PyCFunction) _wrap_wxInternetFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS },
 	 { "new_wxInternetFSHandler", (PyCFunction) _wrap_new_wxInternetFSHandler, METH_VARARGS | METH_KEYWORDS },
-	 { "wxFileSystem_FileNameToURL", (PyCFunction) _wrap_wxFileSystem_FileNameToURL, METH_VARARGS | METH_KEYWORDS },
 	 { "wxFileSystem_CleanUpHandlers", (PyCFunction) _wrap_wxFileSystem_CleanUpHandlers, METH_VARARGS | METH_KEYWORDS },
 	 { "wxFileSystem_AddHandler", (PyCFunction) _wrap_wxFileSystem_AddHandler, METH_VARARGS | METH_KEYWORDS },
 	 { "wxFileSystem_FindNext", (PyCFunction) _wrap_wxFileSystem_FindNext, METH_VARARGS | METH_KEYWORDS },
@@ -2021,7 +1939,6 @@ static PyMethodDef filesyscMethods[] = {
 	 { "__wxMemoryFSHandler_AddFile_Data", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_Data, METH_VARARGS | METH_KEYWORDS },
 	 { "__wxMemoryFSHandler_AddFile_wxBitmap", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxBitmap, METH_VARARGS | METH_KEYWORDS },
 	 { "__wxMemoryFSHandler_AddFile_wxImage", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxImage, METH_VARARGS | METH_KEYWORDS },
-	 { "wxFileSystem_URLToFileName", (PyCFunction) _wrap_wxFileSystem_URLToFileName, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus

wxPython/src/msw/filesys.py

@@ -218,8 +218,6 @@ class wxMemoryFSHandler(wxMemoryFSHandlerPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
-wxFileSystem_URLToFileName = filesysc.wxFileSystem_URLToFileName
-
 __wxMemoryFSHandler_AddFile_wxImage = filesysc.__wxMemoryFSHandler_AddFile_wxImage
 
 __wxMemoryFSHandler_AddFile_wxBitmap = filesysc.__wxMemoryFSHandler_AddFile_wxBitmap
@@ -230,8 +228,6 @@ wxFileSystem_AddHandler = filesysc.wxFileSystem_AddHandler
 
 wxFileSystem_CleanUpHandlers = filesysc.wxFileSystem_CleanUpHandlers
 
-wxFileSystem_FileNameToURL = filesysc.wxFileSystem_FileNameToURL
-
 wxMemoryFSHandler_RemoveFile = filesysc.wxMemoryFSHandler_RemoveFile
 
 

wxPython/src/msw/wx.py

@@ -1941,15 +1941,6 @@ of your Mac."""
         if redirect:
             self.RedirectStdio(filename)
 
-        # Set the default handler for SIGINT.  This fixes a problem
-        # where if Ctrl-C is pressed in the console that started this
-        # app then it will not appear to do anything, (not even send
-        # KeyboardInterrupt???)  but will later segfault on exit.  By
-        # setting the default handler then the app will exit, as
-        # expected (depending on platform.)
-        import signal
-        signal.signal(signal.SIGINT, signal.SIG_DFL)
-
         # this initializes wxWindows and then calls our OnInit
         _wxStart(self.OnInit)
 

wxPython/wxPython/lib/imagebrowser.py

@@ -305,7 +305,8 @@ class FindFiles:
                 f = f + "."
             else:
                 f = f + ch
-        return re.compile(f+'$')
+
+        return re.compile(f)
 
     def StripExt(self, file_nm):
         fl_fld = os.path.splitext(file_nm)

wxPython/wxPython/lib/intctrl.py

@@ -400,11 +400,11 @@ class wxIntCtrl(wxTextCtrl):
     """
 
     def __init__ (
-                self, parent, id=-1, value = 0,
+                self, parent, id=-1,
                 pos = wxDefaultPosition, size = wxDefaultSize,
                 style = 0, validator = wxDefaultValidator,
                 name = "integer",
-                min=None, max=None,
+                value = 0, min=None, max=None,
                 limited = 0, allow_none = 0, allow_long = 0,
                 default_color = wxBLACK, oob_color = wxRED,
         ):

wxPython/wxPython/lib/throbber.py

@@ -4,12 +4,12 @@ started, stopped, reversed, etc.  Useful for showing
 an ongoing process (like most web browsers use) or
 simply for adding eye-candy to an application.
 
-Throbbers utilize a wxTimer so that normal processing
-can continue unencumbered.
+Throbbers run in a separate thread so normal application
+processing can continue unencumbered.
 """
 
 #
-# throbber.py - Cliff Wells <clifford.wells@comcast.net>
+# throbber.py - Cliff Wells <clifford.wells@attbi.com>
 #
 # Thanks to Harald Massa <harald.massa@suedvers.de> for
 # suggestions and sample code.
@@ -17,22 +17,23 @@ can continue unencumbered.
 # $Id$
 #
 
-import os
-import wx
+import threading, os
+from wxPython.wx import *
 
 # ------------------------------------------------------------------------------
-THROBBER_EVENT = wx.NewEventType()
+
+wxEVT_UPDATE_THROBBER = wxNewEventType()
 def EVT_UPDATE_THROBBER(win, func):
-    win.Connect(-1, -1, THROBBER_EVENT, func)
+    win.Connect(-1, -1, wxEVT_UPDATE_THROBBER, func)
 
-class UpdateThrobberEvent(wx.PyEvent):
+class UpdateThrobberEvent(wxPyEvent):
     def __init__(self):
-        wx.PyEvent.__init__(self)
-        self.SetEventType(THROBBER_EVENT)
+        wxPyEvent.__init__(self)
+        self.SetEventType(wxEVT_UPDATE_THROBBER)
 
 # ------------------------------------------------------------------------------
 
-class Throbber(wx.Panel):
+class Throbber(wxPanel):
     """
     The first argument is either the name of a file that will be split into frames
     (a composite image) or a list of  strings of image names that will be treated
@@ -45,8 +46,8 @@ class Throbber(wx.Panel):
     """
     def __init__(self, parent, id,
                  bitmap,          # single (composite) bitmap or list of bitmaps
-                 pos = wx.DefaultPosition,
-                 size = wx.DefaultSize,
+                 pos = wxDefaultPosition,
+                 size = wxDefaultSize,
                  frameDelay = 0.1,# time between frames
                  frames = 0,      # number of frames (only necessary for composite image)
                  frameWidth = 0,  # width of each frame (only necessary for composite image)
@@ -55,10 +56,9 @@ class Throbber(wx.Panel):
                  reverse = 0,     # reverse direction at end of animation
                  style = 0,       # window style
                  name = "throbber"):
-        wx.Panel.__init__(self, parent, id, pos, size, style, name)
+        wxPanel.__init__(self, parent, id, pos, size, style, name)
         self.name = name
         self.label = label
-        self.running = (1 != 1)
         _seqTypes = (type([]), type(()))
 
         # set size, guessing if necessary
@@ -115,20 +115,18 @@ class Throbber(wx.Panel):
 
         self.SetClientSize((width, height))
 
-        timerID  = wx.NewId()
-        self.timer = wx.Timer(self, timerID)
-
+        EVT_PAINT(self, self.OnPaint)
         EVT_UPDATE_THROBBER(self, self.Rotate)
-        wx.EVT_PAINT(self, self.OnPaint)
-        wx.EVT_TIMER(self, timerID, self.OnTimer)
-        wx.EVT_WINDOW_DESTROY(self, self.OnDestroyWindow)
+        EVT_WINDOW_DESTROY(self, self.OnDestroyWindow)
 
-
-    def OnTimer(self, event):
-        wx.PostEvent(self, UpdateThrobberEvent())
+        self.event = threading.Event()
+        self.event.set() # we start out in the "resting" state
 
 
     def OnDestroyWindow(self, event):
+        # this is currently broken due to a bug in wxWindows... hopefully
+        # it'll be fixed soon.  Meanwhile be sure to explicitly call Stop()
+        # before the throbber is destroyed.
         self.Stop()
         event.Skip()
 
@@ -139,16 +137,27 @@ class Throbber(wx.Panel):
             dc.DrawBitmap(self.overlay, self.overlayX, self.overlayY, True)
         if self.label and self.showLabel:
             dc.DrawText(self.label, self.labelX, self.labelY)
-            dc.SetTextForeground(wx.WHITE)
+            dc.SetTextForeground(wxWHITE)
             dc.DrawText(self.label, self.labelX-1, self.labelY-1)
 
 
     def OnPaint(self, event):
-        self.Draw(wx.PaintDC(self))
+        self.Draw(wxPaintDC(self))
         event.Skip()
 
 
+    def UpdateThread(self):
+        try:
+            while hasattr(self, 'event') and not self.event.isSet():
+                wxPostEvent(self, UpdateThrobberEvent())
+                self.event.wait(self.frameDelay)
+        except wxPyDeadObjectError: # BUG: we were destroyed
+            return
+
+
     def Rotate(self, event):
+        if self.event.isSet():
+            return
         self.current += self.direction
         if self.current >= len(self.sequence):
             if self.autoReverse:
@@ -162,22 +171,22 @@ class Throbber(wx.Panel):
                 self.current = 1
             else:
                 self.current = len(self.sequence) - 1
-        self.Draw(wx.ClientDC(self))
+        self.Draw(wxClientDC(self))
 
 
     # --------- public methods ---------
     def SetFont(self, font):
         """Set the font for the label"""
-        wx.Panel.SetFont(self, font)
+        wxPanel.SetFont(self, font)
         self.SetLabel(self.label)
-        self.Draw(wx.ClientDC(self))
+        self.Draw(wxClientDC(self))
 
 
     def Rest(self):
         """Stop the animation and return to frame 0"""
         self.Stop()
         self.current = 0
-        self.Draw(wx.ClientDC(self))
+        self.Draw(wxClientDC(self))
 
 
     def Reverse(self):
@@ -187,29 +196,28 @@ class Throbber(wx.Panel):
 
     def Running(self):
         """Returns True if the animation is running"""
-        return self.running
+        return not self.event.isSet()
 
 
     def Start(self):
         """Start the animation"""
-        if not self.running:
-            self.running = not self.running
-            self.timer.Start(self.frameDelay * 1000)
+        if not self.Running():
+            self.event.clear()
+            thread = threading.Thread(target = self.UpdateThread,
+                                      name = "%s-thread" % self.name)
+            thread.start()
 
 
     def Stop(self):
         """Stop the animation"""
-        if self.running:
-            self.timer.Stop()
-            self.running = not self.running
+        if self.event.isSet():
+            return
+        self.event.set()
 
 
     def SetFrameDelay(self, frameDelay = 0.05):
         """Delay between each frame"""
         self.frameDelay = frameDelay
-        if self.running:
-            self.Stop()
-            self.Start()
 
 
     def ToggleOverlay(self, state = None):
@@ -218,7 +226,7 @@ class Throbber(wx.Panel):
             self.showOverlay = not self.showOverlay
         else:
             self.showOverlay = state
-        self.Draw(wx.ClientDC(self))
+        self.Draw(wxClientDC(self))
 
 
     def ToggleLabel(self, state = None):
@@ -227,7 +235,7 @@ class Throbber(wx.Panel):
             self.showLabel = not self.showLabel
         else:
             self.showLabel = state
-        self.Draw(wx.ClientDC(self))
+        self.Draw(wxClientDC(self))
 
 
     def SetLabel(self, label):
@@ -237,7 +245,7 @@ class Throbber(wx.Panel):
             extentX, extentY = self.GetTextExtent(label)
             self.labelX = (self.width - extentX)/2
             self.labelY = (self.height - extentY)/2
-        self.Draw(wx.ClientDC(self))
+        self.Draw(wxClientDC(self))