Join modifications from BR_Dev_For_4_0 tag V4_1_1.

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

diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
index 8cd85ccc6f3d79b9bc2ff8649090bd7d92eec96c..6a58a84890e742805ea2c45bbab0de7c64f0343b 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
+++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
@@ -27,6 +27,8 @@
 #ifndef SMESHGUI_MultiEditDlg_H
 #define SMESHGUI_MultiEditDlg_H
 
 #ifndef SMESHGUI_MultiEditDlg_H
 #define SMESHGUI_MultiEditDlg_H
 

+#include "SMESH_SMESHGUI.hxx"
+

 #include <qdialog.h>
 
 #include "SUIT_SelectionFilter.h"
 #include <qdialog.h>
 
 #include "SUIT_SelectionFilter.h"


@@ -36,6 +38,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 #include CORBA_SERVER_HEADER(SMESH_Filter)
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 #include CORBA_SERVER_HEADER(SMESH_Filter)

+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)

 
 class SMESHGUI;
 class SMESHGUI_FilterDlg;
 
 class SMESHGUI;
 class SMESHGUI_FilterDlg;


@@ -64,7 +67,7 @@ class QButtonGroup;
  *               union of two neighboring triangles
  */
 
  *               union of two neighboring triangles
  */
 

-class SMESHGUI_MultiEditDlg : public QDialog
+class SMESHGUI_EXPORT SMESHGUI_MultiEditDlg : public QDialog

 {
   Q_OBJECT
 
 {
   Q_OBJECT
 


@@ -108,6 +111,7 @@ protected:
   void                      closeEvent( QCloseEvent* e ) ;
   void                      enterEvent ( QEvent * ) ;
   void                      hideEvent ( QHideEvent * );                        /* ESC key */
   void                      closeEvent( QCloseEvent* e ) ;
   void                      enterEvent ( QEvent * ) ;
   void                      hideEvent ( QHideEvent * );                        /* ESC key */

+  void                      keyPressEvent( QKeyEvent* );

   QFrame*                   createButtonFrame( QWidget* );
   QFrame*                   createMainFrame  ( QWidget*, const bool );
   bool                      isValid( const bool ) const;
   QFrame*                   createButtonFrame( QWidget* );
   QFrame*                   createMainFrame  ( QWidget*, const bool );
   bool                      isValid( const bool ) const;