X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FQtx%2FQtxAction.h;h=23a3a686e08d83b83d0836438f65e3db02f25b74;hb=389efae83b99d654509671e60af3eecf11b8278e;hp=2b17df6d8a85fcd5744da4011eb1621b8f1c1364;hpb=399155730966dfc225fbb24f66204b05664385f2;p=modules%2Fgui.git

diff --git a/src/Qtx/QtxAction.h b/src/Qtx/QtxAction.h
index 2b17df6d8..23a3a686e 100755
--- a/src/Qtx/QtxAction.h
+++ b/src/Qtx/QtxAction.h
@@ -1,51 +1,70 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
-// version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:      QtxAction.hxx
-// Author:    Sergey TELKOV
 
+// File:      QtxAction.h
+// Author:    Sergey TELKOV
+//
 #ifndef QTXACTION_H
 #define QTXACTION_H
 
 #include "Qtx.h"
 
-#include <qaction.h>
-#include <qmap.h>
+#include <QWidgetAction>
+
+class QIcon;
 
-class QTX_EXPORT QtxAction : public QAction
+#ifdef WIN32
+#pragma warning ( disable:4251 )
+#endif
+
+class QTX_EXPORT QtxAction : public QWidgetAction
 {
-    Q_OBJECT
+  Q_OBJECT
+
+  class ActionNotify;
 
 public:
-    QtxAction( QObject* = 0, const char* = 0, bool = false );
-    QtxAction( const QString&, const QString&, int, QObject*, const char* = 0, bool = false );
-    QtxAction( const QString&, const QIconSet&, const QString&, int, QObject*, const char* = 0, bool = false );
-    virtual ~QtxAction();
+  QtxAction( QObject* = 0, bool = false, const QString& = QString() );
+  QtxAction( const QString&, const QString&, int, QObject*, bool = false, const QString& = QString() );
+  QtxAction( const QString&, const QIcon&, const QString&, int, QObject*, bool = false, const QString& = QString() );
+  virtual ~QtxAction();
+
+  virtual bool eventFilter( QObject*, QEvent* );
 
-    virtual bool addTo( QWidget* );
-    virtual bool addTo( QWidget*, int );
-    virtual bool removeFrom( QWidget* );
+  QString shortcutActionName() const;
+  void setShortcutActionName( const QString& );
 
 protected:
-    void         setPopup( QWidget*, const int, QPopupMenu* ) const;
+  virtual void addedTo( QWidget* );
+  virtual void removedFrom( QWidget* );
+
+  virtual void customEvent( QEvent* );
 
 private:
-    QMap<QWidget*,int> myMenuIds;
+  QString myShortcutActionName;
 };
 
+#ifdef WIN32
+#pragma warning ( default:4251 )
+#endif
+
 #endif