From 19ec3439cb7466e1b673cb9d5487382cfc56f7f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Fri, 3 Jun 2005 09:10:22 +0000
Subject: [PATCH] limit qt-immodule fixes (bug 1830) to qt/x11

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@9995 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt2/ChangeLog      | 5 +++++
 src/frontends/qt2/QContentPane.C | 4 ++--
 src/frontends/qt2/QContentPane.h | 6 +++++-
 status.13x                       | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 2bba1146a3..d216e69529 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-03  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* QContentPane.[Ch]: Limit the QIM*Events to X11. They are not
+	needed (yet) on other OSes (and confuse qt/mac).
+
 2005-05-28  José Matos  <jamatos@lyx.org>
 
 	* QContentPane.[Ch]: implement QIM*Events. This brings the dead
diff --git a/src/frontends/qt2/QContentPane.C b/src/frontends/qt2/QContentPane.C
index 0c58c49bac..1db0c57b41 100644
--- a/src/frontends/qt2/QContentPane.C
+++ b/src/frontends/qt2/QContentPane.C
@@ -96,7 +96,7 @@ QContentPane::QContentPane(QWorkArea * parent)
 	setFocusPolicy(QWidget::WheelFocus);
 	setFocus();
 	setCursor(ibeamCursor);
-#if QT_VERSION >= 0x030200
+#if USE_INPUT_METHODS
 	// to make qt-immodule work
 	setInputMethodEnabled(true);
 #endif
@@ -108,7 +108,7 @@ QContentPane::QContentPane(QWorkArea * parent)
 }
 
 
-#if QT_VERSION >= 0x030200
+#if USE_INPUT_METHODS
 // to make qt-immodule work
 void QContentPane::imStartEvent(QIMEvent *e)
 {
diff --git a/src/frontends/qt2/QContentPane.h b/src/frontends/qt2/QContentPane.h
index 229a195889..acf02d4917 100644
--- a/src/frontends/qt2/QContentPane.h
+++ b/src/frontends/qt2/QContentPane.h
@@ -25,6 +25,10 @@
 
 #include <boost/scoped_ptr.hpp>
 
+#if (defined(Q_WS_X11) && QT_VERSION >= 0x030200)
+#define USE_INPUT_METHODS 1
+#endif
+
 class QWorkArea;
 
 /// for emulating triple click
@@ -97,7 +101,7 @@ protected:
 	void wheelEvent(QWheelEvent * e);
 	/// key press
 	void keyPressEvent(QKeyEvent * e);
-#if QT_VERSION >= 0x030200
+#if USE_INPUT_METHODS
 	/// IM events
 	void imStartEvent(QIMEvent *);
 	void imComposeEvent(QIMEvent *);
diff --git a/status.13x b/status.13x
index 00461b9cb7..f4141e7746 100644
--- a/status.13x
+++ b/status.13x
@@ -121,7 +121,7 @@ What's new
 - Fix crash when using math-mutate with invalid argument.
 
 - Implement support for qt-immodule. This fixes the dead key problems
-  with some newer qt versions [bug 1830].
+  with some newer qt/x11 versions [bug 1830].
 
 - Fix math fonts display in LyX/Mac.