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_ScaleDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_ScaleDlg.h
b/src/SMESHGUI/SMESHGUI_ScaleDlg.h
index 7293a99e7811c13735b73b48eab9a65ccca47b50..55bf4acc679cd3d63efdde9b5e75daa122dad57a 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ScaleDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_ScaleDlg.h
@@
-62,9
+62,7
@@
public:
private:
void Init( bool = true );
private:
void Init( bool = true );
- void closeEvent( QCloseEvent* );
void enterEvent( QEvent* ); /* mouse enter the QWidget */
void enterEvent( QEvent* ); /* mouse enter the QWidget */
- void hideEvent( QHideEvent* ); /* ESC key */
void keyPressEvent( QKeyEvent* );
int GetConstructorId();
void setNewMeshName();
void keyPressEvent( QKeyEvent* );
int GetConstructorId();
void setNewMeshName();
@@
-129,12
+127,12
@@
private:
protected slots:
protected slots:
- virtual void onDisplaySimulation( bool );
+ virtual void onDisplaySimulation( bool );
+ virtual void reject();
private slots:
void ConstructorsClicked( int );
void ClickOnOk();
private slots:
void ConstructorsClicked( int );
void ClickOnOk();
- void ClickOnCancel();
bool ClickOnApply();
void ClickOnHelp();
void SetEditCurrentArgument();
bool ClickOnApply();
void ClickOnHelp();
void SetEditCurrentArgument();