From 6bd1139cb4c877db3d71bc6d864e2c5911c0424e Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Thu, 3 Dec 2009 11:28:55 +0100 Subject: Compile fix for mac after the merge. Reviewed-by: trustme --- src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h index 8e0bb74..f347240 100644 --- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h +++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h @@ -119,6 +119,7 @@ QT_END_NAMESPACE QT_MANGLE_NAMESPACE(QCocoaView) *view = static_cast(qt_mac_nativeview_for(widget)); Qt::MouseButton mouseButton = cocoaButton2QtButton([event buttonNumber]); + bool handled = false; // sometimes need to redirect mouse events to the popup. QWidget *popup = qAppInstance()->activePopupWidget(); if (popup) { -- cgit v0.12 From d648f23094e61705ceea10b2af526872406d022a Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Thu, 3 Dec 2009 11:44:49 +0100 Subject: Fixes: Support gtk-enable-mnemonics on QGtkStyle Task: QTBUG-6484 RevBy: thorbjorn Details: We currently ignore this property. It now maps to SH_UnderlineShortcut. --- src/gui/styles/qgtkstyle.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index b32c55b..9b4d9f8 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -644,6 +644,14 @@ int QGtkStyle::styleHint(StyleHint hint, const QStyleOption *option, const QWidg static bool buttonsHaveIcons = d->getGConfBool(QLS("/desktop/gnome/interface/buttons_have_icons")); return buttonsHaveIcons; } + case SH_UnderlineShortcut: { + gboolean underlineShortcut = true; + if (!d->gtk_check_version(2, 12, 0)) { + GtkSettings *settings = d->gtk_settings_get_default(); + g_object_get(settings, "gtk-enable-mnemonics", &underlineShortcut, + } + return underlineShortcut; + } default: return QCleanlooksStyle::styleHint(hint, option, widget, returnData); -- cgit v0.12