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 28/02/2013
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_GroupDlg.h
b/src/SMESHGUI/SMESHGUI_GroupDlg.h
index f3cb58f0fe5e90730c2bec23c4228438a8bc3773..638699e19db5bd8633724ba75d64f40770bb5848 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_GroupDlg.h
@@
-85,13
+85,15
@@
public slots:
void onAdd();
void onRemove();
void onAdd();
void onRemove();
+protected slots:
+ virtual void reject();
+
private slots:
void onTypeChanged( int );
void onGrpTypeChanged( int );
void onColorChanged( QColor );
void onOK();
private slots:
void onTypeChanged( int );
void onGrpTypeChanged( int );
void onColorChanged( QColor );
void onOK();
- void onClose();
bool onApply();
void onHelp();
void onDeactivate();
bool onApply();
void onHelp();
void onDeactivate();
@@
-123,9
+125,7
@@
private:
void init( SMESH::SMESH_Mesh_ptr );
void init( SMESH::SMESH_GroupBase_ptr,
const bool theIsConvert = false );
void init( SMESH::SMESH_Mesh_ptr );
void init( SMESH::SMESH_GroupBase_ptr,
const bool theIsConvert = false );
- void closeEvent( QCloseEvent* );
void enterEvent( QEvent* );
void enterEvent( QEvent* );
- void hideEvent( QHideEvent* ); /* ESC key */
void keyPressEvent( QKeyEvent* );
void setSelectionMode( int );
void updateButtons();
void keyPressEvent( QKeyEvent* );
void setSelectionMode( int );
void updateButtons();