PR: synchro V7_main tag mergefrom_V6_main_28Feb13

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_Preferences_ScalarBarDlg.h

diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
index 05dea0f597033bc0a5ab2333b435ca67dabd5a05..6b3196e4cd48d94216476763b6df8f872ad3e3ca 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
+++ b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
@@ -64,17 +64,18 @@ public:
 
   static void              ScalarBarProperties( SMESHGUI* );
 
-  void                     closeEvent( QCloseEvent* );
   void                     setOriginAndSize( const double,
                                              const double,
                                              const double,
                                              const double );
   void                     initScalarBarFromResources();
 
+protected slots:
+  virtual void             reject();
+
 protected slots:
   void                     onOk();
   bool                     onApply();
-  void                     onCancel();
   void                     onHelp();
   void                     onSelectionChanged();
   void                     onXYChanged();