Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch V7_3_1_BR
[modules/gui.git]
/
src
/
SUITApp
/
SUITApp.cxx
diff --git
a/src/SUITApp/SUITApp.cxx
b/src/SUITApp/SUITApp.cxx
index 7c5a6a262a7b4e11708322007152340463781772..9340f4d00bd924b4852281884ea250440b28d9f0 100644
(file)
--- a/
src/SUITApp/SUITApp.cxx
+++ b/
src/SUITApp/SUITApp.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,21
+20,21
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-//#if
defined WIN32
-//#if
def SUIT_ENABLE_PYTHON
-//#
undef SUIT_ENABLE_PYTHON
+//#ifdefined WIN32
+//#if
ndef DISABLE_PYCONSOLE
+//#
define DISABLE_PYCONSOLE
//#endif
//#else //#if defined WIN32
//#endif
//#else //#if defined WIN32
-//#if
ndef SUIT_ENABLE_PYTHON
+//#if
def DISABLE_PYCONSOLE
// NOTE: DO NOT DELETE THIS DEFINITION ON LINUX
// or make sure Python is initialized in main() in any case
// Otherwise, application based on light SALOME and using Python
// are unlikely to work properly.
// NOTE: DO NOT DELETE THIS DEFINITION ON LINUX
// or make sure Python is initialized in main() in any case
// Otherwise, application based on light SALOME and using Python
// are unlikely to work properly.
-//#
define SUIT_ENABLE_PYTHON
+//#
undef DISABLE_PYCONSOLE
//#include <Python.h>
//#endif
//
//#include <Python.h>
//#endif
//
-#if
def SUIT_ENABLE_PYTHON
+#if
ndef DISABLE_PYCONSOLE
#include "SUITApp_init_python.hxx"
#endif
#include "SUITApp_init_python.hxx"
#endif
@@
-156,7
+156,7
@@
private:
int main( int argc, char* argv[] )
{
int main( int argc, char* argv[] )
{
- //#if
def SUIT_ENABLE_PYTHON
+ //#if
ndef DISABLE_PYCONSOLE
// // First of all initialize Python, as in complex multi-component applications
// // someone else might initialize it some way unsuitable for light SALOME!
// Py_SetProgramName( argv[0] );
// // First of all initialize Python, as in complex multi-component applications
// // someone else might initialize it some way unsuitable for light SALOME!
// Py_SetProgramName( argv[0] );
@@
-272,7
+272,7
@@
int main( int argc, char* argv[] )
}
}
}
}
-#if
def SUIT_ENABLE_PYTHON
+#if
ndef DISABLE_PYCONSOLE
//...Initialize python
int _argc = 1;
char* _argv[] = {(char*)""};
//...Initialize python
int _argc = 1;
char* _argv[] = {(char*)""};