Fix a bug of SALOME_PYQT package - to work properly with Sip and PyQt libraries addit...

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index a80d1cc3aa7eab0bf656dd5795a547467c77fb3b..c5cec34a511669f36ee86fb625d3ca97b99893b8 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -87,6 +87,7 @@ PYQT_SIPS = @PYQT_SIPS@
 PYQT_LIBS = @PYQT_LIBS@
 PYQT_INCLUDES = @PYQT_INCLUDES@
 PYUIC = @PYUIC@
+PYQT_SIPFLAGS = @PYQT_SIPFLAGS@
 
 # openGL
 OGL_INCLUDES=@OGL_INCLUDES@

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
index ff3c609530b68ff2395cd3d63988f4c175cfd1d8..5cb5f73141c4786313ca81de4fabb2b8cacab682 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
@@ -24,7 +24,7 @@ QT_VERS = Qt_3_3_0
 endif
 
 # Sip flags
-SIP_FLAGS = -t WS_X11 -t $(QT_VERS) -s ".cc" -c . -I $(PYQT_SIPS)
+SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
 
 # Sip sources
 ifeq ($(SIP_VERS),v4_old)

diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.in b/src/SALOME_PYQT/SalomePyQt/Makefile.in
index 9a55f64137006743c8c5aa6f7f035d8fa13ec4fe..2724198f018acdc3126b81476b3a0bc56dc48128 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/Makefile.in
+++ b/src/SALOME_PYQT/SalomePyQt/Makefile.in
@@ -24,7 +24,8 @@ QT_VERS = Qt_3_3_0
 endif
 
 # Sip flags
-SIP_FLAGS = -t WS_X11 -t $(QT_VERS) -s ".cc" -c . -I $(PYQT_SIPS)
+SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
+
 # Sip common sources
 SIP_SRC = sipSalomePyQtSalomePyQt.cc \
          sipSalomePyQtSALOME_Selection.cc \

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
index 2490c3929ae185741aaf38ed64f56c016ad78edc..4e40c673a101cdaa9be2e079299122ceea7a9c84 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
@@ -39,45 +39,12 @@ enum MenuName {
   Help        = 7  
 };
 
-class QtxAction
+class QtxAction : QAction
 {
 %TypeHeaderCode
 #include <QtxAction.h>
 %End
 
-public:
-  void setIconSet( const QIconSet& );
-  QIconSet iconSet() const;
-  void setText( const QString& );
-  QString text() const;
-  void setMenuText( const QString& );
-  QString menuText() const;
-  void setToolTip( const QString& );
-  QString toolTip() const;
-  void setStatusTip( const QString& );
-  QString statusTip() const;
-  void setWhatsThis( const QString& );
-  QString whatsThis() const;
-  void setAccel( const QKeySequence& );
-  QKeySequence accel() const;
-  void setToggleAction( bool );
-  bool isToggleAction() const;
-  bool isOn() const;
-  bool isEnabled() const;
-  bool isVisible() const;
-
-public slots:
-  void activate();
-  void toggle();
-  void setOn( bool );
-  void setEnabled( bool );
-  void setDisabled( bool );
-  void setVisible( bool );
-
-signals:
-  void activated();
-  void toggled( bool );
-
 private:
   QtxAction(const QtxAction &);
 };

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip
index a7a43beaff64d04efbe4919b74d1b3050b3ee625..f5a4a993b05a178973ed0ec8d18efbdec23ad680 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip
@@ -39,45 +39,12 @@ enum MenuName {
   Help        = 7  
 };
 
-class QtxAction
+class QtxAction : QAction
 {
 %TypeHeaderCode
 #include <QtxAction.h>
 %End
 
-public:
-  void setIconSet( const QIconSet& );
-  QIconSet iconSet() const;
-  void setText( const QString& );
-  QString text() const;
-  void setMenuText( const QString& );
-  QString menuText() const;
-  void setToolTip( const QString& );
-  QString toolTip() const;
-  void setStatusTip( const QString& );
-  QString statusTip() const;
-  void setWhatsThis( const QString& );
-  QString whatsThis() const;
-  void setAccel( const QKeySequence& );
-  QKeySequence accel() const;
-  void setToggleAction( bool );
-  bool isToggleAction() const;
-  bool isOn() const;
-  bool isEnabled() const;
-  bool isVisible() const;
-
-public slots:
-  void activate();
-  void toggle();
-  void setOn( bool );
-  void setEnabled( bool );
-  void setDisabled( bool );
-  void setVisible( bool );
-
-signals:
-  void activated();
-  void toggled( bool );
-
 private:
   QtxAction(const QtxAction &);
 };