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
PR: synchro V7_main tag mergefrom_V6_main_28Feb13
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MultiEditDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
index de9b0b67fed258a5ffe313a603a25fe72ee53f78..4c0aa432c268cb9270d5970caa9a8bc06f826ced 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_MultiEditDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_MultiEditDlg.h
@@
-82,7
+82,7
@@
signals:
protected slots:
void onOk();
virtual bool onApply();
protected slots:
void onOk();
virtual bool onApply();
- virtual void
onClose
();
+ virtual void
reject
();
void onHelp();
void onDeactivate();
void onHelp();
void onDeactivate();
@@
-102,9
+102,7
@@
protected slots:
SMESH::NumericalFunctor_ptr getNumericalFunctor();
protected:
SMESH::NumericalFunctor_ptr getNumericalFunctor();
protected:
- void closeEvent( QCloseEvent* );
void enterEvent( QEvent * );
void enterEvent( QEvent * );
- void hideEvent( QHideEvent* ); /* ESC key */
void keyPressEvent( QKeyEvent* );
QWidget* createButtonFrame( QWidget* );
QWidget* createMainFrame( QWidget*, const bool );
void keyPressEvent( QKeyEvent* );
QWidget* createButtonFrame( QWidget* );
QWidget* createMainFrame( QWidget*, const bool );
@@
-221,7
+219,7
@@
protected:
SMESH::SMESH_IDSource_ptr obj);
protected slots:
SMESH::SMESH_IDSource_ptr obj);
protected slots:
- virtual void
onClose
();
+ virtual void
reject
();
void onCriterionRB();
void onPreviewChk();
void onCriterionRB();
void onPreviewChk();