Changeset 1318 for trunk

Timestamp:

Jun 18, 2010, 3:24:55 PM (14 years ago)

Author:

garnier

Message:

fix qt3 bug

File:

• trunk/source/interfaces/basic/src/G4UIQt.cc (modified) (6 diffs)

trunk/source/interfaces/basic/src/G4UIQt.cc

@@ -157 +157 @@
 
 #ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::Initialise after main window creation +++++++++++ %d\n");
+  printf("G4UIQt::Initialise after main window creation +++++++++++\n");
 #endif
 
@@ -310 +310 @@
 
   // Set not visible until session start
+#if QT_VERSION >= 0x040000
+ #if QT_VERSION >= 0x040200
   fMainWindow->setVisible(false);
+ #else
+  fMainWindow->hide();
+ #endif
+#else
+  fMainWindow->hide();
+#endif
 
 #ifdef G4DEBUG_INTERFACES_BASIC
@@ -647 +655 @@
   fTabWidget->setTabSelected(false);
 
+#if QT_VERSION >= 0x040000
+ #if QT_VERSION >= 0x040200
   fTabWidget->setVisible(true);
+ #else
+  fTabWidget->show();
+ #endif
+#else
+  fTabWidget->show();
+#endif
 
   // This will send a paintEvent to OGL Viewers
@@ -667 +683 @@
  */
 void G4UIQt::ResizeTabWidget( QResizeEvent* e) {
-  for (int a=0;a<fTabWidget->count() ;a++) {
+  for (G4int a=0;a<fTabWidget->count() ;a++) {
 #ifdef G4DEBUG_INTERFACES_BASIC
     printf("G4UIQt::ResizeTabWidget +++++++++++++++++++++++++++++++++++++++\n");
@@ -696 +712 @@
   if (fEmptyViewerTabLabel != NULL) {
     if (fTabWidget->isVisible()) {
+#if QT_VERSION >= 0x040000
+  #if QT_VERSION >= 0x040200
       fEmptyViewerTabLabel->setVisible(false);
+  #else
+      fEmptyViewerTabLabel->hide();
+  #endif
+#else
+      fEmptyViewerTabLabel->hide();
+#endif
     } else {
+#if QT_VERSION >= 0x040000
+  #if QT_VERSION >= 0x040200
       fEmptyViewerTabLabel->setVisible(true);
-    }
-  }
-
-  fMainWindow->setVisible(true);
+  #else
+      fEmptyViewerTabLabel->show();
+  #endif
+#else
+      fEmptyViewerTabLabel->show();
+#endif
+    }
+  }
+
+#if QT_VERSION >= 0x040000
+  #if QT_VERSION >= 0x040200
+      fMainWindow->setVisible(true);
+  #else
+      fMainWindow->show();
+  #endif
+#else
+      fMainWindow->show();
+#endif
   // get the size of the tabbar
   int tabBarX;
@@ -2099 +2139 @@
     fEmptyViewerTabLabel->show();
     fTabWidget->setParent(0);
-    fTabWidget->setVisible(false);
+#if QT_VERSION >= 0x040000
+  #if QT_VERSION >= 0x040200
+      fTabWidget->setVisible(false);
+  #else
+      fMainWindow->hide();
+  #endif
+#else
+      fMainWindow->hide();
+#endif
     delete fTabWidget;
     fTabWidget = NULL;