Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/geom.git] / src / GEOMBase / GEOMBase_Skeleton.h

diff --git a/src/GEOMBase/GEOMBase_Skeleton.h b/src/GEOMBase/GEOMBase_Skeleton.h
index f6c28aadedd0aada0aca10434182f6b272cbb660..fdd00155b5f56c56908727bc64fdb325c3559782 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.h
+++ b/src/GEOMBase/GEOMBase_Skeleton.h
@@ -28,6 +28,8 @@
 #ifndef GEOMBASE_SKELETON_H
 #define GEOMBASE_SKELETON_H
 
+#include "GEOM_GEOMBase.hxx"
+
 #include "DlgRef_Skeleton_QTD.h"
 
 #include "GEOMBase.h"
@@ -41,18 +43,8 @@
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
-//#if defined WNT
-//#include <SALOME_WNT.hxx>
-//#else
-//#define SALOME_WNT_EXPORT
-//#endif
-#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
-#define GEOMBASE_WNT_EXPORT __declspec( dllexport )
-#else
-#define GEOMBASE_WNT_EXPORT
-#endif
-
-class GEOMBASE_WNT_EXPORT GEOMBase_Skeleton : public DlgRef_Skeleton_QTD, public GEOMBase_Helper
+
+class GEOMBASE_EXPORT GEOMBase_Skeleton : public DlgRef_Skeleton_QTD, public GEOMBase_Helper
 {
     Q_OBJECT
 
@@ -66,6 +58,7 @@ private:
 
 protected:
     void closeEvent(QCloseEvent* e);
+    void keyPressEvent(QKeyEvent* e);
 
     /*! initialize "Name" field with a string "thePrefix_X" (Vertex_3)
      */
@@ -86,7 +79,7 @@ protected:
     QString myHelpFileName;
 
 protected slots:
-    void ClickOnCancel();
+    virtual void ClickOnCancel();
     void LineEditReturnPressed();
     void DeactivateActiveDialog();
     void ActivateThisDialog();