From: vsr <vsr@opencascade.com>
Date: Tue, 10 Nov 2009 06:49:36 +0000 (+0000)
Subject: Integrate patch from G.David (workaround the bug of sip 4.8)
X-Git-Tag: V5_1_3rc2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=aef922b7be3754097b9cae28dbee31c794a2bf00;p=modules%2Fgui.git

Integrate patch from G.David (workaround the bug of sip 4.8)
---

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
index 2bf1056cb..a985518c8 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
@@ -1185,7 +1185,13 @@ void SALOME_PYQT_ModuleLight::contextMenu( const QString& theContext, QMenu* the
   if ( myXmlHandler )
     myXmlHandler->createPopup( thePopupMenu, aContext, aParent, aObject );
 
-  PyObjWrapper sipPopup( sipBuildResult( 0, "M", thePopupMenu, sipClass_QMenu ) );
+  PyObjWrapper sipPopup( sipBuildResult( 0, "D", thePopupMenu, 
+#if SIP_VERSION < 0x040800
+                                                         sipClass_QMenu
+#else
+                                                         sipType_QMenu
+#endif
+  , NULL) );
 
   // then call Python module's createPopupMenu() method (for new modules)
   if ( PyObject_HasAttrString( myModule, "createPopupMenu" ) ) {
@@ -1397,7 +1403,13 @@ void SALOME_PYQT_ModuleLight::setWorkSpace()
       if ( aDesktop )
         aWorkspace = aDesktop->workstack();
     }
-    PyObjWrapper pyws( sipBuildResult( 0, "M", aWorkspace, sipClass_QWidget ) );
+    PyObjWrapper pyws( sipBuildResult( 0, "D", aWorkspace, 
+#if SIP_VERSION < 0x040800
+                                                         sipClass_QWidget
+#else
+                                                         sipType_QWidget
+#endif
+  , NULL) );
     // ... and finally call Python module's setWorkspace() method (obsolete)
     if ( PyObject_HasAttrString( myModule, "setWorkSpace" ) ) {
       PyObjWrapper res( PyObject_CallMethod( myModule, (char*)"setWorkSpace", (char*)"O", pyws.get() ) );
@@ -2460,13 +2472,13 @@ void SALOME_PYQT_ModuleLight::openEvent(QStringList theListOfFiles, bool &opened
     return;
   QStringList* theList = new QStringList(theListOfFiles);
 
-  PyObjWrapper sipList( sipBuildResult( 0, "M", theList,
+  PyObjWrapper sipList( sipBuildResult( 0, "D", theList,
 #if SIP_VERSION < 0x040800
                                                          sipClass_QStringList
 #else
                                                          sipType_QStringList
 #endif
-  ) );
+  , NULL) );
   if ( PyObject_HasAttrString(myModule , "openFiles") ) {
     PyObjWrapper res( PyObject_CallMethod( myModule, (char*)"openFiles",
 					   (char*)"O", sipList.get()));