reSWIGged

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

diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py
index b4455dbbd33b8f38b46990d5679ba69bc4c4b68e..0673556338ee44c59e0d8b2ed9daf949c4ad1a79 100644 (file)
--- a/wxPython/src/gtk/_gdi.py
+++ b/wxPython/src/gtk/_gdi.py
@@ -439,6 +439,14 @@ class Brush(GDIObject):
         """
         return _gdi_.Brush_GetStipple(*args, **kwargs)
 
+    def IsHatch(*args, **kwargs):
+        """
+        IsHatch(self) -> bool
+
+        Is the current style a hatch type?
+        """
+        return _gdi_.Brush_IsHatch(*args, **kwargs)
+
     def Ok(*args, **kwargs):
         """
         Ok(self) -> bool

diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp
index 72546c2415f59d6ce6b1cb1f8a67ca8b4f5dfce1..108e91f0e94c0e863c977fd526545d1dd538ffdf 100644 (file)
--- a/wxPython/src/gtk/_gdi_wrap.cpp
+++ b/wxPython/src/gtk/_gdi_wrap.cpp
@@ -2696,6 +2696,34 @@ static PyObject *_wrap_Brush_GetStipple(PyObject *, PyObject *args, PyObject *kw
 }
 
 
+static PyObject *_wrap_Brush_IsHatch(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxBrush *arg1 = (wxBrush *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Brush_IsHatch",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)((wxBrush const *)arg1)->IsHatch();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_Brush_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
@@ -18585,6 +18613,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Brush_GetColour", (PyCFunction) _wrap_Brush_GetColour, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_GetStyle", (PyCFunction) _wrap_Brush_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_GetStipple", (PyCFunction) _wrap_Brush_GetStipple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_IsHatch", (PyCFunction) _wrap_Brush_IsHatch, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_Ok", (PyCFunction) _wrap_Brush_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_swigregister", Brush_swigregister, METH_VARARGS, NULL },
         { (char *)"new_Bitmap", (PyCFunction) _wrap_new_Bitmap, METH_VARARGS | METH_KEYWORDS, NULL },

diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py
index 5c779ab1b080dc033f7b2884c32359a1c74df683..b136b6030bc12ef0d4ec2fced3c74134379e479b 100644 (file)
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -2490,7 +2490,12 @@ ART_TIP = cvar.ART_TIP
 ART_REPORT_VIEW = cvar.ART_REPORT_VIEW
 ART_LIST_VIEW = cvar.ART_LIST_VIEW
 ART_NEW_DIR = cvar.ART_NEW_DIR
+ART_HARDDISK = cvar.ART_HARDDISK
+ART_FLOPPY = cvar.ART_FLOPPY
+ART_CDROM = cvar.ART_CDROM
+ART_REMOVABLE = cvar.ART_REMOVABLE
 ART_FOLDER = cvar.ART_FOLDER
+ART_FOLDER_OPEN = cvar.ART_FOLDER_OPEN
 ART_GO_DIR_UP = cvar.ART_GO_DIR_UP
 ART_EXECUTABLE_FILE = cvar.ART_EXECUTABLE_FILE
 ART_NORMAL_FILE = cvar.ART_NORMAL_FILE

diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp
index 8f0bcb56286f3598cf8998a893b42f58487081be..b9c499a917e7dbc15ca19892d1e2dc96cead1f1f 100644 (file)
--- a/wxPython/src/gtk/_misc_wrap.cpp
+++ b/wxPython/src/gtk/_misc_wrap.cpp
@@ -863,6 +863,99 @@ wxString Log_TimeStamp(){
             return msg;
         }
 void wxLog_Destroy(wxLog *self){ delete self; }
+// Make somce wrappers that double any % signs so they are 'escaped'
+    void wxPyLogFatalError(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogFatalError(m);
+    }
+    
+    void wxPyLogError(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogError(m);
+    }
+
+    void wxPyLogWarning(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogWarning(m);
+    }
+
+    void wxPyLogMessage(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogMessage(m);
+    }
+
+    void wxPyLogInfo(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogInfo(m);
+    }
+
+    void wxPyLogDebug(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogDebug(m);
+    }
+
+    void wxPyLogVerbose(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogVerbose(m);
+    }
+
+    void wxPyLogStatus(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogStatus(m);
+    }
+
+    void wxPyLogStatusFrame(wxFrame *pFrame, const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogStatus(pFrame, m);
+    }
+
+    void wxPyLogSysError(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogSysError(m);
+    }
+
+    void wxPyLogGeneric(unsigned long level, const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogGeneric(level, m);
+    }
+
+    void wxPyLogTrace(unsigned long mask, const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogTrace(mask, m);
+    }
+        
+    void wxPyLogTrace(const wxString& mask, const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogTrace(mask, m);
+    }
+    
+
 
 // A wxLog class that can be derived from in wxPython
 class wxPyLog : public wxLog {
@@ -1172,7 +1265,12 @@ PyObject *wxMimeTypesManager_EnumAllFileTypes(wxMimeTypesManager *self){
  static const wxString wxPyART_REPORT_VIEW(wxART_REPORT_VIEW); 
  static const wxString wxPyART_LIST_VIEW(wxART_LIST_VIEW); 
  static const wxString wxPyART_NEW_DIR(wxART_NEW_DIR); 
+ static const wxString wxPyART_HARDDISK(wxART_HARDDISK); 
+ static const wxString wxPyART_FLOPPY(wxART_FLOPPY); 
+ static const wxString wxPyART_CDROM(wxART_CDROM); 
+ static const wxString wxPyART_REMOVABLE(wxART_REMOVABLE); 
  static const wxString wxPyART_FOLDER(wxART_FOLDER); 
+ static const wxString wxPyART_FOLDER_OPEN(wxART_FOLDER_OPEN); 
  static const wxString wxPyART_GO_DIR_UP(wxART_GO_DIR_UP); 
  static const wxString wxPyART_EXECUTABLE_FILE(wxART_EXECUTABLE_FILE); 
  static const wxString wxPyART_NORMAL_FILE(wxART_NORMAL_FILE); 
@@ -8559,7 +8657,7 @@ static PyObject *_wrap_LogFatalError(PyObject *, PyObject *args, PyObject *kwarg
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogFatalError((wxString const &)*arg1);
+        wxPyLogFatalError((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8596,7 +8694,7 @@ static PyObject *_wrap_LogError(PyObject *, PyObject *args, PyObject *kwargs) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogError((wxString const &)*arg1);
+        wxPyLogError((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8633,7 +8731,7 @@ static PyObject *_wrap_LogWarning(PyObject *, PyObject *args, PyObject *kwargs)
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogWarning((wxString const &)*arg1);
+        wxPyLogWarning((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8670,7 +8768,7 @@ static PyObject *_wrap_LogMessage(PyObject *, PyObject *args, PyObject *kwargs)
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogMessage((wxString const &)*arg1);
+        wxPyLogMessage((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8707,7 +8805,7 @@ static PyObject *_wrap_LogInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogInfo((wxString const &)*arg1);
+        wxPyLogInfo((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8744,7 +8842,7 @@ static PyObject *_wrap_LogDebug(PyObject *, PyObject *args, PyObject *kwargs) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogDebug((wxString const &)*arg1);
+        wxPyLogDebug((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8781,7 +8879,7 @@ static PyObject *_wrap_LogVerbose(PyObject *, PyObject *args, PyObject *kwargs)
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogVerbose((wxString const &)*arg1);
+        wxPyLogVerbose((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8818,7 +8916,7 @@ static PyObject *_wrap_LogStatus(PyObject *, PyObject *args, PyObject *kwargs) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogStatus((wxString const &)*arg1);
+        wxPyLogStatus((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8859,7 +8957,7 @@ static PyObject *_wrap_LogStatusFrame(PyObject *, PyObject *args, PyObject *kwar
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogStatus(arg1,(wxString const &)*arg2);
+        wxPyLogStatusFrame(arg1,(wxString const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8896,7 +8994,7 @@ static PyObject *_wrap_LogSysError(PyObject *, PyObject *args, PyObject *kwargs)
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogSysError((wxString const &)*arg1);
+        wxPyLogSysError((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8916,6 +9014,47 @@ static PyObject *_wrap_LogSysError(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
+static PyObject *_wrap_LogGeneric(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    unsigned long arg1 ;
+    wxString *arg2 = 0 ;
+    bool temp2 = false ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "level",(char *) "msg", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogGeneric",kwnames,&obj0,&obj1)) goto fail;
+    arg1 = (unsigned long)SWIG_As_unsigned_SS_long(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = true;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxPyLogGeneric(arg1,(wxString const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (temp2)
+        delete arg2;
+    }
+    return resultobj;
+    fail:
+    {
+        if (temp2)
+        delete arg2;
+    }
+    return NULL;
+}
+
+
 static PyObject *_wrap_LogTrace__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     unsigned long arg1 ;
@@ -8934,7 +9073,7 @@ static PyObject *_wrap_LogTrace__SWIG_0(PyObject *, PyObject *args) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogTrace(arg1,(wxString const &)*arg2);
+        wxPyLogTrace(arg1,(wxString const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8976,7 +9115,7 @@ static PyObject *_wrap_LogTrace__SWIG_1(PyObject *, PyObject *args) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogTrace((wxString const &)*arg1,(wxString const &)*arg2);
+        wxPyLogTrace((wxString const &)*arg1,(wxString const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -9045,47 +9184,6 @@ static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_LogGeneric(PyObject *, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    unsigned long arg1 ;
-    wxString *arg2 = 0 ;
-    bool temp2 = false ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "level",(char *) "msg", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogGeneric",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (unsigned long)SWIG_As_unsigned_SS_long(obj0); 
-    if (PyErr_Occurred()) SWIG_fail;
-    {
-        arg2 = wxString_in_helper(obj1);
-        if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogGeneric(arg1,(wxString const &)*arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        if (temp2)
-        delete arg2;
-    }
-    return resultobj;
-    fail:
-    {
-        if (temp2)
-        delete arg2;
-    }
-    return NULL;
-}
-
-
 static PyObject *_wrap_SafeShowMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
@@ -14498,6 +14596,86 @@ static PyObject *_wrap_ART_NEW_DIR_get() {
 }
 
 
+static int _wrap_ART_HARDDISK_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_HARDDISK is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_HARDDISK_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_HARDDISK)->c_str(), (&wxPyART_HARDDISK)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_HARDDISK)->c_str(), (&wxPyART_HARDDISK)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
+static int _wrap_ART_FLOPPY_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_FLOPPY is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_FLOPPY_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_FLOPPY)->c_str(), (&wxPyART_FLOPPY)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_FLOPPY)->c_str(), (&wxPyART_FLOPPY)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
+static int _wrap_ART_CDROM_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_CDROM is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_CDROM_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_CDROM)->c_str(), (&wxPyART_CDROM)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_CDROM)->c_str(), (&wxPyART_CDROM)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
+static int _wrap_ART_REMOVABLE_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_REMOVABLE is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_REMOVABLE_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_REMOVABLE)->c_str(), (&wxPyART_REMOVABLE)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_REMOVABLE)->c_str(), (&wxPyART_REMOVABLE)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
 static int _wrap_ART_FOLDER_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_FOLDER is read-only.");
     return 1;
@@ -14518,6 +14696,26 @@ static PyObject *_wrap_ART_FOLDER_get() {
 }
 
 
+static int _wrap_ART_FOLDER_OPEN_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_FOLDER_OPEN is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_FOLDER_OPEN_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_FOLDER_OPEN)->c_str(), (&wxPyART_FOLDER_OPEN)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_FOLDER_OPEN)->c_str(), (&wxPyART_FOLDER_OPEN)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
 static int _wrap_ART_GO_DIR_UP_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_GO_DIR_UP is read-only.");
     return 1;
@@ -29093,8 +29291,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"LogStatus", (PyCFunction) _wrap_LogStatus, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"LogStatusFrame", (PyCFunction) _wrap_LogStatusFrame, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"LogSysError", (PyCFunction) _wrap_LogSysError, METH_VARARGS | METH_KEYWORDS, NULL },
-        { (char *)"LogTrace", _wrap_LogTrace, METH_VARARGS, NULL },
         { (char *)"LogGeneric", (PyCFunction) _wrap_LogGeneric, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogTrace", _wrap_LogTrace, METH_VARARGS, NULL },
         { (char *)"SafeShowMessage", (PyCFunction) _wrap_SafeShowMessage, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"new_LogNull", (PyCFunction) _wrap_new_LogNull, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"delete_LogNull", (PyCFunction) _wrap_delete_LogNull, METH_VARARGS | METH_KEYWORDS, NULL },
@@ -30599,7 +30797,12 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"ART_REPORT_VIEW",_wrap_ART_REPORT_VIEW_get, _wrap_ART_REPORT_VIEW_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_LIST_VIEW",_wrap_ART_LIST_VIEW_get, _wrap_ART_LIST_VIEW_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_NEW_DIR",_wrap_ART_NEW_DIR_get, _wrap_ART_NEW_DIR_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_HARDDISK",_wrap_ART_HARDDISK_get, _wrap_ART_HARDDISK_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_FLOPPY",_wrap_ART_FLOPPY_get, _wrap_ART_FLOPPY_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_CDROM",_wrap_ART_CDROM_get, _wrap_ART_CDROM_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_REMOVABLE",_wrap_ART_REMOVABLE_get, _wrap_ART_REMOVABLE_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_FOLDER",_wrap_ART_FOLDER_get, _wrap_ART_FOLDER_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_FOLDER_OPEN",_wrap_ART_FOLDER_OPEN_get, _wrap_ART_FOLDER_OPEN_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_GO_DIR_UP",_wrap_ART_GO_DIR_UP_get, _wrap_ART_GO_DIR_UP_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_EXECUTABLE_FILE",_wrap_ART_EXECUTABLE_FILE_get, _wrap_ART_EXECUTABLE_FILE_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_NORMAL_FILE",_wrap_ART_NORMAL_FILE_get, _wrap_ART_NORMAL_FILE_set);

diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py
index a5f4bb9bbd29223bf7e18b550375f94691817773..aa45347a9411e409ab5f408cd238d65fe5d59d30 100644 (file)
--- a/wxPython/src/gtk/html.py
+++ b/wxPython/src/gtk/html.py
@@ -1201,7 +1201,7 @@ class HtmlDCRenderer(_core.Object):
 
     def Render(*args, **kwargs):
         """
-        Render(self, int x, int y, int from=0, int dont_render=False, int to=INT_MAX, 
+        Render(self, int x, int y, int from=0, int dont_render=False, int maxHeight=INT_MAX, 
             int choices=None, int LCOUNT=0) -> int
         """
         return _html.HtmlDCRenderer_Render(*args, **kwargs)

diff --git a/wxPython/src/gtk/html_wrap.cpp b/wxPython/src/gtk/html_wrap.cpp
index abfbd6303af4d78f1fc2225d9fd7acaebc41f8f7..b7b2d49bbf7a204c8ccb4f7c142316839c4843bf 100644 (file)
--- a/wxPython/src/gtk/html_wrap.cpp
+++ b/wxPython/src/gtk/html_wrap.cpp
@@ -7851,7 +7851,7 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *, PyObject *args, PyObjec
     PyObject * obj6 = 0 ;
     PyObject * obj7 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "x",(char *) "y",(char *) "from",(char *) "dont_render",(char *) "to",(char *) "choices",(char *) "LCOUNT", NULL 
+        (char *) "self",(char *) "x",(char *) "y",(char *) "from",(char *) "dont_render",(char *) "maxHeight",(char *) "choices",(char *) "LCOUNT", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:HtmlDCRenderer_Render",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;

diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py
index 33763328f9b2a6126abbcf9e871232dfdcabae04..2fc41643744ad77a16269aa4cac91c42ad72daf5 100644 (file)
--- a/wxPython/src/mac/_gdi.py
+++ b/wxPython/src/mac/_gdi.py
@@ -435,6 +435,14 @@ class Brush(GDIObject):
         """
         return _gdi_.Brush_GetStipple(*args, **kwargs)
 
+    def IsHatch(*args, **kwargs):
+        """
+        IsHatch(self) -> bool
+
+        Is the current style a hatch type?
+        """
+        return _gdi_.Brush_IsHatch(*args, **kwargs)
+
     def Ok(*args, **kwargs):
         """
         Ok(self) -> bool

diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp
index 61b165c76dbc6503e66d156dbd5a13ae9514eea7..41e55a5bd7f76bcc245a508059096be5bdd550cb 100644 (file)
--- a/wxPython/src/mac/_gdi_wrap.cpp
+++ b/wxPython/src/mac/_gdi_wrap.cpp
@@ -2694,6 +2694,34 @@ static PyObject *_wrap_Brush_GetStipple(PyObject *, PyObject *args, PyObject *kw
 }
 
 
+static PyObject *_wrap_Brush_IsHatch(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxBrush *arg1 = (wxBrush *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Brush_IsHatch",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)((wxBrush const *)arg1)->IsHatch();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_Brush_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
@@ -18790,6 +18818,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Brush_GetColour", (PyCFunction) _wrap_Brush_GetColour, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_GetStyle", (PyCFunction) _wrap_Brush_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_GetStipple", (PyCFunction) _wrap_Brush_GetStipple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_IsHatch", (PyCFunction) _wrap_Brush_IsHatch, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_Ok", (PyCFunction) _wrap_Brush_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_MacGetTheme", (PyCFunction) _wrap_Brush_MacGetTheme, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_MacSetTheme", (PyCFunction) _wrap_Brush_MacSetTheme, METH_VARARGS | METH_KEYWORDS, NULL },

diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py
index 4b6264d50af1b1ecc59b5dabcf663384236df8b7..8c815d6d3b4c4b4fafdf2af7ba57b46bbc1a4e33 100644 (file)
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -2490,7 +2490,12 @@ ART_TIP = cvar.ART_TIP
 ART_REPORT_VIEW = cvar.ART_REPORT_VIEW
 ART_LIST_VIEW = cvar.ART_LIST_VIEW
 ART_NEW_DIR = cvar.ART_NEW_DIR
+ART_HARDDISK = cvar.ART_HARDDISK
+ART_FLOPPY = cvar.ART_FLOPPY
+ART_CDROM = cvar.ART_CDROM
+ART_REMOVABLE = cvar.ART_REMOVABLE
 ART_FOLDER = cvar.ART_FOLDER
+ART_FOLDER_OPEN = cvar.ART_FOLDER_OPEN
 ART_GO_DIR_UP = cvar.ART_GO_DIR_UP
 ART_EXECUTABLE_FILE = cvar.ART_EXECUTABLE_FILE
 ART_NORMAL_FILE = cvar.ART_NORMAL_FILE

diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp
index d686bbd0c97c9ebd0ced4beb8e1c7ef259419a6a..a2dfb345f4bd350a010816ba5bdd3d048687eef0 100644 (file)
--- a/wxPython/src/mac/_misc_wrap.cpp
+++ b/wxPython/src/mac/_misc_wrap.cpp
@@ -857,6 +857,99 @@ wxString Log_TimeStamp(){
             return msg;
         }
 void wxLog_Destroy(wxLog *self){ delete self; }
+// Make somce wrappers that double any % signs so they are 'escaped'
+    void wxPyLogFatalError(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogFatalError(m);
+    }
+    
+    void wxPyLogError(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogError(m);
+    }
+
+    void wxPyLogWarning(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogWarning(m);
+    }
+
+    void wxPyLogMessage(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogMessage(m);
+    }
+
+    void wxPyLogInfo(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogInfo(m);
+    }
+
+    void wxPyLogDebug(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogDebug(m);
+    }
+
+    void wxPyLogVerbose(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogVerbose(m);
+    }
+
+    void wxPyLogStatus(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogStatus(m);
+    }
+
+    void wxPyLogStatusFrame(wxFrame *pFrame, const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogStatus(pFrame, m);
+    }
+
+    void wxPyLogSysError(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogSysError(m);
+    }
+
+    void wxPyLogGeneric(unsigned long level, const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogGeneric(level, m);
+    }
+
+    void wxPyLogTrace(unsigned long mask, const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogTrace(mask, m);
+    }
+        
+    void wxPyLogTrace(const wxString& mask, const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogTrace(mask, m);
+    }
+    
+
 
 // A wxLog class that can be derived from in wxPython
 class wxPyLog : public wxLog {
@@ -1167,7 +1260,12 @@ PyObject *wxMimeTypesManager_EnumAllFileTypes(wxMimeTypesManager *self){
  static const wxString wxPyART_REPORT_VIEW(wxART_REPORT_VIEW); 
  static const wxString wxPyART_LIST_VIEW(wxART_LIST_VIEW); 
  static const wxString wxPyART_NEW_DIR(wxART_NEW_DIR); 
+ static const wxString wxPyART_HARDDISK(wxART_HARDDISK); 
+ static const wxString wxPyART_FLOPPY(wxART_FLOPPY); 
+ static const wxString wxPyART_CDROM(wxART_CDROM); 
+ static const wxString wxPyART_REMOVABLE(wxART_REMOVABLE); 
  static const wxString wxPyART_FOLDER(wxART_FOLDER); 
+ static const wxString wxPyART_FOLDER_OPEN(wxART_FOLDER_OPEN); 
  static const wxString wxPyART_GO_DIR_UP(wxART_GO_DIR_UP); 
  static const wxString wxPyART_EXECUTABLE_FILE(wxART_EXECUTABLE_FILE); 
  static const wxString wxPyART_NORMAL_FILE(wxART_NORMAL_FILE); 
@@ -8552,7 +8650,7 @@ static PyObject *_wrap_LogFatalError(PyObject *, PyObject *args, PyObject *kwarg
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogFatalError((wxString const &)*arg1);
+        wxPyLogFatalError((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8589,7 +8687,7 @@ static PyObject *_wrap_LogError(PyObject *, PyObject *args, PyObject *kwargs) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogError((wxString const &)*arg1);
+        wxPyLogError((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8626,7 +8724,7 @@ static PyObject *_wrap_LogWarning(PyObject *, PyObject *args, PyObject *kwargs)
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogWarning((wxString const &)*arg1);
+        wxPyLogWarning((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8663,7 +8761,7 @@ static PyObject *_wrap_LogMessage(PyObject *, PyObject *args, PyObject *kwargs)
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogMessage((wxString const &)*arg1);
+        wxPyLogMessage((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8700,7 +8798,7 @@ static PyObject *_wrap_LogInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogInfo((wxString const &)*arg1);
+        wxPyLogInfo((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8737,7 +8835,7 @@ static PyObject *_wrap_LogDebug(PyObject *, PyObject *args, PyObject *kwargs) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogDebug((wxString const &)*arg1);
+        wxPyLogDebug((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8774,7 +8872,7 @@ static PyObject *_wrap_LogVerbose(PyObject *, PyObject *args, PyObject *kwargs)
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogVerbose((wxString const &)*arg1);
+        wxPyLogVerbose((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8811,7 +8909,7 @@ static PyObject *_wrap_LogStatus(PyObject *, PyObject *args, PyObject *kwargs) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogStatus((wxString const &)*arg1);
+        wxPyLogStatus((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8852,7 +8950,7 @@ static PyObject *_wrap_LogStatusFrame(PyObject *, PyObject *args, PyObject *kwar
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogStatus(arg1,(wxString const &)*arg2);
+        wxPyLogStatusFrame(arg1,(wxString const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8889,7 +8987,7 @@ static PyObject *_wrap_LogSysError(PyObject *, PyObject *args, PyObject *kwargs)
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogSysError((wxString const &)*arg1);
+        wxPyLogSysError((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8909,6 +9007,47 @@ static PyObject *_wrap_LogSysError(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
+static PyObject *_wrap_LogGeneric(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    unsigned long arg1 ;
+    wxString *arg2 = 0 ;
+    bool temp2 = false ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "level",(char *) "msg", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogGeneric",kwnames,&obj0,&obj1)) goto fail;
+    arg1 = (unsigned long)SWIG_As_unsigned_SS_long(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = true;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxPyLogGeneric(arg1,(wxString const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (temp2)
+        delete arg2;
+    }
+    return resultobj;
+    fail:
+    {
+        if (temp2)
+        delete arg2;
+    }
+    return NULL;
+}
+
+
 static PyObject *_wrap_LogTrace__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     unsigned long arg1 ;
@@ -8927,7 +9066,7 @@ static PyObject *_wrap_LogTrace__SWIG_0(PyObject *, PyObject *args) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogTrace(arg1,(wxString const &)*arg2);
+        wxPyLogTrace(arg1,(wxString const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8969,7 +9108,7 @@ static PyObject *_wrap_LogTrace__SWIG_1(PyObject *, PyObject *args) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogTrace((wxString const &)*arg1,(wxString const &)*arg2);
+        wxPyLogTrace((wxString const &)*arg1,(wxString const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -9038,47 +9177,6 @@ static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_LogGeneric(PyObject *, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    unsigned long arg1 ;
-    wxString *arg2 = 0 ;
-    bool temp2 = false ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "level",(char *) "msg", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogGeneric",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (unsigned long)SWIG_As_unsigned_SS_long(obj0); 
-    if (PyErr_Occurred()) SWIG_fail;
-    {
-        arg2 = wxString_in_helper(obj1);
-        if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogGeneric(arg1,(wxString const &)*arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        if (temp2)
-        delete arg2;
-    }
-    return resultobj;
-    fail:
-    {
-        if (temp2)
-        delete arg2;
-    }
-    return NULL;
-}
-
-
 static PyObject *_wrap_SafeShowMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
@@ -14491,6 +14589,86 @@ static PyObject *_wrap_ART_NEW_DIR_get() {
 }
 
 
+static int _wrap_ART_HARDDISK_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_HARDDISK is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_HARDDISK_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_HARDDISK)->c_str(), (&wxPyART_HARDDISK)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_HARDDISK)->c_str(), (&wxPyART_HARDDISK)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
+static int _wrap_ART_FLOPPY_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_FLOPPY is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_FLOPPY_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_FLOPPY)->c_str(), (&wxPyART_FLOPPY)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_FLOPPY)->c_str(), (&wxPyART_FLOPPY)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
+static int _wrap_ART_CDROM_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_CDROM is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_CDROM_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_CDROM)->c_str(), (&wxPyART_CDROM)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_CDROM)->c_str(), (&wxPyART_CDROM)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
+static int _wrap_ART_REMOVABLE_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_REMOVABLE is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_REMOVABLE_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_REMOVABLE)->c_str(), (&wxPyART_REMOVABLE)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_REMOVABLE)->c_str(), (&wxPyART_REMOVABLE)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
 static int _wrap_ART_FOLDER_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_FOLDER is read-only.");
     return 1;
@@ -14511,6 +14689,26 @@ static PyObject *_wrap_ART_FOLDER_get() {
 }
 
 
+static int _wrap_ART_FOLDER_OPEN_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_FOLDER_OPEN is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_FOLDER_OPEN_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_FOLDER_OPEN)->c_str(), (&wxPyART_FOLDER_OPEN)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_FOLDER_OPEN)->c_str(), (&wxPyART_FOLDER_OPEN)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
 static int _wrap_ART_GO_DIR_UP_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_GO_DIR_UP is read-only.");
     return 1;
@@ -29150,8 +29348,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"LogStatus", (PyCFunction) _wrap_LogStatus, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"LogStatusFrame", (PyCFunction) _wrap_LogStatusFrame, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"LogSysError", (PyCFunction) _wrap_LogSysError, METH_VARARGS | METH_KEYWORDS, NULL },
-        { (char *)"LogTrace", _wrap_LogTrace, METH_VARARGS, NULL },
         { (char *)"LogGeneric", (PyCFunction) _wrap_LogGeneric, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogTrace", _wrap_LogTrace, METH_VARARGS, NULL },
         { (char *)"SafeShowMessage", (PyCFunction) _wrap_SafeShowMessage, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"new_LogNull", (PyCFunction) _wrap_new_LogNull, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"delete_LogNull", (PyCFunction) _wrap_delete_LogNull, METH_VARARGS | METH_KEYWORDS, NULL },
@@ -30660,7 +30858,12 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"ART_REPORT_VIEW",_wrap_ART_REPORT_VIEW_get, _wrap_ART_REPORT_VIEW_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_LIST_VIEW",_wrap_ART_LIST_VIEW_get, _wrap_ART_LIST_VIEW_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_NEW_DIR",_wrap_ART_NEW_DIR_get, _wrap_ART_NEW_DIR_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_HARDDISK",_wrap_ART_HARDDISK_get, _wrap_ART_HARDDISK_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_FLOPPY",_wrap_ART_FLOPPY_get, _wrap_ART_FLOPPY_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_CDROM",_wrap_ART_CDROM_get, _wrap_ART_CDROM_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_REMOVABLE",_wrap_ART_REMOVABLE_get, _wrap_ART_REMOVABLE_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_FOLDER",_wrap_ART_FOLDER_get, _wrap_ART_FOLDER_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_FOLDER_OPEN",_wrap_ART_FOLDER_OPEN_get, _wrap_ART_FOLDER_OPEN_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_GO_DIR_UP",_wrap_ART_GO_DIR_UP_get, _wrap_ART_GO_DIR_UP_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_EXECUTABLE_FILE",_wrap_ART_EXECUTABLE_FILE_get, _wrap_ART_EXECUTABLE_FILE_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_NORMAL_FILE",_wrap_ART_NORMAL_FILE_get, _wrap_ART_NORMAL_FILE_set);

diff --git a/wxPython/src/mac/html.py b/wxPython/src/mac/html.py
index a5f4bb9bbd29223bf7e18b550375f94691817773..aa45347a9411e409ab5f408cd238d65fe5d59d30 100644 (file)
--- a/wxPython/src/mac/html.py
+++ b/wxPython/src/mac/html.py
@@ -1201,7 +1201,7 @@ class HtmlDCRenderer(_core.Object):
 
     def Render(*args, **kwargs):
         """
-        Render(self, int x, int y, int from=0, int dont_render=False, int to=INT_MAX, 
+        Render(self, int x, int y, int from=0, int dont_render=False, int maxHeight=INT_MAX, 
             int choices=None, int LCOUNT=0) -> int
         """
         return _html.HtmlDCRenderer_Render(*args, **kwargs)

diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp
index 98319d965e2dd34616515a61f7bb58f064a56b6b..0983d3d1b778ff1b8de684d421f0186e3799f6ba 100644 (file)
--- a/wxPython/src/mac/html_wrap.cpp
+++ b/wxPython/src/mac/html_wrap.cpp
@@ -7851,7 +7851,7 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *, PyObject *args, PyObjec
     PyObject * obj6 = 0 ;
     PyObject * obj7 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "x",(char *) "y",(char *) "from",(char *) "dont_render",(char *) "to",(char *) "choices",(char *) "LCOUNT", NULL 
+        (char *) "self",(char *) "x",(char *) "y",(char *) "from",(char *) "dont_render",(char *) "maxHeight",(char *) "choices",(char *) "LCOUNT", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:HtmlDCRenderer_Render",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;

diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py
index 95b0ca122d6e00dedf3657c1a121ec1806fc44b3..826df2a570d0456c9b521008144b9aa4f8dad1c9 100644 (file)
--- a/wxPython/src/msw/_controls.py
+++ b/wxPython/src/msw/_controls.py
@@ -664,6 +664,15 @@ class ComboBox(Choice):
         """
         return _controls_.ComboBox_SetMark(*args, **kwargs)
 
+    def GetMark(*args, **kwargs):
+        """
+        GetMark(self) -> (from, to)
+
+        Gets the positions of the begining and ending of the selection mark in
+        the combobox text field.
+        """
+        return _controls_.ComboBox_GetMark(*args, **kwargs)
+
     def SetStringSelection(*args, **kwargs):
         """
         SetStringSelection(self, String string) -> bool

diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp
index 41d7aef2d34e4625f22a4abea3acf4101408bf2a..b205686c7e917d52faede0bd243b0b257c40108b 100644 (file)
--- a/wxPython/src/msw/_controls_wrap.cpp
+++ b/wxPython/src/msw/_controls_wrap.cpp
@@ -547,6 +547,34 @@ SWIG_Check_bool(PyObject* obj)
 
  static const wxString wxPyChoiceNameStr(wxChoiceNameStr); 
  static const wxString wxPyComboBoxNameStr(wxComboBoxNameStr); 
+
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+    PyObject*   o2;
+    PyObject*   o3;
+    
+    if (!target) {                   
+        target = o;
+    } else if (target == Py_None) {  
+        Py_DECREF(Py_None);
+        target = o;
+    } else {
+        if (!PyTuple_Check(target)) {
+            o2 = target;
+            target = PyTuple_New(1);
+            PyTuple_SetItem(target, 0, o2);
+        }            
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      
+
+        o2 = target;
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      
+        Py_DECREF(o3);
+    }
+    return target;
+  }
+
+
  static const wxString wxPyGaugeNameStr(wxGaugeNameStr); 
  static const wxString wxPyStaticBitmapNameStr(wxStaticBitmapNameStr); 
  static const wxString wxPyStaticBoxNameStr(wxStaticBoxNameStr); 
@@ -592,34 +620,6 @@ void wxListBox_SetItemFont(wxListBox *self,int item,wxFont const &f){
         }
  static const wxString wxPyTextCtrlNameStr(wxTextCtrlNameStr); 
 
-  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
-    PyObject*   o2;
-    PyObject*   o3;
-    
-    if (!target) {                   
-        target = o;
-    } else if (target == Py_None) {  
-        Py_DECREF(Py_None);
-        target = o;
-    } else {
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }            
-        o3 = PyTuple_New(1);            
-        PyTuple_SetItem(o3, 0, o);      
-
-        o2 = target;
-        target = PySequence_Concat(o2, o3); 
-        Py_DECREF(o2);                      
-        Py_DECREF(o3);
-    }
-    return target;
-  }
-
-
-
 // See my_fragments.i
 SWIGSTATICINLINE(int)
 SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
@@ -3721,6 +3721,43 @@ static PyObject *_wrap_ComboBox_SetMark(PyObject *, PyObject *args, PyObject *kw
 }
 
 
+static PyObject *_wrap_ComboBox_GetMark(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxComboBox *arg1 = (wxComboBox *) 0 ;
+    long *arg2 = (long *) 0 ;
+    long *arg3 = (long *) 0 ;
+    long temp2 ;
+    int res2 = 0 ;
+    long temp3 ;
+    int res3 = 0 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ComboBox_GetMark",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxComboBox,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->GetSelection(arg2,arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_long, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_long, 0)));
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_ComboBox_SetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
@@ -31996,6 +32033,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"ComboBox_Replace", (PyCFunction) _wrap_ComboBox_Replace, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"ComboBox_SetSelection", (PyCFunction) _wrap_ComboBox_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"ComboBox_SetMark", (PyCFunction) _wrap_ComboBox_SetMark, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_GetMark", (PyCFunction) _wrap_ComboBox_GetMark, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"ComboBox_SetStringSelection", (PyCFunction) _wrap_ComboBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"ComboBox_SetString", (PyCFunction) _wrap_ComboBox_SetString, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"ComboBox_SetEditable", (PyCFunction) _wrap_ComboBox_SetEditable, METH_VARARGS | METH_KEYWORDS, NULL },

diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py
index 74e36254e9607b95a7c0d17a91b9e1923207d8e8..4cc4861dffafae684d337a3b9b1725059fc91b9b 100644 (file)
--- a/wxPython/src/msw/_gdi.py
+++ b/wxPython/src/msw/_gdi.py
@@ -447,6 +447,14 @@ class Brush(GDIObject):
         """
         return _gdi_.Brush_GetStipple(*args, **kwargs)
 
+    def IsHatch(*args, **kwargs):
+        """
+        IsHatch(self) -> bool
+
+        Is the current style a hatch type?
+        """
+        return _gdi_.Brush_IsHatch(*args, **kwargs)
+
     def Ok(*args, **kwargs):
         """
         Ok(self) -> bool

diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp
index 8c30951aac8063df9107f83eed1807f976d4adf1..66728e357a8f780575e9e369d398bef2c5e1f280 100644 (file)
--- a/wxPython/src/msw/_gdi_wrap.cpp
+++ b/wxPython/src/msw/_gdi_wrap.cpp
@@ -2736,6 +2736,34 @@ static PyObject *_wrap_Brush_GetStipple(PyObject *, PyObject *args, PyObject *kw
 }
 
 
+static PyObject *_wrap_Brush_IsHatch(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxBrush *arg1 = (wxBrush *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Brush_IsHatch",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)((wxBrush const *)arg1)->IsHatch();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_Brush_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
@@ -19483,6 +19511,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Brush_GetColour", (PyCFunction) _wrap_Brush_GetColour, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_GetStyle", (PyCFunction) _wrap_Brush_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_GetStipple", (PyCFunction) _wrap_Brush_GetStipple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_IsHatch", (PyCFunction) _wrap_Brush_IsHatch, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_Ok", (PyCFunction) _wrap_Brush_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"Brush_swigregister", Brush_swigregister, METH_VARARGS, NULL },
         { (char *)"new_Bitmap", (PyCFunction) _wrap_new_Bitmap, METH_VARARGS | METH_KEYWORDS, NULL },

diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py
index 4b6264d50af1b1ecc59b5dabcf663384236df8b7..8c815d6d3b4c4b4fafdf2af7ba57b46bbc1a4e33 100644 (file)
--- a/wxPython/src/msw/_misc.py
+++ b/wxPython/src/msw/_misc.py
@@ -2490,7 +2490,12 @@ ART_TIP = cvar.ART_TIP
 ART_REPORT_VIEW = cvar.ART_REPORT_VIEW
 ART_LIST_VIEW = cvar.ART_LIST_VIEW
 ART_NEW_DIR = cvar.ART_NEW_DIR
+ART_HARDDISK = cvar.ART_HARDDISK
+ART_FLOPPY = cvar.ART_FLOPPY
+ART_CDROM = cvar.ART_CDROM
+ART_REMOVABLE = cvar.ART_REMOVABLE
 ART_FOLDER = cvar.ART_FOLDER
+ART_FOLDER_OPEN = cvar.ART_FOLDER_OPEN
 ART_GO_DIR_UP = cvar.ART_GO_DIR_UP
 ART_EXECUTABLE_FILE = cvar.ART_EXECUTABLE_FILE
 ART_NORMAL_FILE = cvar.ART_NORMAL_FILE

diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp
index 339094efa2873ca1b9e57652f29b722205ee5f65..b48690ae85f6382785345409722dcd22e0c5b1b8 100644 (file)
--- a/wxPython/src/msw/_misc_wrap.cpp
+++ b/wxPython/src/msw/_misc_wrap.cpp
@@ -857,6 +857,99 @@ wxString Log_TimeStamp(){
             return msg;
         }
 void wxLog_Destroy(wxLog *self){ delete self; }
+// Make somce wrappers that double any % signs so they are 'escaped'
+    void wxPyLogFatalError(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogFatalError(m);
+    }
+    
+    void wxPyLogError(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogError(m);
+    }
+
+    void wxPyLogWarning(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogWarning(m);
+    }
+
+    void wxPyLogMessage(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogMessage(m);
+    }
+
+    void wxPyLogInfo(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogInfo(m);
+    }
+
+    void wxPyLogDebug(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogDebug(m);
+    }
+
+    void wxPyLogVerbose(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogVerbose(m);
+    }
+
+    void wxPyLogStatus(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogStatus(m);
+    }
+
+    void wxPyLogStatusFrame(wxFrame *pFrame, const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogStatus(pFrame, m);
+    }
+
+    void wxPyLogSysError(const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogSysError(m);
+    }
+
+    void wxPyLogGeneric(unsigned long level, const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogGeneric(level, m);
+    }
+
+    void wxPyLogTrace(unsigned long mask, const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogTrace(mask, m);
+    }
+        
+    void wxPyLogTrace(const wxString& mask, const wxString& msg)
+    {
+        wxString m(msg);
+        m.Replace(wxT("%"), wxT("%%"));
+        wxLogTrace(mask, m);
+    }
+    
+
 
 // A wxLog class that can be derived from in wxPython
 class wxPyLog : public wxLog {
@@ -1166,7 +1259,12 @@ PyObject *wxMimeTypesManager_EnumAllFileTypes(wxMimeTypesManager *self){
  static const wxString wxPyART_REPORT_VIEW(wxART_REPORT_VIEW); 
  static const wxString wxPyART_LIST_VIEW(wxART_LIST_VIEW); 
  static const wxString wxPyART_NEW_DIR(wxART_NEW_DIR); 
+ static const wxString wxPyART_HARDDISK(wxART_HARDDISK); 
+ static const wxString wxPyART_FLOPPY(wxART_FLOPPY); 
+ static const wxString wxPyART_CDROM(wxART_CDROM); 
+ static const wxString wxPyART_REMOVABLE(wxART_REMOVABLE); 
  static const wxString wxPyART_FOLDER(wxART_FOLDER); 
+ static const wxString wxPyART_FOLDER_OPEN(wxART_FOLDER_OPEN); 
  static const wxString wxPyART_GO_DIR_UP(wxART_GO_DIR_UP); 
  static const wxString wxPyART_EXECUTABLE_FILE(wxART_EXECUTABLE_FILE); 
  static const wxString wxPyART_NORMAL_FILE(wxART_NORMAL_FILE); 
@@ -8550,7 +8648,7 @@ static PyObject *_wrap_LogFatalError(PyObject *, PyObject *args, PyObject *kwarg
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogFatalError((wxString const &)*arg1);
+        wxPyLogFatalError((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8587,7 +8685,7 @@ static PyObject *_wrap_LogError(PyObject *, PyObject *args, PyObject *kwargs) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogError((wxString const &)*arg1);
+        wxPyLogError((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8624,7 +8722,7 @@ static PyObject *_wrap_LogWarning(PyObject *, PyObject *args, PyObject *kwargs)
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogWarning((wxString const &)*arg1);
+        wxPyLogWarning((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8661,7 +8759,7 @@ static PyObject *_wrap_LogMessage(PyObject *, PyObject *args, PyObject *kwargs)
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogMessage((wxString const &)*arg1);
+        wxPyLogMessage((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8698,7 +8796,7 @@ static PyObject *_wrap_LogInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogInfo((wxString const &)*arg1);
+        wxPyLogInfo((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8735,7 +8833,7 @@ static PyObject *_wrap_LogDebug(PyObject *, PyObject *args, PyObject *kwargs) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogDebug((wxString const &)*arg1);
+        wxPyLogDebug((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8772,7 +8870,7 @@ static PyObject *_wrap_LogVerbose(PyObject *, PyObject *args, PyObject *kwargs)
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogVerbose((wxString const &)*arg1);
+        wxPyLogVerbose((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8809,7 +8907,7 @@ static PyObject *_wrap_LogStatus(PyObject *, PyObject *args, PyObject *kwargs) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogStatus((wxString const &)*arg1);
+        wxPyLogStatus((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8850,7 +8948,7 @@ static PyObject *_wrap_LogStatusFrame(PyObject *, PyObject *args, PyObject *kwar
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogStatus(arg1,(wxString const &)*arg2);
+        wxPyLogStatusFrame(arg1,(wxString const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8887,7 +8985,7 @@ static PyObject *_wrap_LogSysError(PyObject *, PyObject *args, PyObject *kwargs)
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogSysError((wxString const &)*arg1);
+        wxPyLogSysError((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8907,6 +9005,47 @@ static PyObject *_wrap_LogSysError(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
+static PyObject *_wrap_LogGeneric(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    unsigned long arg1 ;
+    wxString *arg2 = 0 ;
+    bool temp2 = false ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "level",(char *) "msg", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogGeneric",kwnames,&obj0,&obj1)) goto fail;
+    arg1 = (unsigned long)SWIG_As_unsigned_SS_long(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = wxString_in_helper(obj1);
+        if (arg2 == NULL) SWIG_fail;
+        temp2 = true;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxPyLogGeneric(arg1,(wxString const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    {
+        if (temp2)
+        delete arg2;
+    }
+    return resultobj;
+    fail:
+    {
+        if (temp2)
+        delete arg2;
+    }
+    return NULL;
+}
+
+
 static PyObject *_wrap_LogTrace__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     unsigned long arg1 ;
@@ -8925,7 +9064,7 @@ static PyObject *_wrap_LogTrace__SWIG_0(PyObject *, PyObject *args) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogTrace(arg1,(wxString const &)*arg2);
+        wxPyLogTrace(arg1,(wxString const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -8967,7 +9106,7 @@ static PyObject *_wrap_LogTrace__SWIG_1(PyObject *, PyObject *args) {
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogTrace((wxString const &)*arg1,(wxString const &)*arg2);
+        wxPyLogTrace((wxString const &)*arg1,(wxString const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -9036,47 +9175,6 @@ static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_LogGeneric(PyObject *, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    unsigned long arg1 ;
-    wxString *arg2 = 0 ;
-    bool temp2 = false ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "level",(char *) "msg", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogGeneric",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (unsigned long)SWIG_As_unsigned_SS_long(obj0); 
-    if (PyErr_Occurred()) SWIG_fail;
-    {
-        arg2 = wxString_in_helper(obj1);
-        if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxLogGeneric(arg1,(wxString const &)*arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        if (temp2)
-        delete arg2;
-    }
-    return resultobj;
-    fail:
-    {
-        if (temp2)
-        delete arg2;
-    }
-    return NULL;
-}
-
-
 static PyObject *_wrap_SafeShowMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
@@ -14489,6 +14587,86 @@ static PyObject *_wrap_ART_NEW_DIR_get() {
 }
 
 
+static int _wrap_ART_HARDDISK_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_HARDDISK is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_HARDDISK_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_HARDDISK)->c_str(), (&wxPyART_HARDDISK)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_HARDDISK)->c_str(), (&wxPyART_HARDDISK)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
+static int _wrap_ART_FLOPPY_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_FLOPPY is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_FLOPPY_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_FLOPPY)->c_str(), (&wxPyART_FLOPPY)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_FLOPPY)->c_str(), (&wxPyART_FLOPPY)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
+static int _wrap_ART_CDROM_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_CDROM is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_CDROM_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_CDROM)->c_str(), (&wxPyART_CDROM)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_CDROM)->c_str(), (&wxPyART_CDROM)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
+static int _wrap_ART_REMOVABLE_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_REMOVABLE is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_REMOVABLE_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_REMOVABLE)->c_str(), (&wxPyART_REMOVABLE)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_REMOVABLE)->c_str(), (&wxPyART_REMOVABLE)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
 static int _wrap_ART_FOLDER_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_FOLDER is read-only.");
     return 1;
@@ -14509,6 +14687,26 @@ static PyObject *_wrap_ART_FOLDER_get() {
 }
 
 
+static int _wrap_ART_FOLDER_OPEN_set(PyObject *) {
+    PyErr_SetString(PyExc_TypeError,"Variable ART_FOLDER_OPEN is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_ART_FOLDER_OPEN_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyART_FOLDER_OPEN)->c_str(), (&wxPyART_FOLDER_OPEN)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyART_FOLDER_OPEN)->c_str(), (&wxPyART_FOLDER_OPEN)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
 static int _wrap_ART_GO_DIR_UP_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_GO_DIR_UP is read-only.");
     return 1;
@@ -29148,8 +29346,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"LogStatus", (PyCFunction) _wrap_LogStatus, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"LogStatusFrame", (PyCFunction) _wrap_LogStatusFrame, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"LogSysError", (PyCFunction) _wrap_LogSysError, METH_VARARGS | METH_KEYWORDS, NULL },
-        { (char *)"LogTrace", _wrap_LogTrace, METH_VARARGS, NULL },
         { (char *)"LogGeneric", (PyCFunction) _wrap_LogGeneric, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogTrace", _wrap_LogTrace, METH_VARARGS, NULL },
         { (char *)"SafeShowMessage", (PyCFunction) _wrap_SafeShowMessage, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"new_LogNull", (PyCFunction) _wrap_new_LogNull, METH_VARARGS | METH_KEYWORDS, NULL },
         { (char *)"delete_LogNull", (PyCFunction) _wrap_delete_LogNull, METH_VARARGS | METH_KEYWORDS, NULL },
@@ -30658,7 +30856,12 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"ART_REPORT_VIEW",_wrap_ART_REPORT_VIEW_get, _wrap_ART_REPORT_VIEW_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_LIST_VIEW",_wrap_ART_LIST_VIEW_get, _wrap_ART_LIST_VIEW_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_NEW_DIR",_wrap_ART_NEW_DIR_get, _wrap_ART_NEW_DIR_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_HARDDISK",_wrap_ART_HARDDISK_get, _wrap_ART_HARDDISK_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_FLOPPY",_wrap_ART_FLOPPY_get, _wrap_ART_FLOPPY_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_CDROM",_wrap_ART_CDROM_get, _wrap_ART_CDROM_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_REMOVABLE",_wrap_ART_REMOVABLE_get, _wrap_ART_REMOVABLE_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_FOLDER",_wrap_ART_FOLDER_get, _wrap_ART_FOLDER_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"ART_FOLDER_OPEN",_wrap_ART_FOLDER_OPEN_get, _wrap_ART_FOLDER_OPEN_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_GO_DIR_UP",_wrap_ART_GO_DIR_UP_get, _wrap_ART_GO_DIR_UP_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_EXECUTABLE_FILE",_wrap_ART_EXECUTABLE_FILE_get, _wrap_ART_EXECUTABLE_FILE_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_NORMAL_FILE",_wrap_ART_NORMAL_FILE_get, _wrap_ART_NORMAL_FILE_set);

diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py
index 83672c98bb6ca4a2a76ec052572e65dc35ab5f4a..f73a061adeb114f4d0f3764774d2d87d37b470d1 100644 (file)
--- a/wxPython/src/msw/_windows.py
+++ b/wxPython/src/msw/_windows.py
@@ -1062,7 +1062,7 @@ class SplitterWindow(_core.Window):
         """
         SetSashSize(self, int width)
 
-        Sets the sash size
+        Sets the sash size.  Currently a NOP.
         """
         return _windows_.SplitterWindow_SetSashSize(*args, **kwargs)
 
@@ -1070,7 +1070,7 @@ class SplitterWindow(_core.Window):
         """
         SetBorderSize(self, int width)
 
-        Sets the border size
+        Sets the border size. Currently a NOP.
         """
         return _windows_.SplitterWindow_SetBorderSize(*args, **kwargs)
 

diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py
index a5f4bb9bbd29223bf7e18b550375f94691817773..aa45347a9411e409ab5f408cd238d65fe5d59d30 100644 (file)
--- a/wxPython/src/msw/html.py
+++ b/wxPython/src/msw/html.py
@@ -1201,7 +1201,7 @@ class HtmlDCRenderer(_core.Object):
 
     def Render(*args, **kwargs):
         """
-        Render(self, int x, int y, int from=0, int dont_render=False, int to=INT_MAX, 
+        Render(self, int x, int y, int from=0, int dont_render=False, int maxHeight=INT_MAX, 
             int choices=None, int LCOUNT=0) -> int
         """
         return _html.HtmlDCRenderer_Render(*args, **kwargs)

diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp
index f9c6a6f86acf70f1c2755559d0b3f8ecf1866e73..9ae552ebe6ff0ebaa38ca729f739f0fec97c362e 100644 (file)
--- a/wxPython/src/msw/html_wrap.cpp
+++ b/wxPython/src/msw/html_wrap.cpp
@@ -7851,7 +7851,7 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *, PyObject *args, PyObjec
     PyObject * obj6 = 0 ;
     PyObject * obj7 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "x",(char *) "y",(char *) "from",(char *) "dont_render",(char *) "to",(char *) "choices",(char *) "LCOUNT", NULL 
+        (char *) "self",(char *) "x",(char *) "y",(char *) "from",(char *) "dont_render",(char *) "maxHeight",(char *) "choices",(char *) "LCOUNT", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:HtmlDCRenderer_Render",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;

diff --git a/wxPython/src/msw/media.py b/wxPython/src/msw/media.py
index f5ebf91f356b8d9c684cd49a4f3cd8696465005b..e4f3371c8bed4f3d24cd05e7b049bacf3b95f264 100644 (file)
--- a/wxPython/src/msw/media.py
+++ b/wxPython/src/msw/media.py
@@ -30,10 +30,6 @@ class MediaEventPtr(MediaEvent):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = MediaEvent
 _media.MediaEvent_swigregister(MediaEventPtr)
-cvar = _media.cvar
-MEDIABACKEND_DIRECTSHOW = cvar.MEDIABACKEND_DIRECTSHOW
-MEDIABACKEND_MCI = cvar.MEDIABACKEND_MCI
-MEDIABACKEND_QUICKTIME = cvar.MEDIABACKEND_QUICKTIME
 
 class MediaCtrl(_core.Control):
     def __repr__(self):
@@ -135,6 +131,7 @@ class MediaCtrlPtr(MediaCtrl):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = MediaCtrl
 _media.MediaCtrl_swigregister(MediaCtrlPtr)
+cvar = _media.cvar
 MediaCtrlNameStr = cvar.MediaCtrlNameStr
 
 def PreMediaCtrl(*args, **kwargs):

diff --git a/wxPython/src/msw/media_wrap.cpp b/wxPython/src/msw/media_wrap.cpp
index f5d9968d7f90dc6ff1f259c3955931c85e38d643..51b250288efab69310d97a118f9faba2273e1929 100644 (file)
--- a/wxPython/src/msw/media_wrap.cpp
+++ b/wxPython/src/msw/media_wrap.cpp
@@ -296,6 +296,7 @@ static swig_type_info *swig_types[13];
 #include "wx/wxPython/pyclasses.h"
 
 #include <wx/mediactrl.h>
+#include <wx/uri.h>
 
 
 #if !wxUSE_MEDIACTRL
@@ -314,7 +315,7 @@ enum wxMediaTimeFormat
 class WXDLLIMPEXP_MEDIA wxMediaEvent : public wxNotifyEvent
 {
 public:
-    wxMediaEvent(wxEventTypL, int )    { wxPyRaiseNotImplemented(); }
+    wxMediaEvent(wxEventType, int )    { wxPyRaiseNotImplemented(); }
 };
 
 class wxMediaCtrl : public wxControl
@@ -335,7 +336,7 @@ public:
                 wxWindowID ,
                 const wxURI& ,
                 const wxPoint&,
-                const wxSize& .
+                const wxSize& ,
                 long style,
                 const wxString& ,
                 const wxValidator& ,
@@ -354,7 +355,7 @@ public:
                 wxWindowID ,
                 const wxURI& ,
                 const wxPoint&,
-                const wxSize& .
+                const wxSize& ,
                 long style,
                 const wxString& ,
                 const wxValidator& ,
@@ -379,11 +380,12 @@ public:
     wxLongLong GetPosition() { return 0; }
     wxLongLong GetDuration() { return 0; }
 };
+
+const wxEventType wxEVT_MEDIA_FINISHED = 0;
+const wxEventType wxEVT_MEDIA_STOP = 0;
+
 #endif
 
- static const wxString wxPyMEDIABACKEND_DIRECTSHOW(wxMEDIABACKEND_DIRECTSHOW); 
- static const wxString wxPyMEDIABACKEND_MCI(wxMEDIABACKEND_MCI); 
- static const wxString wxPyMEDIABACKEND_QUICKTIME(wxMEDIABACKEND_QUICKTIME); 
 
 #include <limits.h>
 
@@ -482,7 +484,7 @@ SWIG_Check_int(PyObject* obj)
 }
 
  static const wxString wxPyEmptyString(wxEmptyString); 
- static const wxString wxPyMediaCtrlNameStr("mediaCtrl"); 
+ static const wxString wxPyMediaCtrlNameStr(wxT("mediaCtrl")); 
 
 SWIGSTATICINLINE(long)
 SWIG_As_long(PyObject* obj)
@@ -608,66 +610,6 @@ SWIG_Check_double(PyObject* obj)
 #ifdef __cplusplus
 extern "C" {
 #endif
-static int _wrap_MEDIABACKEND_DIRECTSHOW_set(PyObject *) {
-    PyErr_SetString(PyExc_TypeError,"Variable MEDIABACKEND_DIRECTSHOW is read-only.");
-    return 1;
-}
-
-
-static PyObject *_wrap_MEDIABACKEND_DIRECTSHOW_get() {
-    PyObject *pyobj;
-    
-    {
-#if wxUSE_UNICODE
-        pyobj = PyUnicode_FromWideChar((&wxPyMEDIABACKEND_DIRECTSHOW)->c_str(), (&wxPyMEDIABACKEND_DIRECTSHOW)->Len());
-#else
-        pyobj = PyString_FromStringAndSize((&wxPyMEDIABACKEND_DIRECTSHOW)->c_str(), (&wxPyMEDIABACKEND_DIRECTSHOW)->Len());
-#endif
-    }
-    return pyobj;
-}
-
-
-static int _wrap_MEDIABACKEND_MCI_set(PyObject *) {
-    PyErr_SetString(PyExc_TypeError,"Variable MEDIABACKEND_MCI is read-only.");
-    return 1;
-}
-
-
-static PyObject *_wrap_MEDIABACKEND_MCI_get() {
-    PyObject *pyobj;
-    
-    {
-#if wxUSE_UNICODE
-        pyobj = PyUnicode_FromWideChar((&wxPyMEDIABACKEND_MCI)->c_str(), (&wxPyMEDIABACKEND_MCI)->Len());
-#else
-        pyobj = PyString_FromStringAndSize((&wxPyMEDIABACKEND_MCI)->c_str(), (&wxPyMEDIABACKEND_MCI)->Len());
-#endif
-    }
-    return pyobj;
-}
-
-
-static int _wrap_MEDIABACKEND_QUICKTIME_set(PyObject *) {
-    PyErr_SetString(PyExc_TypeError,"Variable MEDIABACKEND_QUICKTIME is read-only.");
-    return 1;
-}
-
-
-static PyObject *_wrap_MEDIABACKEND_QUICKTIME_get() {
-    PyObject *pyobj;
-    
-    {
-#if wxUSE_UNICODE
-        pyobj = PyUnicode_FromWideChar((&wxPyMEDIABACKEND_QUICKTIME)->c_str(), (&wxPyMEDIABACKEND_QUICKTIME)->Len());
-#else
-        pyobj = PyString_FromStringAndSize((&wxPyMEDIABACKEND_QUICKTIME)->c_str(), (&wxPyMEDIABACKEND_QUICKTIME)->Len());
-#endif
-    }
-    return pyobj;
-}
-
-
 static PyObject *_wrap_new_MediaEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
@@ -2188,9 +2130,6 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d,"MEDIASTATE_PLAYING", SWIG_From_int((int)wxMEDIASTATE_PLAYING));
     PyDict_SetItemString(d,"MEDIATIMEFORMAT_TIME", SWIG_From_int((int)wxMEDIATIMEFORMAT_TIME));
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
-    SWIG_addvarlink(SWIG_globals,(char*)"MEDIABACKEND_DIRECTSHOW",_wrap_MEDIABACKEND_DIRECTSHOW_get, _wrap_MEDIABACKEND_DIRECTSHOW_set);
-    SWIG_addvarlink(SWIG_globals,(char*)"MEDIABACKEND_MCI",_wrap_MEDIABACKEND_MCI_get, _wrap_MEDIABACKEND_MCI_set);
-    SWIG_addvarlink(SWIG_globals,(char*)"MEDIABACKEND_QUICKTIME",_wrap_MEDIABACKEND_QUICKTIME_get, _wrap_MEDIABACKEND_QUICKTIME_set);
     SWIG_addvarlink(SWIG_globals,(char*)"MediaCtrlNameStr",_wrap_MediaCtrlNameStr_get, _wrap_MediaCtrlNameStr_set);
     PyDict_SetItemString(d, "wxEVT_MEDIA_FINISHED", PyInt_FromLong(wxEVT_MEDIA_FINISHED));
     PyDict_SetItemString(d, "wxEVT_MEDIA_STOP", PyInt_FromLong(wxEVT_MEDIA_STOP));