diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-10-20 06:55:54 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-10-20 06:55:54 (GMT) |
| commit | 256cadca060900078cfdc749e667f78ac954caea (patch) | |
| tree | fb829ed8f7b6461e08ac1eb55cbebf495d2da37c | |
| parent | 4ae09215de36fcfd17dc6875aca102d784d65012 (diff) | |
| parent | 5b82db6e59aee775a5acc477d6e9dac9c453876d (diff) | |
| download | Qt-256cadca060900078cfdc749e667f78ac954caea.zip Qt-256cadca060900078cfdc749e667f78ac954caea.tar.gz Qt-256cadca060900078cfdc749e667f78ac954caea.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index c966aa3..05c6a5b 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -305,6 +305,8 @@ bool qt_mac_insideKeyWindow(const QWidget *w) { #ifdef QT_MAC_USE_COCOA return [[reinterpret_cast<NSView *>(w->winId()) window] isKeyWindow]; +#else + Q_UNUSED(w); #endif return false; } @@ -3301,7 +3303,11 @@ void QWidgetPrivate::show_sys() [window miniaturize:window]; #endif } else if (!q->testAttribute(Qt::WA_ShowWithoutActivating)) { +#ifndef QT_MAC_USE_COCOA qt_event_request_activate(q); +#else + [qt_mac_window_for(q) makeKeyWindow]; +#endif } } else if(topData()->embedded || !q->parentWidget() || q->parentWidget()->isVisible()) { #ifndef QT_MAC_USE_COCOA @@ -3404,8 +3410,13 @@ void QWidgetPrivate::hide_sys() } #endif } - if(w && w->isVisible() && !w->isMinimized()) - qt_event_request_activate(w); + if(w && w->isVisible() && !w->isMinimized()) { +#ifndef QT_MAC_USE_COCOA + qt_event_request_activate(w); +#else + [qt_mac_window_for(w) makeKeyWindow]; +#endif + } } } else { invalidateBuffer(q->rect()); |