From 428947f36fe9cbabbb0101ddfc681d37f1236fac Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 16 Nov 2006 23:31:04 +0000 Subject: [PATCH] Added wxStandardPaths::GetExecutablePath git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/demo/StandardPaths.py | 1 + wxPython/src/_stdpaths.i | 6 ++++++ wxPython/src/gtk/_misc.py | 10 ++++++++++ wxPython/src/gtk/_misc_wrap.cpp | 35 +++++++++++++++++++++++++++++++++ wxPython/src/mac/_misc.py | 10 ++++++++++ wxPython/src/mac/_misc_wrap.cpp | 35 +++++++++++++++++++++++++++++++++ wxPython/src/msw/_misc.py | 10 ++++++++++ wxPython/src/msw/_misc_wrap.cpp | 35 +++++++++++++++++++++++++++++++++ 8 files changed, 142 insertions(+) diff --git a/wxPython/demo/StandardPaths.py b/wxPython/demo/StandardPaths.py index a90a9b5045..11491eb126 100644 --- a/wxPython/demo/StandardPaths.py +++ b/wxPython/demo/StandardPaths.py @@ -55,6 +55,7 @@ class TestPanel(wx.Panel): 'GetInstallPrefix', 'GetResourcesDir', 'GetTempDir', + 'GetExecutablePath', ]: makeitem(x) diff --git a/wxPython/src/_stdpaths.i b/wxPython/src/_stdpaths.i index f76a03d2d9..8a9a73e216 100644 --- a/wxPython/src/_stdpaths.i +++ b/wxPython/src/_stdpaths.i @@ -75,6 +75,12 @@ public: } + DocDeclStr( + virtual wxString , GetExecutablePath() const, + "Return the path (directory+filename) of the running executable or an +empty string if it couldn't be determined. The path is returned as an +absolute path whenever possible.", ""); + DocDeclStr( virtual wxString , GetConfigDir() const, diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index 0cdfb2634e..a365da6bc2 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -6026,6 +6026,16 @@ class StandardPaths(object): return _misc_.StandardPaths_Get(*args, **kwargs) Get = staticmethod(Get) + def GetExecutablePath(*args, **kwargs): + """ + GetExecutablePath(self) -> String + + Return the path (directory+filename) of the running executable or an + empty string if it couldn't be determined. The path is returned as an + absolute path whenever possible. + """ + return _misc_.StandardPaths_GetExecutablePath(*args, **kwargs) + def GetConfigDir(*args, **kwargs): """ GetConfigDir(self) -> String diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index 840aee2d08..a9de8fe4fc 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -36843,6 +36843,40 @@ fail: } +SWIGINTERN PyObject *_wrap_StandardPaths_GetExecutablePath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxStandardPaths *arg1 = (wxStandardPaths *) 0 ; + wxString result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStandardPaths, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StandardPaths_GetExecutablePath" "', expected argument " "1"" of type '" "wxStandardPaths const *""'"); + } + arg1 = reinterpret_cast< wxStandardPaths * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxStandardPaths const *)arg1)->GetExecutablePath(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_StandardPaths_GetConfigDir(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxStandardPaths *arg1 = (wxStandardPaths *) 0 ; @@ -40031,6 +40065,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Display_swigregister", Display_swigregister, METH_VARARGS, NULL}, { (char *)"Display_swiginit", Display_swiginit, METH_VARARGS, NULL}, { (char *)"StandardPaths_Get", (PyCFunction)_wrap_StandardPaths_Get, METH_NOARGS, NULL}, + { (char *)"StandardPaths_GetExecutablePath", (PyCFunction)_wrap_StandardPaths_GetExecutablePath, METH_O, NULL}, { (char *)"StandardPaths_GetConfigDir", (PyCFunction)_wrap_StandardPaths_GetConfigDir, METH_O, NULL}, { (char *)"StandardPaths_GetUserConfigDir", (PyCFunction)_wrap_StandardPaths_GetUserConfigDir, METH_O, NULL}, { (char *)"StandardPaths_GetDataDir", (PyCFunction)_wrap_StandardPaths_GetDataDir, METH_O, NULL}, diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index e2d49cd281..c99fc56b36 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -6034,6 +6034,16 @@ class StandardPaths(object): return _misc_.StandardPaths_Get(*args, **kwargs) Get = staticmethod(Get) + def GetExecutablePath(*args, **kwargs): + """ + GetExecutablePath(self) -> String + + Return the path (directory+filename) of the running executable or an + empty string if it couldn't be determined. The path is returned as an + absolute path whenever possible. + """ + return _misc_.StandardPaths_GetExecutablePath(*args, **kwargs) + def GetConfigDir(*args, **kwargs): """ GetConfigDir(self) -> String diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp index 2d9d8c8f7b..f3edbb6be6 100644 --- a/wxPython/src/mac/_misc_wrap.cpp +++ b/wxPython/src/mac/_misc_wrap.cpp @@ -36904,6 +36904,40 @@ fail: } +SWIGINTERN PyObject *_wrap_StandardPaths_GetExecutablePath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxStandardPaths *arg1 = (wxStandardPaths *) 0 ; + wxString result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStandardPaths, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StandardPaths_GetExecutablePath" "', expected argument " "1"" of type '" "wxStandardPaths const *""'"); + } + arg1 = reinterpret_cast< wxStandardPaths * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxStandardPaths const *)arg1)->GetExecutablePath(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_StandardPaths_GetConfigDir(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxStandardPaths *arg1 = (wxStandardPaths *) 0 ; @@ -40094,6 +40128,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Display_swigregister", Display_swigregister, METH_VARARGS, NULL}, { (char *)"Display_swiginit", Display_swiginit, METH_VARARGS, NULL}, { (char *)"StandardPaths_Get", (PyCFunction)_wrap_StandardPaths_Get, METH_NOARGS, NULL}, + { (char *)"StandardPaths_GetExecutablePath", (PyCFunction)_wrap_StandardPaths_GetExecutablePath, METH_O, NULL}, { (char *)"StandardPaths_GetConfigDir", (PyCFunction)_wrap_StandardPaths_GetConfigDir, METH_O, NULL}, { (char *)"StandardPaths_GetUserConfigDir", (PyCFunction)_wrap_StandardPaths_GetUserConfigDir, METH_O, NULL}, { (char *)"StandardPaths_GetDataDir", (PyCFunction)_wrap_StandardPaths_GetDataDir, METH_O, NULL}, diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index e2d49cd281..c99fc56b36 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -6034,6 +6034,16 @@ class StandardPaths(object): return _misc_.StandardPaths_Get(*args, **kwargs) Get = staticmethod(Get) + def GetExecutablePath(*args, **kwargs): + """ + GetExecutablePath(self) -> String + + Return the path (directory+filename) of the running executable or an + empty string if it couldn't be determined. The path is returned as an + absolute path whenever possible. + """ + return _misc_.StandardPaths_GetExecutablePath(*args, **kwargs) + def GetConfigDir(*args, **kwargs): """ GetConfigDir(self) -> String diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp index 2ff4fe6de9..d7da56f718 100644 --- a/wxPython/src/msw/_misc_wrap.cpp +++ b/wxPython/src/msw/_misc_wrap.cpp @@ -36904,6 +36904,40 @@ fail: } +SWIGINTERN PyObject *_wrap_StandardPaths_GetExecutablePath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxStandardPaths *arg1 = (wxStandardPaths *) 0 ; + wxString result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStandardPaths, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StandardPaths_GetExecutablePath" "', expected argument " "1"" of type '" "wxStandardPaths const *""'"); + } + arg1 = reinterpret_cast< wxStandardPaths * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxStandardPaths const *)arg1)->GetExecutablePath(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_StandardPaths_GetConfigDir(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxStandardPaths *arg1 = (wxStandardPaths *) 0 ; @@ -40094,6 +40128,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Display_swigregister", Display_swigregister, METH_VARARGS, NULL}, { (char *)"Display_swiginit", Display_swiginit, METH_VARARGS, NULL}, { (char *)"StandardPaths_Get", (PyCFunction)_wrap_StandardPaths_Get, METH_NOARGS, NULL}, + { (char *)"StandardPaths_GetExecutablePath", (PyCFunction)_wrap_StandardPaths_GetExecutablePath, METH_O, NULL}, { (char *)"StandardPaths_GetConfigDir", (PyCFunction)_wrap_StandardPaths_GetConfigDir, METH_O, NULL}, { (char *)"StandardPaths_GetUserConfigDir", (PyCFunction)_wrap_StandardPaths_GetUserConfigDir, METH_O, NULL}, { (char *)"StandardPaths_GetDataDir", (PyCFunction)_wrap_StandardPaths_GetDataDir, METH_O, NULL}, -- 2.49.0