Update of /cvsroot/mahogany/M/src/Python
In directory sc8-pr-cvs1:/tmp/cvs-serv7349/src/Python
Modified Files:
InitPython.cpp PythonHelp.cpp
Log Message:
cygwin PATH problem and few unicode fixes
Index: InitPython.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/Python/InitPython.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -b -u -2 -r1.29 -r1.30
--- InitPython.cpp 23 Oct 2001 20:27:36 -0000 1.29
+++ InitPython.cpp 22 Jul 2003 12:07:37 -0000 1.30
@@ -77,5 +77,5 @@
// set PYTHONPATH correctly to find our modules
- String tmp = "PYTHONPATH=";
+ String tmp = _T("PYTHONPATH=");
String path = READ_APPCONFIG(MP_PYTHONPATH);
@@ -88,5 +88,5 @@
{
// not installed
- pythondir << mApplication->GetDataDir() << DIR_SEPARATOR << "Python";
+ pythondir << mApplication->GetDataDir() << DIR_SEPARATOR << _T("Python");
}
else
@@ -97,11 +97,11 @@
// note that "scripts" has small 's'
path << pythondir << PATH_SEPARATOR
- << pythondir << DIR_SEPARATOR << "Python" << PATH_SEPARATOR
- << pythondir << DIR_SEPARATOR << "scripts"
+ << pythondir << DIR_SEPARATOR << _T("Python") << PATH_SEPARATOR
+ << pythondir << DIR_SEPARATOR << _T("scripts")
// add also the uninstalled locations
#ifdef M_TOP_BUILDDIR
// but "Python/Scripts" has a capital 'S'!
- << PATH_SEPARATOR << M_TOP_BUILDDIR << "/src/Python"
- << PATH_SEPARATOR << M_TOP_BUILDDIR << "/src/Python/Scripts"
+ << PATH_SEPARATOR << M_TOP_BUILDDIR << _T("/src/Python")
+ << PATH_SEPARATOR << M_TOP_BUILDDIR << _T("/src/Python/Scripts")
#endif
;
@@ -111,5 +111,5 @@
{
path << PATH_SEPARATOR
- << localdir << DIR_SEPARATOR << "Scripts" << PATH_SEPARATOR;
+ << localdir << DIR_SEPARATOR << _T("Scripts") << PATH_SEPARATOR;
}
}
Index: PythonHelp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/Python/PythonHelp.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -u -2 -r1.25 -r1.26
--- PythonHelp.cpp 8 Sep 2002 19:23:08 -0000 1.25
+++ PythonHelp.cpp 22 Jul 2003 12:07:37 -0000 1.26
@@ -360,5 +360,5 @@
wxString filename = mApplication->GetGlobalDir();
- filename << DIR_SEPARATOR << "scripts";
+ filename << DIR_SEPARATOR << _T("scripts");
FILE *file = fopen(filename,"rb");
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
