Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_main 12/11/2012
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI.h
diff --git
a/src/SMESHGUI/SMESHGUI.h
b/src/SMESHGUI/SMESHGUI.h
index 4c7e0ef1569784c2bc9bb49f5daba03fb2002baf..6f5237ce3adbdec3627dfbeff7e797b754037cbc 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI.h
+++ b/
src/SMESHGUI/SMESHGUI.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
1
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
2
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
@@
-137,6
+137,8
@@
public :
virtual void createPreferences();
virtual void preferencesChanged( const QString&, const QString& );
virtual void createPreferences();
virtual void preferencesChanged( const QString&, const QString& );
+ virtual void message( const QString& );
+
virtual void update( const int );
static SALOMEDS::Color getUniqueColor( const QList<SALOMEDS::Color>& );
virtual void update( const int );
static SALOMEDS::Color getUniqueColor( const QList<SALOMEDS::Color>& );
@@
-158,7
+160,6
@@
public slots:
virtual void studyClosed( SUIT_Study* );
void onViewClosed( SUIT_ViewWindow* );
virtual void studyClosed( SUIT_Study* );
void onViewClosed( SUIT_ViewWindow* );
-
private slots:
void OnGUIEvent();
void onViewManagerActivated( SUIT_ViewManager* );
private slots:
void OnGUIEvent();
void onViewManagerActivated( SUIT_ViewManager* );