Changeset 44

Show
Ignore:
Timestamp:
09/10/06 18:29:33 (2 years ago)
Author:
dmik
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • psi/trunk/src/common.cpp

    r19 r44  
    2727 
    2828QString PROG_NAME = "Psi"; 
    29 #ifdef Q_WS_PM 
    30 QString PROG_VERSION = "0.10-os2-b1 (" __DATE__ ")"; // OS/2 versions are betas yet 
    31 #else 
    32 //QString PROG_VERSION = "0.11-dev" " (" __DATE__ ")"; //CVS Builds are dated 
    33 QString PROG_VERSION = "0.10"; 
    34 #endif 
     29QString PROG_VERSION = "0.10-os2-b2-dev (" __DATE__ ")"; 
    3530 
    3631#ifdef HAVE_CONFIG 
    …… 
    17471742#endif 
    17481743 
    1749 void bringToFront(QWidget *w, bool) 
     1744void bringToFront(QWidget *w, bool grabFocus /* = true */) 
    17501745{ 
    17511746#ifdef Q_WS_X11 
    …… 
    17711766                        w->showNormal(); 
    17721767        } 
    1773         //if(grabFocus) 
    1774         //      w->setActiveWindow(); 
     1768 
     1769#ifdef Q_WS_WIN 
    17751770        w->raise(); 
    1776         w->setActiveWindow(); 
     1771        if (grabFocus) 
     1772                w->setActiveWindow(); 
     1773#else 
     1774        if(grabFocus) 
     1775                w->setActiveWindow(); 
     1776        else 
     1777                w->raise(); 
     1778#endif 
    17771779} 
    17781780