reSWIGged

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

diff --git a/wxPython/contrib/activex/activex_wrap.cpp b/wxPython/contrib/activex/activex_wrap.cpp
index 7a53c1a3fa87c5dd1e91c90e7f185a78b0d987b2..47062750ee8522f34428ac9d912a8da6fb45bd34 100644 (file)
--- a/wxPython/contrib/activex/activex_wrap.cpp
+++ b/wxPython/contrib/activex/activex_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/contrib/animate/mac/animate_wrap.cpp b/wxPython/contrib/animate/mac/animate_wrap.cpp
index 9c9a008dd4ad340518d68322d6acd90186e93120..62c8e3acd9a3d6b27a9096b0a3c240490ff89c3c 100644 (file)
--- a/wxPython/contrib/animate/mac/animate_wrap.cpp
+++ b/wxPython/contrib/animate/mac/animate_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/contrib/animate/msw/animate_wrap.cpp b/wxPython/contrib/animate/msw/animate_wrap.cpp
index ae429bbf4a8bc9c6947ffb710db3cdd42ed0f1aa..eb706b719ba0d063b1a2c33bfd1c73c13b4e8ecc 100644 (file)
--- a/wxPython/contrib/animate/msw/animate_wrap.cpp
+++ b/wxPython/contrib/animate/msw/animate_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
index 53fb2803fa31b22620d3760e5555c969a984b1f7..ede7518ad6bc13c81efb01a105efb57b37e25cac 100644 (file)
--- a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
+++ b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
index 0479e98f0e59ff150e6158cd8708cba41cf4e7da..c2af961191bd1c456de518ac4eecb3d282f18fcf 100644 (file)
--- a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
+++ b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp
index b11e400d5fa54af2e0e084e290ac20e0708e9fdd..4f6cc912765b7f7f025d0ef88e0257fc32367cc4 100644 (file)
--- a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp
+++ b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp
index 1219c4c6034793dd67b620191beffaf74a68fe7f..e591f961a13525868a768bac97cc44f828bff359 100644 (file)
--- a/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp
+++ b/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/contrib/stc/mac/stc.py b/wxPython/contrib/stc/mac/stc.py
index 481ac536fa8edfa084fadd531fd0b28f18a7c21d..9d8b41ca36ac3890e11ec950929ea428fc1731b9 100644 (file)
--- a/wxPython/contrib/stc/mac/stc.py
+++ b/wxPython/contrib/stc/mac/stc.py
@@ -1111,7 +1111,7 @@ class StyledTextCtrl(_core.Control):
     def Create(*args, **kwargs):
         """
         Create(self, Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     def Create(*args, **kwargs):
         """
         Create(self, Window parent, int id=ID_ANY, Point pos=DefaultPosition, 

-            Size size=DefaultSize, long style=0, String name=wxSTCNameStr)
+            Size size=DefaultSize, long style=0, String name=wxSTCNameStr) -> bool

         """
         return _stc.StyledTextCtrl_Create(*args, **kwargs)
 
         """
         return _stc.StyledTextCtrl_Create(*args, **kwargs)
 


@@ -2094,7 +2094,7 @@ class StyledTextCtrl(_core.Control):
         return _stc.StyledTextCtrl_GetUseVerticalScrollBar(*args, **kwargs)
 
     def AppendText(*args, **kwargs):
         return _stc.StyledTextCtrl_GetUseVerticalScrollBar(*args, **kwargs)
 
     def AppendText(*args, **kwargs):

-        """AppendText(self, int length, String text)"""
+        """AppendText(self, String text)"""

         return _stc.StyledTextCtrl_AppendText(*args, **kwargs)
 
     def GetTwoPhaseDraw(*args, **kwargs):
         return _stc.StyledTextCtrl_AppendText(*args, **kwargs)
 
     def GetTwoPhaseDraw(*args, **kwargs):


@@ -2848,6 +2848,42 @@ class StyledTextCtrl(_core.Control):
         """GetUseAntiAliasing(self) -> bool"""
         return _stc.StyledTextCtrl_GetUseAntiAliasing(*args, **kwargs)
 
         """GetUseAntiAliasing(self) -> bool"""
         return _stc.StyledTextCtrl_GetUseAntiAliasing(*args, **kwargs)
 

