From: akl Date: Wed, 30 Apr 2014 10:24:44 +0000 (+0400) Subject: Correction of PyQt enum order to synchronize with C++ one. X-Git-Tag: V7_4_0rc1~6 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fa104712ce972a424c224a723a8d31006782daa3;p=modules%2Fgui.git Correction of PyQt enum order to synchronize with C++ one. --- diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h index 5a658bc21..e9956afd4 100644 --- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h +++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h @@ -83,12 +83,10 @@ enum MenuName { 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, #ifndef GUI_DISABLE_CORBA + WT_NoteBook = SalomeApp_Application::WT_NoteBook, WT_User = SalomeApp_Application::WT_User #else WT_User = LightApp_Application::WT_User diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip index 78af0cd11..2919a905d 100644 --- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip +++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip @@ -68,11 +68,11 @@ enum MenuName { enum WindowType { WT_ObjectBrowser, + WT_PyConsole, + WT_LogWindow, %If (ENABLE_CORBA) WT_NoteBook, %End - WT_PyConsole, - WT_LogWindow, WT_User };