diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:45:28 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:45:28 (GMT) |
| commit | 8821284ac4e55caf5fe712fca002e79220e9cf7e (patch) | |
| tree | b1d82e77ee04ee50b24298ae58f46c0980ec0e5d /src/gui/kernel/qcocoapanel_mac.mm | |
| parent | 2c5b7fe040575aa2ee560117c1c3455724c2f9ae (diff) | |
| parent | 13f703741dee67adc7d92e4bcf525431334c9a60 (diff) | |
| download | Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.zip Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.tar.gz Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui/kernel/qcocoapanel_mac.mm')
| -rw-r--r-- | src/gui/kernel/qcocoapanel_mac.mm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/kernel/qcocoapanel_mac.mm b/src/gui/kernel/qcocoapanel_mac.mm index c17b30c..c69826f 100644 --- a/src/gui/kernel/qcocoapanel_mac.mm +++ b/src/gui/kernel/qcocoapanel_mac.mm @@ -49,8 +49,10 @@ #include <QtGui/QWidget> +QT_FORWARD_DECLARE_CLASS(QWidget); +QT_BEGIN_NAMESPACE extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview.mm - +QT_END_NAMESPACE QT_USE_NAMESPACE @implementation QT_MANGLE_NAMESPACE(QCocoaPanel) @@ -108,7 +110,7 @@ QT_USE_NAMESPACE [self retain]; QWidget *widget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self]; - QCocoaView *view = static_cast<QCocoaView *>(qt_mac_nativeview_for(widget)); + QT_MANGLE_NAMESPACE(QCocoaView) *view = static_cast<QT_MANGLE_NAMESPACE(QCocoaView) *>(qt_mac_nativeview_for(widget)); Qt::MouseButton mouseButton = cocoaButton2QtButton([event buttonNumber]); // sometimes need to redirect mouse events to the popup. @@ -157,10 +159,11 @@ QT_USE_NAMESPACE [self release]; } - - (BOOL)makeFirstResponder:(NSResponder *)responder { - if (responder == nil) + // For some reason Cocoa wants to flip the first responder + // when Qt doesn't want to, sorry, but "No" :-) + if (responder == nil && qApp->focusWidget()) return NO; return [super makeFirstResponder:responder]; } @@ -171,7 +174,7 @@ QT_USE_NAMESPACE + (Class)frameViewClassForStyleMask:(NSUInteger)styleMask { if (styleMask & QtMacCustomizeWindow) - return [QCocoaWindowCustomThemeFrame class]; + return [QT_MANGLE_NAMESPACE(QCocoaWindowCustomThemeFrame) class]; return [super frameViewClassForStyleMask:styleMask]; } |