Changeset 600 for trunk/geant4/visualization/OpenGL/include

Timestamp:

Nov 15, 2007, 11:55:33 AM (17 years ago)

Author:

garnier

Message:

r641@mac-90108: laurentgarnier | 2007-11-12 18:21:36 +0100
modif pour qt3

Location:

trunk/geant4/visualization/OpenGL/include

Files:

• G4OpenGLImmediateQtViewer.hh (modified) (1 diff)
• G4OpenGLQtExportDialog.hh (modified) (1 diff)
• G4OpenGLQtViewer.hh (modified) (4 diffs)
• G4OpenGLStoredQtViewer.hh (modified) (1 diff)

trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateQtViewer.hh,v 1.2 2007/11/08 17:00:51 lgarnier Exp $
+// $Id: G4OpenGLImmediateQtViewer.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtExportDialog.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtExportDialog.hh,v 1.2 2007/11/08 17:00:51 lgarnier Exp $
+// $Id: G4OpenGLQtExportDialog.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
 // GEANT4 tag $Name: 
 //

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.hh,v 1.2 2007/11/08 17:00:51 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -48 +48 @@
 class QDialog;
 class QContextMenuEvent;
+#if QT_VERSION < 0x040000
+class QPopupMenu;
+#else
 class QMenu;
+#endif
 class QImage;
 class QAction;
@@ -70 +74 @@
   void manageContextMenuEvent(QContextMenuEvent *e);
   void G4MousePressEvent(QPoint);
+#if QT_VERSION < 0x040000
+  void G4MouseMoveEvent(int, int, Qt::ButtonState);
+#else
   void G4MouseMoveEvent(int, int, Qt::MouseButtons);
+#endif
+
 
 protected:
@@ -85 +94 @@
   bool generatePS_PDF(QString,int,QImage);  
 
+#if QT_VERSION < 0x040000
+  QPopupMenu *fContextMenu;
+#else
   QMenu *fContextMenu;
+#endif
   bool fMouseAction; // 1: rotate 0:move
   QPoint lastPos;
+#if QT_VERSION < 0x040000
+  QPopupMenu *fDrawingWireframe;
+  QPopupMenu *fDrawingLineRemoval;
+  QPopupMenu *fDrawingSurfaceRemoval;
+  QPopupMenu *fDrawingLineSurfaceRemoval;
+#else
   QAction *fDrawingWireframe;
   QAction *fDrawingLineRemoval;
   QAction *fDrawingSurfaceRemoval;
   QAction *fDrawingLineSurfaceRemoval;
+#endif
 
 private slots :

trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredQtViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.hh,v 1.2 2007/11/08 17:00:51 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //