From 3f868107f368ff6737faa7562d5ee1dbaf6a47ef Mon Sep 17 00:00:00 2001
From: Rene Jochum <from_github@pc-dummy.net>
Date: Wed, 4 May 2011 01:54:32 +0200
Subject: [PATCH] Fix dead keys on Mac OS-X, research by dak180.

Fixes #2676
---
 lib/framework/wzapp.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/framework/wzapp.cpp b/lib/framework/wzapp.cpp
index ef1a6aef7d1..41723dc62b0 100644
--- a/lib/framework/wzapp.cpp
+++ b/lib/framework/wzapp.cpp
@@ -193,8 +193,13 @@ WzMainWindow::WzMainWindow(const QGLFormat &format, QWidget *parent) : QGLWidget
 	// Want focusOutEvent messages.
 	setFocusPolicy(Qt::StrongFocus);
 
+#if !defined(WZ_OS_MAC)
 	// Want áéíóú inputMethodEvent messages.
-	setAttribute(Qt::WA_InputMethodEnabled);
+	setAttribute(Qt::WA_InputMethodEnabled, true);
+#else
+	// But not on the Mac (no ALT+H on US Extended Keyboards)
+	setAttribute(Qt::WA_InputMethodEnabled, false);
+#endif
 }
 
 WzMainWindow::~WzMainWindow()
@@ -488,6 +493,8 @@ void WzMainWindow::realHandleKeyEvent(QKeyEvent *event, bool pressed)
 	unsigned int lastKey;
 	bool isKeypad = event->modifiers() & Qt::KeypadModifier;
 
+	debug(LOG_WARNING, "Received normal key %d.\n", event->key());
+
 	switch (event->text().size())
 	{
 		case 0: