Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2081/src/gui
Modified Files:
wxOptionsDlg.cpp
Log Message:
added MP_PYTHONDLL option allowing to specify full path to the Python DLL
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.413
retrieving revision 1.414
diff -b -u -2 -r1.413 -r1.414
--- wxOptionsDlg.cpp 14 Jul 2004 16:15:32 -0000 1.413
+++ wxOptionsDlg.cpp 18 Sep 2004 17:09:00 -0000 1.414
@@ -70,4 +70,5 @@
#include "TemplateDialog.h"
+#include "MPython.h" // defines USE_PYTHON_DYNAMIC
#include "InitPython.h"
@@ -321,4 +322,9 @@
ConfigField_Python_HelpText,
ConfigField_EnablePython,
+#ifdef USE_PYTHON_DYNAMIC
+ ConfigField_PythonDll_Help,
+ ConfigField_PythonDll,
+#endif // USE_PYTHON_DYNAMIC
+ ConfigField_PythonPath_Help,
ConfigField_PythonPath,
ConfigField_StartupScript,
@@ -1342,4 +1348,15 @@
{ gettext_noop("&Enable Python"), Field_Bool |
Field_AppWide, -1,
},
+#ifdef USE_PYTHON_DYNAMIC
+ { gettext_noop("If Mahogany can't find Python shared library in one of\n"
+ "the standard locations, you may enter full path to it here\n"),
+ Field_Message |
+ Field_AppWide,
ConfigField_EnablePython },
+ { gettext_noop("Python &DLL"), Field_File |
+ Field_AppWide,
ConfigField_EnablePython },
+#endif // USE_PYTHON_DYNAMIC
+ { gettext_noop("The option below determines where we should look for\n"
+ "Python modules (in addition to standard places)"),
Field_Message |
+ Field_AppWide,
ConfigField_EnablePython },
{ gettext_noop("Python &path"), Field_Text |
Field_AppWide,
ConfigField_EnablePython },
@@ -1941,4 +1958,9 @@
CONFIG_NONE(),
CONFIG_ENTRY(MP_USEPYTHON),
+#ifdef USE_PYTHON_DYNAMIC
+ CONFIG_NONE(),
+ CONFIG_ENTRY(MP_PYTHONDLL),
+#endif // USE_PYTHON_DYNAMIC
+ CONFIG_NONE(),
CONFIG_ENTRY(MP_PYTHONPATH),
CONFIG_ENTRY(MP_STARTUPSCRIPT),
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