+    def AddTextRaw(*args, **kwargs):
+        """AddTextRaw(self, char text)"""
+        return _stc.StyledTextCtrl_AddTextRaw(*args, **kwargs)
+
+    def InsertTextRaw(*args, **kwargs):
+        """InsertTextRaw(self, int pos, char text)"""
+        return _stc.StyledTextCtrl_InsertTextRaw(*args, **kwargs)
+
+    def GetCurLineRaw(*args, **kwargs):
+        """GetCurLineRaw(self, int OUTPUT) -> wxCharBuffer"""
+        return _stc.StyledTextCtrl_GetCurLineRaw(*args, **kwargs)
+
+    def GetLineRaw(*args, **kwargs):
+        """GetLineRaw(self, int line) -> wxCharBuffer"""
+        return _stc.StyledTextCtrl_GetLineRaw(*args, **kwargs)
+
+    def GetSelectedTextRaw(*args, **kwargs):
+        """GetSelectedTextRaw(self) -> wxCharBuffer"""
+        return _stc.StyledTextCtrl_GetSelectedTextRaw(*args, **kwargs)
+
+    def GetTextRangeRaw(*args, **kwargs):
+        """GetTextRangeRaw(self, int startPos, int endPos) -> wxCharBuffer"""
+        return _stc.StyledTextCtrl_GetTextRangeRaw(*args, **kwargs)
+
+    def SetTextRaw(*args, **kwargs):
+        """SetTextRaw(self, char text)"""
+        return _stc.StyledTextCtrl_SetTextRaw(*args, **kwargs)
+
+    def GetTextRaw(*args, **kwargs):
+        """GetTextRaw(self) -> wxCharBuffer"""
+        return _stc.StyledTextCtrl_GetTextRaw(*args, **kwargs)
+
+    def AppendTextRaw(*args, **kwargs):
+        """AppendTextRaw(self, char text)"""
+        return _stc.StyledTextCtrl_AppendTextRaw(*args, **kwargs)
+

 
 class StyledTextCtrlPtr(StyledTextCtrl):
     def __init__(self, this):
 
 class StyledTextCtrlPtr(StyledTextCtrl):
     def __init__(self, this):

diff --git a/wxPython/contrib/stc/mac/stc_wrap.cpp b/wxPython/contrib/stc/mac/stc_wrap.cpp
index 6facc5b5117af404e8d1460aa1dbfd57905bc912..898088076d8c49436274641884c5b7fc1f1081c4 100644 (file)
--- a/wxPython/contrib/stc/mac/stc_wrap.cpp
+++ b/wxPython/contrib/stc/mac/stc_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   


@@ -1764,6 +1765,7 @@ static PyObject *_wrap_StyledTextCtrl_Create(PyObject *, PyObject *args, PyObjec
     long arg6 = (long) 0 ;
     wxString const &arg7_defvalue = wxSTCNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     long arg6 = (long) 0 ;
     wxString const &arg7_defvalue = wxSTCNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;

+    bool result;

     wxPoint temp4 ;
     wxSize temp5 ;
     bool temp7 = false ;
     wxPoint temp4 ;
     wxSize temp5 ;
     bool temp7 = false ;


@@ -1816,12 +1818,14 @@ static PyObject *_wrap_StyledTextCtrl_Create(PyObject *, PyObject *args, PyObjec
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7);
+        result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp7)
         delete arg7;
     {
         if (temp7)
         delete arg7;


@@ -9850,45 +9854,39 @@ static PyObject *_wrap_StyledTextCtrl_GetUseVerticalScrollBar(PyObject *, PyObje
 static PyObject *_wrap_StyledTextCtrl_AppendText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
 static PyObject *_wrap_StyledTextCtrl_AppendText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;

-    int arg2 ;
-    wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    wxString *arg2 = 0 ;
+    bool temp2 = false ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

-    PyObject * obj2 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self",(char *) "length",(char *) "text", NULL 
+        (char *) "self",(char *) "text", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_AppendText",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AppendText",kwnames,&obj0,&obj1)) goto fail;

     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {

-        arg2 = (int)(SWIG_As_int(obj1)); 
-        if (SWIG_arg_fail(2)) SWIG_fail;
-    }
-    {
-        arg3 = wxString_in_helper(obj2);
-        if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = true;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->AppendText(arg2,(wxString const &)*arg3);
+        (arg1)->AppendText((wxString const &)*arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
     {
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
     {

-        if (temp3)
-        delete arg3;
+        if (temp2)
+        delete arg2;

     }
     return resultobj;
     fail:
     {
     }
     return resultobj;
     fail:
     {

-        if (temp3)
-        delete arg3;
+        if (temp2)
+        delete arg2;

     }
     return NULL;
 }
     }
     return NULL;
 }


