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_FilterDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_FilterDlg.h
b/src/SMESHGUI/SMESHGUI_FilterDlg.h
index 4501a9d373272a881efcab610c8354b2c9381a04..8081aec6994a7fc7434a3bc348862eb79a556db0 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_FilterDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_FilterDlg.h
@@
-238,11
+238,13
@@
signals:
void Accepted();
void Accepted();
+protected slots:
+ virtual void reject();
+
private slots:
void onOk();
bool onApply();
private slots:
void onOk();
bool onApply();
- void onClose();
void onHelp();
void onDeactivate();
void onSelectionDone();
void onHelp();
void onDeactivate();
void onSelectionDone();
@@
-253,7
+255,6
@@
private:
void construct( const QList<int>& );
void construct( const QList<int>& );
- void closeEvent( QCloseEvent* );
void enterEvent( QEvent* );
void keyPressEvent( QKeyEvent* );
void enterEvent( QEvent* );
void keyPressEvent( QKeyEvent* );