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

diff --git a/wxPython/b.bat b/wxPython/b.bat
index 23fe76963a180cca76927170e8851b5e84a340d0..3c52574c3b7b8c080d6f48679a758a37dfc58d80 100755 (executable)
--- 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
 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
        shift
 else
        beep

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 318c3fc3ea539917248acbe1b42f89f025c2c440..06812c4e807448ede52bcd6e8170cb1fed3c1a49 100644 (file)
--- 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
 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()
 
     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)
 
     if not KEEP_TEMPS:
         os.remove(ISSFILE)

diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index 29ca4c927ebe7577e1dad627a39301504ee81682..aa63f8a257b7a6e7f6bbd0aee3a8b632c3dc06d6 100644 (file)
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -52,6 +52,11 @@
     static const wxString wxPyEmptyString(wxT(""));
 %}
 
     static const wxString wxPyEmptyString(wxT(""));
 %}
 

+
+%{
+    static const long longzero = 0;
+%}
+

 //----------------------------------------------------------------------
 
 enum {
 //----------------------------------------------------------------------
 
 enum {


@@ -1213,7 +1218,7 @@ public:
 
     size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = TRUE);
 
 
     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);
     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 7256705e4021e02e53496679487333b8254d524d..1298d96f1cccef18852a0a4624ba9266d5771ec1 100644 (file)
--- a/wxPython/src/misc.i
+++ b/wxPython/src/misc.i
@@ -399,6 +399,7 @@ wxString wxGetUserName();
 wxString wxGetHomeDir();
 wxString wxGetUserHome(const wxString& user = wxPyEmptyString);
 
 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);
 
 // 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 b4f94ed28e20ac8bd93891f501d4ddb37f9ac77d..c4dbd0eb176022e2b39738dac72f0be454533ed2 100644 (file)
--- 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(""));
     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);
   // 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;
     wxTreeItemId * _result;
     wxPyTreeCtrl * _arg0;
     wxTreeItemId * _arg1;

-    long * _arg2 = (long *) &0;
+    long * _arg2 = (long *) &longzero;

     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     long  temp;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     long  temp;

diff --git a/wxPython/src/msw/misc.cpp b/wxPython/src/msw/misc.cpp
index 74872c301c5df763e5aa68259aead2625a026c98..20fd4704663ab55c9b52e5e5e04b334c169e2fb6 100644 (file)
--- 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;
 }
 
     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;
 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 },
         { "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 },
         { "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 119176bae036506ac8128beb2b4581b43d0c4603..dd226a6d014a55753f1fe4f7b215190cded46e84 100644 (file)
--- a/wxPython/src/msw/misc.py
+++ b/wxPython/src/msw/misc.py
@@ -607,6 +607,8 @@ wxGetHomeDir = miscc.wxGetHomeDir
 
 wxGetUserHome = miscc.wxGetUserHome
 
 
 wxGetUserHome = miscc.wxGetUserHome
 

+wxGetProcessId = miscc.wxGetProcessId
+

 def wxGetAccelFromString(*_args, **_kwargs):
     val = apply(miscc.wxGetAccelFromString,_args,_kwargs)
     if val: val = wxAcceleratorEntryPtr(val)
 def wxGetAccelFromString(*_args, **_kwargs):
     val = apply(miscc.wxGetAccelFromString,_args,_kwargs)
     if val: val = wxAcceleratorEntryPtr(val)