From 0815db26866a57eb72dbda72cc060e2649da45f5 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 13 Jun 2002 01:35:19 +0000 Subject: [PATCH] fixed some paths in build scripts fixed yesterday's fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/b.bat | 2 +- wxPython/distrib/make_installer.py | 4 ++-- wxPython/src/controls2.i | 7 ++++++- wxPython/src/misc.i | 1 + wxPython/src/msw/controls2.cpp | 4 +++- wxPython/src/msw/misc.cpp | 19 +++++++++++++++++++ wxPython/src/msw/misc.py | 2 ++ 7 files changed, 34 insertions(+), 5 deletions(-) diff --git a/wxPython/b.bat b/wxPython/b.bat index 23fe76963a..3c52574c3b 100755 --- a/wxPython/b.bat +++ b/wxPython/b.bat @@ -10,7 +10,7 @@ set FLAGS=USE_SWIG=1 IN_CVS_TREE=1 rem Use non-default python? iff "%1" == "15" .or. "%1" == "20" .or. "%1" == "21" .or. "%1" == "22" then set VER=%1 - set PYTHON=d:\tools\python%1%\python.exe + set PYTHON=%TOOLS%\python%1%\python.exe shift else beep diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 318c3fc3ea..06812c4e80 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -10,7 +10,7 @@ will be created. import sys, os, string KEEP_TEMPS = 0 -ISCC = r"D:\TOOLS\InnoSetup2Ex\ISCC.exe %s" +ISCC = r"%s\InnoSetup2Ex\ISCC.exe %s" #---------------------------------------------------------------------- @@ -330,7 +330,7 @@ def main(): f.write(IFS_Template % vars()) f.close() - os.system(ISCC % ISSFILE) + os.system(ISCC % (os.environ['TOOLS'], ISSFILE)) if not KEEP_TEMPS: os.remove(ISSFILE) diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i index 29ca4c927e..aa63f8a257 100644 --- a/wxPython/src/controls2.i +++ b/wxPython/src/controls2.i @@ -52,6 +52,11 @@ static const wxString wxPyEmptyString(wxT("")); %} + +%{ + static const long longzero = 0; +%} + //---------------------------------------------------------------------- enum { @@ -1213,7 +1218,7 @@ public: size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = TRUE); - wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& INOUT=0); + wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& INOUT = longzero); wxTreeItemId GetNextChild(const wxTreeItemId& item, long& INOUT); wxTreeItemId GetNextSibling(const wxTreeItemId& item); wxTreeItemId GetPrevSibling(const wxTreeItemId& item); diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i index 7256705e40..1298d96f1c 100644 --- a/wxPython/src/misc.i +++ b/wxPython/src/misc.i @@ -399,6 +399,7 @@ wxString wxGetUserName(); wxString wxGetHomeDir(); wxString wxGetUserHome(const wxString& user = wxPyEmptyString); +unsigned long wxGetProcessId(); // When wxApp gets the virtual method magic then enable this. // bool wxHandleFatalExceptions(bool doIt = TRUE); diff --git a/wxPython/src/msw/controls2.cpp b/wxPython/src/msw/controls2.cpp index b4f94ed28e..c4dbd0eb17 100644 --- a/wxPython/src/msw/controls2.cpp +++ b/wxPython/src/msw/controls2.cpp @@ -100,6 +100,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { DECLARE_DEF_STRING(DirDialogDefaultFolderStr); static const wxString wxPyEmptyString(wxT("")); + + static const long longzero = 0; // C++ Version of a Python aware class class wxPyListCtrl : public wxListCtrl { DECLARE_ABSTRACT_CLASS(wxPyListCtrl); @@ -7780,7 +7782,7 @@ static PyObject *_wrap_wxTreeCtrl_GetFirstChild(PyObject *self, PyObject *args, wxTreeItemId * _result; wxPyTreeCtrl * _arg0; wxTreeItemId * _arg1; - long * _arg2 = (long *) &0; + long * _arg2 = (long *) &longzero; PyObject * _argo0 = 0; PyObject * _argo1 = 0; long temp; diff --git a/wxPython/src/msw/misc.cpp b/wxPython/src/msw/misc.cpp index 74872c301c..20fd470466 100644 --- a/wxPython/src/msw/misc.cpp +++ b/wxPython/src/msw/misc.cpp @@ -941,6 +941,24 @@ static PyObject *_wrap_wxGetUserHome(PyObject *self, PyObject *args, PyObject *k return _resultobj; } +static PyObject *_wrap_wxGetProcessId(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + unsigned long _result; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxGetProcessId",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (unsigned long )wxGetProcessId(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + static PyObject *_wrap_wxGetAccelFromString(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxAcceleratorEntry * _result; @@ -4261,6 +4279,7 @@ static PyMethodDef misccMethods[] = { { "wxObject_Destroy", (PyCFunction) _wrap_wxObject_Destroy, METH_VARARGS | METH_KEYWORDS }, { "wxObject_GetClassName", (PyCFunction) _wrap_wxObject_GetClassName, METH_VARARGS | METH_KEYWORDS }, { "wxGetAccelFromString", (PyCFunction) _wrap_wxGetAccelFromString, METH_VARARGS | METH_KEYWORDS }, + { "wxGetProcessId", (PyCFunction) _wrap_wxGetProcessId, METH_VARARGS | METH_KEYWORDS }, { "wxGetUserHome", (PyCFunction) _wrap_wxGetUserHome, METH_VARARGS | METH_KEYWORDS }, { "wxGetHomeDir", (PyCFunction) _wrap_wxGetHomeDir, METH_VARARGS | METH_KEYWORDS }, { "wxGetUserName", (PyCFunction) _wrap_wxGetUserName, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/misc.py b/wxPython/src/msw/misc.py index 119176bae0..dd226a6d01 100644 --- a/wxPython/src/msw/misc.py +++ b/wxPython/src/msw/misc.py @@ -607,6 +607,8 @@ wxGetHomeDir = miscc.wxGetHomeDir wxGetUserHome = miscc.wxGetUserHome +wxGetProcessId = miscc.wxGetProcessId + def wxGetAccelFromString(*_args, **_kwargs): val = apply(miscc.wxGetAccelFromString,_args,_kwargs) if val: val = wxAcceleratorEntryPtr(val) -- 2.47.2