limit qt-immodule fixes (bug 1830) to qt/x11

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9996 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 5222d0288b4c8cb4f84b5d7a8b40e3c90ae7d114..dcc1a7df7ba65c95a485841d8d5a74bc0de69338 100644 (file)
--- 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-31  Angus Leeming  <leeming@lyx.org>
 
        * QBibtexDialog.C (addDatabase): fix QString ->std::string

diff --git a/src/frontends/qt2/QContentPane.C b/src/frontends/qt2/QContentPane.C
index ceadb7e2c6bb1ccb3f1a23a4cc10c1d7d08cd449..7fb3ca107d2543fd071db6f268195d7a8d8b030a 100644 (file)
--- a/src/frontends/qt2/QContentPane.C
+++ b/src/frontends/qt2/QContentPane.C
@@ -93,7 +93,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
@@ -104,7 +104,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 16b1564a736b3638f1c5b1a00e7ce1d0352cac5c..7cde77b24d8ca8365fc02d105a43316112baab1a 100644 (file)
--- a/src/frontends/qt2/QContentPane.h
+++ b/src/frontends/qt2/QContentPane.h
@@ -24,6 +24,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
@@ -101,7 +105,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 *);