X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b6e4ff1158db0335206579b149674eae54a5ac..6bda7508c6e41365b69fdf690b3070991098a7af:/wxPython/src/gtk/_misc_wrap.cpp diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index d1490080b4..ddd7404ed5 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -234,11 +234,11 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxLogTextCtrl swig_types[23] #define SWIGTYPE_p_wxTextCtrl swig_types[24] #define SWIGTYPE_p_wxBusyCursor swig_types[25] -#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[26] -#define SWIGTYPE_p_wxPyTextDataObject swig_types[27] -#define SWIGTYPE_p_wxBitmapDataObject swig_types[28] -#define SWIGTYPE_p_wxTextDataObject swig_types[29] -#define SWIGTYPE_p_wxDataObject swig_types[30] +#define SWIGTYPE_p_wxPyTextDataObject swig_types[26] +#define SWIGTYPE_p_wxBitmapDataObject swig_types[27] +#define SWIGTYPE_p_wxTextDataObject swig_types[28] +#define SWIGTYPE_p_wxDataObject swig_types[29] +#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[30] #define SWIGTYPE_p_wxFileDataObject swig_types[31] #define SWIGTYPE_p_wxCustomDataObject swig_types[32] #define SWIGTYPE_p_wxURLDataObject swig_types[33] @@ -277,24 +277,25 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxOutputStream swig_types[66] #define SWIGTYPE_p_wxDateTime swig_types[67] #define SWIGTYPE_p_wxPyDropSource swig_types[68] -#define SWIGTYPE_p_wxWindow swig_types[69] -#define SWIGTYPE_p_wxString swig_types[70] -#define SWIGTYPE_p_wxPyProcess swig_types[71] -#define SWIGTYPE_p_wxBitmap swig_types[72] -#define SWIGTYPE_p_wxConfig swig_types[73] -#define SWIGTYPE_p_wxChar swig_types[74] -#define SWIGTYPE_p_wxBusyInfo swig_types[75] -#define SWIGTYPE_p_wxPyDropTarget swig_types[76] -#define SWIGTYPE_p_wxPyTextDropTarget swig_types[77] -#define SWIGTYPE_p_wxPyFileDropTarget swig_types[78] -#define SWIGTYPE_p_wxProcessEvent swig_types[79] -#define SWIGTYPE_p_wxPyLog swig_types[80] -#define SWIGTYPE_p_wxLogNull swig_types[81] -#define SWIGTYPE_p_wxColour swig_types[82] -#define SWIGTYPE_p_wxConfigPathChanger swig_types[83] -#define SWIGTYPE_p_wxPyTimer swig_types[84] -#define SWIGTYPE_p_wxDateSpan swig_types[85] -static swig_type_info *swig_types[87]; +#define SWIGTYPE_p_wxKillError swig_types[69] +#define SWIGTYPE_p_wxWindow swig_types[70] +#define SWIGTYPE_p_wxString swig_types[71] +#define SWIGTYPE_p_wxPyProcess swig_types[72] +#define SWIGTYPE_p_wxBitmap swig_types[73] +#define SWIGTYPE_p_wxConfig swig_types[74] +#define SWIGTYPE_p_wxChar swig_types[75] +#define SWIGTYPE_p_wxBusyInfo swig_types[76] +#define SWIGTYPE_p_wxPyDropTarget swig_types[77] +#define SWIGTYPE_p_wxPyTextDropTarget swig_types[78] +#define SWIGTYPE_p_wxPyFileDropTarget swig_types[79] +#define SWIGTYPE_p_wxProcessEvent swig_types[80] +#define SWIGTYPE_p_wxPyLog swig_types[81] +#define SWIGTYPE_p_wxLogNull swig_types[82] +#define SWIGTYPE_p_wxColour swig_types[83] +#define SWIGTYPE_p_wxConfigPathChanger swig_types[84] +#define SWIGTYPE_p_wxPyTimer swig_types[85] +#define SWIGTYPE_p_wxDateSpan swig_types[86] +static swig_type_info *swig_types[88]; /* -------- TYPES TABLE (END) -------- */ @@ -863,6 +864,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 +1266,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); @@ -1772,6 +1871,9 @@ PyObject *wxDisplay_GetModes(wxDisplay *self,wxVideoMode const &mode){ #include +wxStandardPaths *StandardPaths_Get(){ + return (wxStandardPaths*) &wxStandardPaths::Get(); + } #ifdef __cplusplus extern "C" { #endif @@ -8556,7 +8658,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; @@ -8593,7 +8695,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; @@ -8630,7 +8732,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; @@ -8667,7 +8769,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; @@ -8704,7 +8806,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; @@ -8741,7 +8843,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; @@ -8778,7 +8880,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; @@ -8815,7 +8917,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; @@ -8856,7 +8958,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; @@ -8893,7 +8995,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; @@ -8913,6 +9015,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 ; @@ -8931,7 +9074,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; @@ -8973,7 +9116,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; @@ -9042,47 +9185,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 ; @@ -9254,23 +9356,29 @@ static PyObject *_wrap_Process_Kill(PyObject *, PyObject *args, PyObject *kwargs PyObject *resultobj; int arg1 ; int arg2 = (int) wxSIGTERM ; + int arg3 = (int) wxKILL_NOCHILDREN ; int result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "pid",(char *) "sig", NULL + (char *) "pid",(char *) "sig",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Process_Kill",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Process_Kill",kwnames,&obj0,&obj1,&obj2)) goto fail; arg1 = (int)SWIG_As_int(obj0); if (PyErr_Occurred()) SWIG_fail; if (obj1) { arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + arg3 = (int)SWIG_As_int(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)wxPyProcess::Kill(arg1,(wxSignal )arg2); + result = (int)wxPyProcess::Kill(arg1,(wxSignal )arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -9555,7 +9663,7 @@ static PyObject *_wrap_Process_GetInputStream(PyObject *, PyObject *args, PyObje if (result) { _ptr = new wxPyInputStream(result); } - resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), true); + resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), 0); } return resultobj; fail: @@ -9588,7 +9696,7 @@ static PyObject *_wrap_Process_GetErrorStream(PyObject *, PyObject *args, PyObje if (result) { _ptr = new wxPyInputStream(result); } - resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), true); + resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), 0); } return resultobj; fail: @@ -9978,6 +10086,54 @@ static PyObject *_wrap_Execute(PyObject *, PyObject *args, PyObject *kwargs) { } +static PyObject *_wrap_Kill(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + long arg1 ; + int arg2 = (int) wxSIGTERM ; + wxKillError *arg3 = (wxKillError *) 0 ; + int arg4 = (int) wxKILL_NOCHILDREN ; + int result; + wxKillError temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "pid",(char *) "sig",(char *) "flags", NULL + }; + + { + arg3 = &temp3; + } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Kill",kwnames,&obj0,&obj1,&obj2)) goto fail; + arg1 = (long)SWIG_As_long(obj0); + if (PyErr_Occurred()) SWIG_fail; + if (obj1) { + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg4 = (int)SWIG_As_int(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)wxKill(arg1,(wxSignal )arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int((int)result); + { + PyObject* o; + o = PyInt_FromLong((long) (*arg3)); + resultobj = t_output_helper(resultobj, o); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_new_Joystick(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 = (int) wxJOYSTICK1 ; @@ -14495,6 +14651,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; @@ -14515,6 +14751,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; @@ -28546,10 +28802,7 @@ static PyObject *_wrap_StandardPaths_Get(PyObject *, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":StandardPaths_Get",kwnames)) goto fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - { - wxStandardPaths &_result_ref = wxStandardPaths::Get(); - result = (wxStandardPaths *) &_result_ref; - } + result = (wxStandardPaths *)StandardPaths_Get(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -29093,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 }, @@ -29128,6 +29381,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ProcessEvent_m_exitcode_get", (PyCFunction) _wrap_ProcessEvent_m_exitcode_get, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"ProcessEvent_swigregister", ProcessEvent_swigregister, METH_VARARGS, NULL }, { (char *)"Execute", (PyCFunction) _wrap_Execute, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Kill", (PyCFunction) _wrap_Kill, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"new_Joystick", (PyCFunction) _wrap_new_Joystick, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"delete_Joystick", (PyCFunction) _wrap_delete_Joystick, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Joystick_GetPosition", (PyCFunction) _wrap_Joystick_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -30208,11 +30462,11 @@ static swig_type_info _swigt__p_wxLogStderr[] = {{"_p_wxLogStderr", 0, "wxLogStd static swig_type_info _swigt__p_wxLogTextCtrl[] = {{"_p_wxLogTextCtrl", 0, "wxLogTextCtrl *", 0, 0, 0, 0},{"_p_wxLogTextCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTextCtrl[] = {{"_p_wxTextCtrl", 0, "wxTextCtrl *", 0, 0, 0, 0},{"_p_wxTextCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBusyCursor[] = {{"_p_wxBusyCursor", 0, "wxBusyCursor *", 0, 0, 0, 0},{"_p_wxBusyCursor", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxPyBitmapDataObject[] = {{"_p_wxPyBitmapDataObject", 0, "wxPyBitmapDataObject *", 0, 0, 0, 0},{"_p_wxPyBitmapDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTextDataObject[] = {{"_p_wxPyTextDataObject", 0, "wxPyTextDataObject *", 0, 0, 0, 0},{"_p_wxPyTextDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBitmapDataObject[] = {{"_p_wxBitmapDataObject", 0, "wxBitmapDataObject *", 0, 0, 0, 0},{"_p_wxBitmapDataObject", 0, 0, 0, 0, 0, 0},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxBitmapDataObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTextDataObject[] = {{"_p_wxTextDataObject", 0, "wxTextDataObject *", 0, 0, 0, 0},{"_p_wxTextDataObject", 0, 0, 0, 0, 0, 0},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxTextDataObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxDataObject[] = {{"_p_wxDataObject", 0, "wxDataObject *", 0, 0, 0, 0},{"_p_wxDataObjectSimple", _p_wxDataObjectSimpleTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxPyDataObjectSimple", _p_wxPyDataObjectSimpleTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxDataObjectComposite", _p_wxDataObjectCompositeTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxDataObject", 0, 0, 0, 0, 0, 0},{"_p_wxTextDataObject", _p_wxTextDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxBitmapDataObject", _p_wxBitmapDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxFileDataObject", _p_wxFileDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxCustomDataObject", _p_wxCustomDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxMetafileDataObject", _p_wxMetafileDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxURLDataObject", _p_wxURLDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyBitmapDataObject[] = {{"_p_wxPyBitmapDataObject", 0, "wxPyBitmapDataObject *", 0, 0, 0, 0},{"_p_wxPyBitmapDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxFileDataObject[] = {{"_p_wxFileDataObject", 0, "wxFileDataObject *", 0, 0, 0, 0},{"_p_wxFileDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCustomDataObject[] = {{"_p_wxCustomDataObject", 0, "wxCustomDataObject *", 0, 0, 0, 0},{"_p_wxCustomDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxURLDataObject[] = {{"_p_wxURLDataObject", 0, "wxURLDataObject *", 0, 0, 0, 0},{"_p_wxURLDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -30251,6 +30505,7 @@ static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0 static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0, 0, 0, 0},{"_p_wxOutputStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxDateTime[] = {{"_p_wxDateTime", 0, "wxDateTime *", 0, 0, 0, 0},{"_p_wxDateTime", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyDropSource[] = {{"_p_wxPyDropSource", 0, "wxPyDropSource *", 0, 0, 0, 0},{"_p_wxPyDropSource", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxKillError[] = {{"_p_wxKillError", 0, "enum wxKillError *|wxKillError *", 0, 0, 0, 0},{"_p_wxKillError", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0, 0, 0, 0},{"_p_wxString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyProcess[] = {{"_p_wxPyProcess", 0, "wxPyProcess *", 0, 0, 0, 0},{"_p_wxPyProcess", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -30296,11 +30551,11 @@ _swigt__p_wxLogStderr, _swigt__p_wxLogTextCtrl, _swigt__p_wxTextCtrl, _swigt__p_wxBusyCursor, -_swigt__p_wxPyBitmapDataObject, _swigt__p_wxPyTextDataObject, _swigt__p_wxBitmapDataObject, _swigt__p_wxTextDataObject, _swigt__p_wxDataObject, +_swigt__p_wxPyBitmapDataObject, _swigt__p_wxFileDataObject, _swigt__p_wxCustomDataObject, _swigt__p_wxURLDataObject, @@ -30339,6 +30594,7 @@ _swigt__p_wxObject, _swigt__p_wxOutputStream, _swigt__p_wxDateTime, _swigt__p_wxPyDropSource, +_swigt__p_wxKillError, _swigt__p_wxWindow, _swigt__p_wxString, _swigt__p_wxPyProcess, @@ -30526,6 +30782,8 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"KILL_ACCESS_DENIED", SWIG_From_int((int)wxKILL_ACCESS_DENIED)); PyDict_SetItemString(d,"KILL_NO_PROCESS", SWIG_From_int((int)wxKILL_NO_PROCESS)); PyDict_SetItemString(d,"KILL_ERROR", SWIG_From_int((int)wxKILL_ERROR)); + PyDict_SetItemString(d,"KILL_NOCHILDREN", SWIG_From_int((int)wxKILL_NOCHILDREN)); + PyDict_SetItemString(d,"KILL_CHILDREN", SWIG_From_int((int)wxKILL_CHILDREN)); PyDict_SetItemString(d,"SIGNONE", SWIG_From_int((int)wxSIGNONE)); PyDict_SetItemString(d,"SIGHUP", SWIG_From_int((int)wxSIGHUP)); PyDict_SetItemString(d,"SIGINT", SWIG_From_int((int)wxSIGINT)); @@ -30599,7 +30857,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);