Changeset 44 for psi

Timestamp:

Sep 10, 2006, 6:29:33 PM (18 years ago)

Author:

dmik

Message:

Psi: General: Fixed: bringToFront() was ignoring its grabFocus argument.

File:

• psi/trunk/src/common.cpp (modified) (3 diffs)

psi/trunk/src/common.cpp

@@ -27 +27 @@
 
 QString PROG_NAME = "Psi";
-#ifdef Q_WS_PM
-QString PROG_VERSION = "0.10-os2-b1 (" __DATE__ ")"; // OS/2 versions are betas yet
-#else
-//QString PROG_VERSION = "0.11-dev" " (" __DATE__ ")"; //CVS Builds are dated
-QString PROG_VERSION = "0.10";
-#endif
+QString PROG_VERSION = "0.10-os2-b2-dev (" __DATE__ ")";
 
 #ifdef HAVE_CONFIG
@@ -1747 +1742 @@
 #endif
 
-void bringToFront(QWidget *w, bool)
+void bringToFront(QWidget *w, bool grabFocus /* = true */)
 {
 #ifdef Q_WS_X11
@@ -1771 +1766 @@
                         w->showNormal();
         }
-        //if(grabFocus)
-        //      w->setActiveWindow();
+
+#ifdef Q_WS_WIN
         w->raise();
-        w->setActiveWindow();
+        if (grabFocus)
+                w->setActiveWindow();
+#else
+        if(grabFocus)
+                w->setActiveWindow();
+        else
+                w->raise();
+#endif
 }