From: Robin Dunn Date: Tue, 24 Oct 2006 20:30:32 +0000 (+0000) Subject: Added wx.StandardPaths.GetTmpDir X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ae8635b6da660140b77627c20ef1020aa7d483db Added wx.StandardPaths.GetTmpDir git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/demo/StandardPaths.py b/wxPython/demo/StandardPaths.py index 6502c5c8a9..a90a9b5045 100644 --- a/wxPython/demo/StandardPaths.py +++ b/wxPython/demo/StandardPaths.py @@ -8,7 +8,7 @@ class TestPanel(wx.Panel): self.log = log wx.Panel.__init__(self, parent, -1) - sizer = wx.FlexGridSizer(0, 3, 2, 2) + sizer = wx.FlexGridSizer(0, 3, 5, 5) box = wx.BoxSizer(wx.VERTICAL) fs = self.GetFont().GetPointSize() bf = wx.Font(fs+4, wx.SWISS, wx.NORMAL, wx.BOLD) @@ -54,6 +54,7 @@ class TestPanel(wx.Panel): 'GetPluginsDir', 'GetInstallPrefix', 'GetResourcesDir', + 'GetTempDir', ]: makeitem(x) diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt index 819390eb87..2499fb6399 100644 --- a/wxPython/docs/CHANGES.txt +++ b/wxPython/docs/CHANGES.txt @@ -15,7 +15,7 @@ switch your programs over to the wx package. Fixed wx.glcanvas.GLCanvas.SetCurrent to be compatible with prevoius versons. - +Added wx.StandardPaths.GetTmpDir. diff --git a/wxPython/src/_stdpaths.i b/wxPython/src/_stdpaths.i index 2b38bdd13c..f76a03d2d9 100644 --- a/wxPython/src/_stdpaths.i +++ b/wxPython/src/_stdpaths.i @@ -165,7 +165,10 @@ standard prefix/share/locale/lang/LC_MESSAGES.)", ""); C:\Documents and Settings\username\Documents under Windows, $HOME under Unix and ~/Documents under Mac", ""); - + DocDeclStr( + virtual wxString , GetTempDir() const, + "Return the user's directory for temporary files.", ""); + DocStr(SetInstallPrefix, "Set the program installation directory which is /usr/local by default. diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index 944da9b0f3..91f5d9c4cb 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -6129,6 +6129,14 @@ class StandardPaths(object): """ return _misc_.StandardPaths_GetDocumentsDir(*args, **kwargs) + def GetTempDir(*args, **kwargs): + """ + GetTempDir(self) -> String + + Return the user's directory for temporary files. + """ + return _misc_.StandardPaths_GetTempDir(*args, **kwargs) + def SetInstallPrefix(*args, **kwargs): """ SetInstallPrefix(self, String prefix) diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index 88815d09ad..2b0edad6aa 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -37124,6 +37124,40 @@ fail: } +SWIGINTERN PyObject *_wrap_StandardPaths_GetTempDir(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_GetTempDir" "', expected argument " "1"" of type '" "wxStandardPaths const *""'"); + } + arg1 = reinterpret_cast< wxStandardPaths * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxStandardPaths const *)arg1)->GetTempDir(); + 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_SetInstallPrefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxStandardPaths *arg1 = (wxStandardPaths *) 0 ; @@ -39916,6 +39950,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"StandardPaths_GetResourcesDir", (PyCFunction)_wrap_StandardPaths_GetResourcesDir, METH_O, NULL}, { (char *)"StandardPaths_GetLocalizedResourcesDir", (PyCFunction) _wrap_StandardPaths_GetLocalizedResourcesDir, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StandardPaths_GetDocumentsDir", (PyCFunction)_wrap_StandardPaths_GetDocumentsDir, METH_O, NULL}, + { (char *)"StandardPaths_GetTempDir", (PyCFunction)_wrap_StandardPaths_GetTempDir, METH_O, NULL}, { (char *)"StandardPaths_SetInstallPrefix", (PyCFunction) _wrap_StandardPaths_SetInstallPrefix, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StandardPaths_GetInstallPrefix", (PyCFunction)_wrap_StandardPaths_GetInstallPrefix, METH_O, NULL}, { (char *)"StandardPaths_swigregister", StandardPaths_swigregister, METH_VARARGS, NULL}, diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index e8738b0e3d..4c29575658 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -6137,6 +6137,14 @@ class StandardPaths(object): """ return _misc_.StandardPaths_GetDocumentsDir(*args, **kwargs) + def GetTempDir(*args, **kwargs): + """ + GetTempDir(self) -> String + + Return the user's directory for temporary files. + """ + return _misc_.StandardPaths_GetTempDir(*args, **kwargs) + def SetInstallPrefix(*args, **kwargs): """ SetInstallPrefix(self, String prefix) diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp index 3c3054f837..87d200eb20 100644 --- a/wxPython/src/mac/_misc_wrap.cpp +++ b/wxPython/src/mac/_misc_wrap.cpp @@ -37185,6 +37185,40 @@ fail: } +SWIGINTERN PyObject *_wrap_StandardPaths_GetTempDir(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_GetTempDir" "', expected argument " "1"" of type '" "wxStandardPaths const *""'"); + } + arg1 = reinterpret_cast< wxStandardPaths * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxStandardPaths const *)arg1)->GetTempDir(); + 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_SetInstallPrefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxStandardPaths *arg1 = (wxStandardPaths *) 0 ; @@ -39979,6 +40013,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"StandardPaths_GetResourcesDir", (PyCFunction)_wrap_StandardPaths_GetResourcesDir, METH_O, NULL}, { (char *)"StandardPaths_GetLocalizedResourcesDir", (PyCFunction) _wrap_StandardPaths_GetLocalizedResourcesDir, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StandardPaths_GetDocumentsDir", (PyCFunction)_wrap_StandardPaths_GetDocumentsDir, METH_O, NULL}, + { (char *)"StandardPaths_GetTempDir", (PyCFunction)_wrap_StandardPaths_GetTempDir, METH_O, NULL}, { (char *)"StandardPaths_SetInstallPrefix", (PyCFunction) _wrap_StandardPaths_SetInstallPrefix, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StandardPaths_GetInstallPrefix", (PyCFunction)_wrap_StandardPaths_GetInstallPrefix, METH_O, NULL}, { (char *)"StandardPaths_swigregister", StandardPaths_swigregister, METH_VARARGS, NULL}, diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index e8738b0e3d..4c29575658 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -6137,6 +6137,14 @@ class StandardPaths(object): """ return _misc_.StandardPaths_GetDocumentsDir(*args, **kwargs) + def GetTempDir(*args, **kwargs): + """ + GetTempDir(self) -> String + + Return the user's directory for temporary files. + """ + return _misc_.StandardPaths_GetTempDir(*args, **kwargs) + def SetInstallPrefix(*args, **kwargs): """ SetInstallPrefix(self, String prefix) diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp index ba1831119b..8a22911156 100644 --- a/wxPython/src/msw/_misc_wrap.cpp +++ b/wxPython/src/msw/_misc_wrap.cpp @@ -37185,6 +37185,40 @@ fail: } +SWIGINTERN PyObject *_wrap_StandardPaths_GetTempDir(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_GetTempDir" "', expected argument " "1"" of type '" "wxStandardPaths const *""'"); + } + arg1 = reinterpret_cast< wxStandardPaths * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxStandardPaths const *)arg1)->GetTempDir(); + 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_SetInstallPrefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxStandardPaths *arg1 = (wxStandardPaths *) 0 ; @@ -39979,6 +40013,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"StandardPaths_GetResourcesDir", (PyCFunction)_wrap_StandardPaths_GetResourcesDir, METH_O, NULL}, { (char *)"StandardPaths_GetLocalizedResourcesDir", (PyCFunction) _wrap_StandardPaths_GetLocalizedResourcesDir, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StandardPaths_GetDocumentsDir", (PyCFunction)_wrap_StandardPaths_GetDocumentsDir, METH_O, NULL}, + { (char *)"StandardPaths_GetTempDir", (PyCFunction)_wrap_StandardPaths_GetTempDir, METH_O, NULL}, { (char *)"StandardPaths_SetInstallPrefix", (PyCFunction) _wrap_StandardPaths_SetInstallPrefix, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StandardPaths_GetInstallPrefix", (PyCFunction)_wrap_StandardPaths_GetInstallPrefix, METH_O, NULL}, { (char *)"StandardPaths_swigregister", StandardPaths_swigregister, METH_VARARGS, NULL},