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 'ASL_TREE_STATE' into asl/hydro_porting_741
[modules/gui.git]
/
src
/
SALOME_PYQT
/
SalomePyQt
/
SalomePyQt.h
diff --git
a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
index 6d3a0122a2b0e291ca99e2dab7db4c373292df5f..e9956afd4ffb74fb541d7a5774a602d6420f90fe 100644
(file)
--- a/
src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
+++ b/
src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
@@
-83,12
+83,14
@@
enum MenuName {
enum {
WT_ObjectBrowser = LightApp_Application::WT_ObjectBrowser,
enum {
WT_ObjectBrowser = LightApp_Application::WT_ObjectBrowser,
-#ifndef GUI_DISABLE_CORBA
- WT_NoteBook = SalomeApp_Application::WT_NoteBook,
-#endif
WT_PyConsole = LightApp_Application::WT_PyConsole,
WT_LogWindow = LightApp_Application::WT_LogWindow,
WT_PyConsole = LightApp_Application::WT_PyConsole,
WT_LogWindow = LightApp_Application::WT_LogWindow,
+#ifndef GUI_DISABLE_CORBA
+ WT_NoteBook = SalomeApp_Application::WT_NoteBook,
+ WT_User = SalomeApp_Application::WT_User
+#else
WT_User = LightApp_Application::WT_User
WT_User = LightApp_Application::WT_User
+#endif
};
enum {
};
enum {