Changeset 1283

Timestamp:

Jun 1, 2010, 4:39:03 PM (14 years ago)

Author:

garnier

Message:

try to fix recursive paint

Location:

trunk/source/interfaces/basic

Files:

• include/G4UIQt.hh (modified) (1 diff)
• src/G4UIQt.cc (modified) (2 diffs)

trunk/source/interfaces/basic/include/G4UIQt.hh

@@ -209 +209 @@
   void ResizeTabWidget( QResizeEvent* );
   void CoutFilterCallback(const QString&);
+#if QT_VERSION >= 0x040500
   void TabCloseCallback(int);
   void ToolBoxActivated(int);

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

@@ -324 +324 @@
   // Connect signal
   connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback()));
+#if QT_VERSION >= 0x040500
   connect(fTabWidget,   SIGNAL(tabCloseRequested(int)), this, SLOT(TabCloseCallback(int)));
+#endif
   connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
   connect(fToolBox, SIGNAL(currentChanged(int)), SLOT(ToolBoxActivated(int)));
@@ -2082 +2084 @@
 
   
+#if QT_VERSION >= 0x040500
 void G4UIQt::TabCloseCallback(int a){
-#if QT_VERSION < 0x040000
-  QWidget* temp = fTabWidget->page(a);
-  fTabWidget->removePage (temp);
-#else
   QWidget* temp = fTabWidget->widget(a);
   fTabWidget->removeTab (a);
-#endif
 
   delete temp;
 
   if (fTabWidget->count() == 0) {
-#if QT_VERSION < 0x040000
-    fEmptyViewerTabLabel->reparent(fMyVSplitter,0,QPoint(0,0));
-    fTabWidget->reparent(0,0,QPoint(0,0));  
-#else
     fMyVSplitter->addWidget(fEmptyViewerTabLabel);
     fTabWidget->setParent(0);
-#endif
-  }
-}
+  }
+}
+#endif