@@ -15314,6 +15312,296 @@ static PyObject *_wrap_StyledTextCtrl_GetUseAntiAliasing(PyObject *, PyObject *a
 }
 
 
 }
 
 

+static PyObject *_wrap_StyledTextCtrl_AddTextRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    char *arg2 = (char *) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "text", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AddTextRaw",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) {
+        SWIG_arg_fail(2);SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->AddTextRaw((char const *)arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_InsertTextRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    int arg2 ;
+    char *arg3 = (char *) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "pos",(char *) "text", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_InsertTextRaw",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) {
+        SWIG_arg_fail(3);SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->InsertTextRaw(arg2,(char const *)arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_GetCurLineRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    int *arg2 = (int *) 0 ;
+    wxCharBuffer result;
+    int temp2 ;
+    int res2 = 0 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetCurLineRaw",kwnames,&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (arg1)->GetCurLineRaw(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = PyString_FromString((char*)(&result)->data());
+    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_GetLineRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    int arg2 ;
+    wxCharBuffer result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "line", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetLineRaw",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (arg1)->GetLineRaw(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = PyString_FromString((char*)(&result)->data());
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_GetSelectedTextRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    wxCharBuffer result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetSelectedTextRaw",kwnames,&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (arg1)->GetSelectedTextRaw();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = PyString_FromString((char*)(&result)->data());
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_GetTextRangeRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    int arg2 ;
+    int arg3 ;
+    wxCharBuffer result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "startPos",(char *) "endPos", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_GetTextRangeRaw",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    {
+        arg3 = (int)(SWIG_As_int(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (arg1)->GetTextRangeRaw(arg2,arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = PyString_FromString((char*)(&result)->data());
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_SetTextRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    char *arg2 = (char *) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "text", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetTextRaw",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) {
+        SWIG_arg_fail(2);SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetTextRaw((char const *)arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_GetTextRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    wxCharBuffer result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetTextRaw",kwnames,&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (arg1)->GetTextRaw();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = PyString_FromString((char*)(&result)->data());
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_AppendTextRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    char *arg2 = (char *) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "text", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AppendTextRaw",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) {
+        SWIG_arg_fail(2);SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->AppendTextRaw((char const *)arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+

 static PyObject * StyledTextCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
 static PyObject * StyledTextCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;


@@ -17138,6 +17426,15 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"StyledTextCtrl_DoDropText", (PyCFunction) _wrap_StyledTextCtrl_DoDropText, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_SetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_SetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_GetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_GetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_DoDropText", (PyCFunction) _wrap_StyledTextCtrl_DoDropText, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_SetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_SetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_GetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_GetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"StyledTextCtrl_AddTextRaw", (PyCFunction) _wrap_StyledTextCtrl_AddTextRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_InsertTextRaw", (PyCFunction) _wrap_StyledTextCtrl_InsertTextRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_GetCurLineRaw", (PyCFunction) _wrap_StyledTextCtrl_GetCurLineRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_GetLineRaw", (PyCFunction) _wrap_StyledTextCtrl_GetLineRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_GetSelectedTextRaw", (PyCFunction) _wrap_StyledTextCtrl_GetSelectedTextRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_GetTextRangeRaw", (PyCFunction) _wrap_StyledTextCtrl_GetTextRangeRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_SetTextRaw", (PyCFunction) _wrap_StyledTextCtrl_SetTextRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_GetTextRaw", (PyCFunction) _wrap_StyledTextCtrl_GetTextRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_AppendTextRaw", (PyCFunction) _wrap_StyledTextCtrl_AppendTextRaw, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"StyledTextCtrl_swigregister", StyledTextCtrl_swigregister, METH_VARARGS, NULL},
         { (char *)"new_StyledTextEvent", (PyCFunction) _wrap_new_StyledTextEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_StyledTextEvent", (PyCFunction) _wrap_delete_StyledTextEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_swigregister", StyledTextCtrl_swigregister, METH_VARARGS, NULL},
         { (char *)"new_StyledTextEvent", (PyCFunction) _wrap_new_StyledTextEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_StyledTextEvent", (PyCFunction) _wrap_delete_StyledTextEvent, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/contrib/stc/msw/stc.py b/wxPython/contrib/stc/msw/stc.py
index 481ac536fa8edfa084fadd531fd0b28f18a7c21d..9d8b41ca36ac3890e11ec950929ea428fc1731b9 100644 (file)
--- a/wxPython/contrib/stc/msw/stc.py
+++ b/wxPython/contrib/stc/msw/stc.py
@@ -1111,7 +1111,7 @@ class StyledTextCtrl(_core.Control):
     def Create(*args, **kwargs):
         """
         Create(self, Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     def Create(*args, **kwargs):
         """
         Create(self, Window parent, int id=ID_ANY, Point pos=DefaultPosition, 

-            Size size=DefaultSize, long style=0, String name=wxSTCNameStr)
+            Size size=DefaultSize, long style=0, String name=wxSTCNameStr) -> bool

         """
         return _stc.StyledTextCtrl_Create(*args, **kwargs)
 
         """
         return _stc.StyledTextCtrl_Create(*args, **kwargs)
 


@@ -2094,7 +2094,7 @@ class StyledTextCtrl(_core.Control):
         return _stc.StyledTextCtrl_GetUseVerticalScrollBar(*args, **kwargs)
 
     def AppendText(*args, **kwargs):
         return _stc.StyledTextCtrl_GetUseVerticalScrollBar(*args, **kwargs)
 
     def AppendText(*args, **kwargs):

-        """AppendText(self, int length, String text)"""
+        """AppendText(self, String text)"""

         return _stc.StyledTextCtrl_AppendText(*args, **kwargs)
 
     def GetTwoPhaseDraw(*args, **kwargs):
         return _stc.StyledTextCtrl_AppendText(*args, **kwargs)
 
     def GetTwoPhaseDraw(*args, **kwargs):


@@ -2848,6 +2848,42 @@ class StyledTextCtrl(_core.Control):
         """GetUseAntiAliasing(self) -> bool"""
         return _stc.StyledTextCtrl_GetUseAntiAliasing(*args, **kwargs)
 
         """GetUseAntiAliasing(self) -> bool"""
         return _stc.StyledTextCtrl_GetUseAntiAliasing(*args, **kwargs)
 

+    def AddTextRaw(*args, **kwargs):
+        """AddTextRaw(self, char text)"""
+        return _stc.StyledTextCtrl_AddTextRaw(*args, **kwargs)
+
+    def InsertTextRaw(*args, **kwargs):
+        """InsertTextRaw(self, int pos, char text)"""
+        return _stc.StyledTextCtrl_InsertTextRaw(*args, **kwargs)
+
+    def GetCurLineRaw(*args, **kwargs):
+        """GetCurLineRaw(self, int OUTPUT) -> wxCharBuffer"""
+        return _stc.StyledTextCtrl_GetCurLineRaw(*args, **kwargs)
+
+    def GetLineRaw(*args, **kwargs):
+        """GetLineRaw(self, int line) -> wxCharBuffer"""
+        return _stc.StyledTextCtrl_GetLineRaw(*args, **kwargs)
+
+    def GetSelectedTextRaw(*args, **kwargs):
+        """GetSelectedTextRaw(self) -> wxCharBuffer"""
+        return _stc.StyledTextCtrl_GetSelectedTextRaw(*args, **kwargs)
+
+    def GetTextRangeRaw(*args, **kwargs):
+        """GetTextRangeRaw(self, int startPos, int endPos) -> wxCharBuffer"""
+        return _stc.StyledTextCtrl_GetTextRangeRaw(*args, **kwargs)
+
+    def SetTextRaw(*args, **kwargs):
+        """SetTextRaw(self, char text)"""
+        return _stc.StyledTextCtrl_SetTextRaw(*args, **kwargs)
+
+    def GetTextRaw(*args, **kwargs):
+        """GetTextRaw(self) -> wxCharBuffer"""
+        return _stc.StyledTextCtrl_GetTextRaw(*args, **kwargs)
+
+    def AppendTextRaw(*args, **kwargs):
+        """AppendTextRaw(self, char text)"""
+        return _stc.StyledTextCtrl_AppendTextRaw(*args, **kwargs)
+

 
 class StyledTextCtrlPtr(StyledTextCtrl):
     def __init__(self, this):
 
 class StyledTextCtrlPtr(StyledTextCtrl):
     def __init__(self, this):

diff --git a/wxPython/contrib/stc/msw/stc_wrap.cpp b/wxPython/contrib/stc/msw/stc_wrap.cpp
index 832196dfb8665710e1bdcfb62488507c2e77c490..3608dffdc90a11e59e38ee3ff38134dfae65f586 100644 (file)
--- a/wxPython/contrib/stc/msw/stc_wrap.cpp
+++ b/wxPython/contrib/stc/msw/stc_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   


@@ -1764,6 +1765,7 @@ static PyObject *_wrap_StyledTextCtrl_Create(PyObject *, PyObject *args, PyObjec
     long arg6 = (long) 0 ;
     wxString const &arg7_defvalue = wxSTCNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     long arg6 = (long) 0 ;
     wxString const &arg7_defvalue = wxSTCNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;

+    bool result;

     wxPoint temp4 ;
     wxSize temp5 ;
     bool temp7 = false ;
     wxPoint temp4 ;
     wxSize temp5 ;
     bool temp7 = false ;


@@ -1816,12 +1818,14 @@ static PyObject *_wrap_StyledTextCtrl_Create(PyObject *, PyObject *args, PyObjec
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7);
+        result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }

-    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }

     {
         if (temp7)
         delete arg7;
     {
         if (temp7)
         delete arg7;


@@ -9850,45 +9854,39 @@ static PyObject *_wrap_StyledTextCtrl_GetUseVerticalScrollBar(PyObject *, PyObje
 static PyObject *_wrap_StyledTextCtrl_AppendText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
 static PyObject *_wrap_StyledTextCtrl_AppendText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;

-    int arg2 ;
-    wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    wxString *arg2 = 0 ;
+    bool temp2 = false ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;

-    PyObject * obj2 = 0 ;

     char *kwnames[] = {
     char *kwnames[] = {

-        (char *) "self",(char *) "length",(char *) "text", NULL 
+        (char *) "self",(char *) "text", NULL 

     };
     
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_AppendText",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AppendText",kwnames,&obj0,&obj1)) goto fail;

     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {

-        arg2 = (int)(SWIG_As_int(obj1)); 
-        if (SWIG_arg_fail(2)) SWIG_fail;
-    }
-    {
-        arg3 = wxString_in_helper(obj2);
-        if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = true;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->AppendText(arg2,(wxString const &)*arg3);
+        (arg1)->AppendText((wxString const &)*arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
     {
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
     {

-        if (temp3)
-        delete arg3;
+        if (temp2)
+        delete arg2;

     }
     return resultobj;
     fail:
     {
     }
     return resultobj;
     fail:
     {

-        if (temp3)
-        delete arg3;
+        if (temp2)
+        delete arg2;

     }
     return NULL;
 }
     }
     return NULL;
 }


@@ -15314,6 +15312,296 @@ static PyObject *_wrap_StyledTextCtrl_GetUseAntiAliasing(PyObject *, PyObject *a
 }
 
 
 }
 
 

+static PyObject *_wrap_StyledTextCtrl_AddTextRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    char *arg2 = (char *) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "text", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AddTextRaw",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) {
+        SWIG_arg_fail(2);SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->AddTextRaw((char const *)arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_InsertTextRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    int arg2 ;
+    char *arg3 = (char *) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "pos",(char *) "text", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_InsertTextRaw",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) {
+        SWIG_arg_fail(3);SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->InsertTextRaw(arg2,(char const *)arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_GetCurLineRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    int *arg2 = (int *) 0 ;
+    wxCharBuffer result;
+    int temp2 ;
+    int res2 = 0 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetCurLineRaw",kwnames,&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (arg1)->GetCurLineRaw(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = PyString_FromString((char*)(&result)->data());
+    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_GetLineRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    int arg2 ;
+    wxCharBuffer result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "line", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetLineRaw",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (arg1)->GetLineRaw(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = PyString_FromString((char*)(&result)->data());
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_GetSelectedTextRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    wxCharBuffer result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetSelectedTextRaw",kwnames,&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (arg1)->GetSelectedTextRaw();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = PyString_FromString((char*)(&result)->data());
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_GetTextRangeRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    int arg2 ;
+    int arg3 ;
+    wxCharBuffer result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "startPos",(char *) "endPos", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_GetTextRangeRaw",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    {
+        arg3 = (int)(SWIG_As_int(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (arg1)->GetTextRangeRaw(arg2,arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = PyString_FromString((char*)(&result)->data());
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_SetTextRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    char *arg2 = (char *) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "text", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetTextRaw",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) {
+        SWIG_arg_fail(2);SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetTextRaw((char const *)arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_GetTextRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    wxCharBuffer result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetTextRaw",kwnames,&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (arg1)->GetTextRaw();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = PyString_FromString((char*)(&result)->data());
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_StyledTextCtrl_AppendTextRaw(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
+    char *arg2 = (char *) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "text", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AppendTextRaw",kwnames,&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxStyledTextCtrl, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    if (!SWIG_AsCharPtr(obj1, (char**)&arg2)) {
+        SWIG_arg_fail(2);SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->AppendTextRaw((char const *)arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+

 static PyObject * StyledTextCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
 static PyObject * StyledTextCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;


@@ -17138,6 +17426,15 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"StyledTextCtrl_DoDropText", (PyCFunction) _wrap_StyledTextCtrl_DoDropText, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_SetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_SetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_GetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_GetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_DoDropText", (PyCFunction) _wrap_StyledTextCtrl_DoDropText, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_SetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_SetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_GetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_GetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"StyledTextCtrl_AddTextRaw", (PyCFunction) _wrap_StyledTextCtrl_AddTextRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_InsertTextRaw", (PyCFunction) _wrap_StyledTextCtrl_InsertTextRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_GetCurLineRaw", (PyCFunction) _wrap_StyledTextCtrl_GetCurLineRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_GetLineRaw", (PyCFunction) _wrap_StyledTextCtrl_GetLineRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_GetSelectedTextRaw", (PyCFunction) _wrap_StyledTextCtrl_GetSelectedTextRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_GetTextRangeRaw", (PyCFunction) _wrap_StyledTextCtrl_GetTextRangeRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_SetTextRaw", (PyCFunction) _wrap_StyledTextCtrl_SetTextRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_GetTextRaw", (PyCFunction) _wrap_StyledTextCtrl_GetTextRaw, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_AppendTextRaw", (PyCFunction) _wrap_StyledTextCtrl_AppendTextRaw, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"StyledTextCtrl_swigregister", StyledTextCtrl_swigregister, METH_VARARGS, NULL},
         { (char *)"new_StyledTextEvent", (PyCFunction) _wrap_new_StyledTextEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_StyledTextEvent", (PyCFunction) _wrap_delete_StyledTextEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_swigregister", StyledTextCtrl_swigregister, METH_VARARGS, NULL},
         { (char *)"new_StyledTextEvent", (PyCFunction) _wrap_new_StyledTextEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"delete_StyledTextEvent", (PyCFunction) _wrap_delete_StyledTextEvent, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp
index 551f5a382820ea66a6c39a8071e0e30122369c03..d5959d4d2d73e7cad4e597ac53293b70a9b81950 100644 (file)
--- a/wxPython/src/mac/_controls_wrap.cpp
+++ b/wxPython/src/mac/_controls_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py
index ceb9755a86e57222d73812c342e95ceb92f5d69c..6d9ccebf8795565089b1dedaf671b60f9496fa8b 100644 (file)
--- a/wxPython/src/mac/_core.py
+++ b/wxPython/src/mac/_core.py
@@ -5691,11 +5691,9 @@ your Mac."""
         self._BootstrapApp()
 
 
         self._BootstrapApp()
 
 

-    def __del__(self):
-        try:
-            self.RestoreStdio()  # Just in case the MainLoop was overridden
-        finally:
-            wx.PyApp.__del__(self)
+    def __del__(self, destroy=wx.PyApp.__del__):
+        self.RestoreStdio()  # Just in case the MainLoop was overridden
+        destroy(self)

 
     def Destroy(self):
         wx.PyApp.Destroy(self)
 
     def Destroy(self):
         wx.PyApp.Destroy(self)


@@ -5724,7 +5722,10 @@ your Mac."""
 
 
     def RestoreStdio(self):
 
 
     def RestoreStdio(self):

-        _sys.stdout, _sys.stderr = self.saveStdio
+        try:
+            _sys.stdout, _sys.stderr = self.saveStdio
+        except:
+            pass

 
 
     def SetOutputWindowAttributes(self, title=None, pos=None, size=None):
 
 
     def SetOutputWindowAttributes(self, title=None, pos=None, size=None):

diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp
index bc374b41f37372134c3bc02afd097ab253ee89b4..88cb06f6931a6621149f0eea21857542b69607ef 100644 (file)
--- a/wxPython/src/mac/_core_wrap.cpp
+++ b/wxPython/src/mac/_core_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp
index 04a73f8729f1d81fb6debf74de59e4ae0580b0ec..7456895c53c8d2d585252f519a5efdb042625296 100644 (file)
--- a/wxPython/src/mac/_gdi_wrap.cpp
+++ b/wxPython/src/mac/_gdi_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp
index 026c59240c86d9c291990a5e9c3e44ca317ee2a2..7689111ac05983e392a63c9d4adadee7203b74d9 100644 (file)
--- a/wxPython/src/mac/_misc_wrap.cpp
+++ b/wxPython/src/mac/_misc_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp
index 3f1bc6c67cfadc64cdff2a1744d65c75c3952b70..37e22b4833c01645516364684e0e9360da20bb13 100644 (file)
--- a/wxPython/src/mac/_windows_wrap.cpp
+++ b/wxPython/src/mac/_windows_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/mac/calendar_wrap.cpp b/wxPython/src/mac/calendar_wrap.cpp
index 45d69abab5933a54504ea0905a4b5ec033c59685..2f1e3d24b9a7ed0feb47bae5acf3f8eacc93669c 100644 (file)
--- a/wxPython/src/mac/calendar_wrap.cpp
+++ b/wxPython/src/mac/calendar_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/mac/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp
index e38ab821c29e5490ab4a0f13d0652a460fad0355..febd80dfc007a25bbc1b436d1b57289c6d631333 100644 (file)
--- a/wxPython/src/mac/grid_wrap.cpp
+++ b/wxPython/src/mac/grid_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp
index d561a80f882a065f3d04ed2a1540e4cf6b2d5c05..0ddc1296173ba2863ccf1db1c1ac7f96ea3b6098 100644 (file)
--- a/wxPython/src/mac/html_wrap.cpp
+++ b/wxPython/src/mac/html_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/mac/media_wrap.cpp b/wxPython/src/mac/media_wrap.cpp
index 3757687f012f585431e30b6c95cc596ae125642b..ff571e4e12cc87f1ac175c35cf3dc7da1dcccc83 100644 (file)
--- a/wxPython/src/mac/media_wrap.cpp
+++ b/wxPython/src/mac/media_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/mac/webkit_wrap.cpp b/wxPython/src/mac/webkit_wrap.cpp
index 6927b2f5f23f2c4c775bc59c1df3f39fe3b88b7f..659a749ceafe8acbe40ad4bfb2ceb9093b6982b9 100644 (file)
--- a/wxPython/src/mac/webkit_wrap.cpp
+++ b/wxPython/src/mac/webkit_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/mac/wizard_wrap.cpp b/wxPython/src/mac/wizard_wrap.cpp
index 2e0e6cd348f971cb22b5b70365fc65b8f652f3ca..df538ba99e3988ea7cdad22463e3a5a7179ec460 100644 (file)
--- a/wxPython/src/mac/wizard_wrap.cpp
+++ b/wxPython/src/mac/wizard_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/mac/xrc_wrap.cpp b/wxPython/src/mac/xrc_wrap.cpp
index ef8ca47db08f9ef2e46b9ec452a0304758911151..c5e5990b95c57cb04e8c76414b1415a4e1ef91ce 100644 (file)
--- a/wxPython/src/mac/xrc_wrap.cpp
+++ b/wxPython/src/mac/xrc_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp
index 5c803a74ae084c294f16372d6289db46f558a5b9..479d15b971ece7219587ec7b1c7c56b5fc0e40fe 100644 (file)
--- a/wxPython/src/msw/_controls_wrap.cpp
+++ b/wxPython/src/msw/_controls_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py
index 231894d435e7a13c0ca2ca635ef4f4916f799968..64189b5da8449f005ccf612b87ef1d4afaff4363 100644 (file)
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -5691,11 +5691,9 @@ your Mac."""
         self._BootstrapApp()
 
 
         self._BootstrapApp()
 
 

-    def __del__(self):
-        try:
-            self.RestoreStdio()  # Just in case the MainLoop was overridden
-        finally:
-            wx.PyApp.__del__(self)
+    def __del__(self, destroy=wx.PyApp.__del__):
+        self.RestoreStdio()  # Just in case the MainLoop was overridden
+        destroy(self)

 
     def Destroy(self):
         wx.PyApp.Destroy(self)
 
     def Destroy(self):
         wx.PyApp.Destroy(self)


@@ -5724,7 +5722,10 @@ your Mac."""
 
 
     def RestoreStdio(self):
 
 
     def RestoreStdio(self):

-        _sys.stdout, _sys.stderr = self.saveStdio
+        try:
+            _sys.stdout, _sys.stderr = self.saveStdio
+        except:
+            pass

 
 
     def SetOutputWindowAttributes(self, title=None, pos=None, size=None):
 
 
     def SetOutputWindowAttributes(self, title=None, pos=None, size=None):

diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp
index f70e1ab64c9fdf2268e6c5e090f8fcc87a96ec59..e72e48bdb54839aaaea3edf36bcd6aa3e24ff030 100644 (file)
--- a/wxPython/src/msw/_core_wrap.cpp
+++ b/wxPython/src/msw/_core_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp
index f32ac6e86e10688849a177dfbb4bc94f0258698b..3de1de56eefe0133e2b15adeceffc51628c8feec 100644 (file)
--- a/wxPython/src/msw/_gdi_wrap.cpp
+++ b/wxPython/src/msw/_gdi_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp
index 5002d66339598921d862463597b98ade1958b382..f58232461cc65cd24e82febdd3255b3bf1adc937 100644 (file)
--- a/wxPython/src/msw/_misc_wrap.cpp
+++ b/wxPython/src/msw/_misc_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp
index 47e89bd55e1574da60065a0c6e859234373451c6..efe52bc572fcc9595a81b28ae7e2bc20741f6e1d 100644 (file)
--- a/wxPython/src/msw/_windows_wrap.cpp
+++ b/wxPython/src/msw/_windows_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/msw/calendar_wrap.cpp b/wxPython/src/msw/calendar_wrap.cpp
index 14e1248f674fb81745a008ccdffa27c453608a64..0afdad34fc2bd66b042ea848b8d2eedcc04f6d6e 100644 (file)
--- a/wxPython/src/msw/calendar_wrap.cpp
+++ b/wxPython/src/msw/calendar_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp
index 8e51aeb8c14d222892597b9f8ec3071573e6a39e..8e03991bad88a9780686780dbad38b697d83b8a1 100644 (file)
--- a/wxPython/src/msw/grid_wrap.cpp
+++ b/wxPython/src/msw/grid_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp
index 68e13af46e235a19cd89ea39a1bf0129d8e5fa90..11eb115304fa19f577aa53a7ee57b89928999c82 100644 (file)
--- a/wxPython/src/msw/html_wrap.cpp
+++ b/wxPython/src/msw/html_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/msw/media_wrap.cpp b/wxPython/src/msw/media_wrap.cpp
index 747ec17e34576503fcf6c3c690c2e3713801c5d1..9508a24630aa84a2103e72f5de39c5a7d51bc3e6 100644 (file)
--- a/wxPython/src/msw/media_wrap.cpp
+++ b/wxPython/src/msw/media_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/msw/webkit_wrap.cpp b/wxPython/src/msw/webkit_wrap.cpp
index c8d8d0c061e083cc98f0ca952a0ee123ab19013c..722dd84ce477da1bc00943fa729b872ac9fd4582 100644 (file)
--- a/wxPython/src/msw/webkit_wrap.cpp
+++ b/wxPython/src/msw/webkit_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/msw/wizard_wrap.cpp b/wxPython/src/msw/wizard_wrap.cpp
index 481e692a1d186f855c90c621ebca70cb8fdcdb27..b4a17d785b36a2d40731097e896523e04b6a2f3b 100644 (file)
--- a/wxPython/src/msw/wizard_wrap.cpp
+++ b/wxPython/src/msw/wizard_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }   

diff --git a/wxPython/src/msw/xrc_wrap.cpp b/wxPython/src/msw/xrc_wrap.cpp
index c0159f9434b4e141fbc13166ff72a3743d85f797..de198811ab77c7a3d2a16419b7cdb8fa5c4c2953 100644 (file)
--- a/wxPython/src/msw/xrc_wrap.cpp
+++ b/wxPython/src/msw/xrc_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }

-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);

        return;
       }
     }   
        return;
       }
     }