From 2d68970c9e319d025a382a4b11cf906dada83c7f Mon Sep 17 00:00:00 2001 From: akl Date: Mon, 28 Apr 2014 15:26:42 +0400 Subject: [PATCH] 0022575: [CEA 1157] SalomePyQt.WT_NoteBook and SalomePyQt.WT_User have the same value. --- src/SALOME_PYQT/SalomePyQt/SalomePyQt.h | 4 ++++ src/SalomeApp/SalomeApp_Application.h | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h index 6d3a0122a..5a658bc21 100644 --- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h +++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h @@ -88,7 +88,11 @@ enum { #endif WT_PyConsole = LightApp_Application::WT_PyConsole, WT_LogWindow = LightApp_Application::WT_LogWindow, +#ifndef GUI_DISABLE_CORBA + WT_User = SalomeApp_Application::WT_User +#else WT_User = LightApp_Application::WT_User +#endif }; enum { diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h index b7355d901..c715722bb 100644 --- a/src/SalomeApp/SalomeApp_Application.h +++ b/src/SalomeApp/SalomeApp_Application.h @@ -72,7 +72,9 @@ public: CatalogGenId, RegDisplayId, SaveGUIStateId, FileLoadId, UserID, SimanCheckInId, SimanLocalCheckInId }; - typedef enum { WT_NoteBook = LightApp_Application::WT_User } WindowTypes; + typedef enum { WT_NoteBook = LightApp_Application::WT_User, + WT_User + } WindowTypes; protected: enum { OpenRefresh = LightApp_Application::OpenReload + 1 }; -- 2.39.2