anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 09:15:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@9995 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2005-06-03 09:10:22 +00:00
parent a53f4592a7
commit 19ec3439cb
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt2/ChangeLog
View File

@ -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> 2005-05-28 José Matos <jamatos@lyx.org>
* QContentPane.[Ch]: implement QIM*Events. This brings the dead * QContentPane.[Ch]: implement QIM*Events. This brings the dead

4
src/frontends/qt2/QContentPane.C
View File

@ -96,7 +96,7 @@ QContentPane::QContentPane(QWorkArea * parent)
setFocusPolicy(QWidget::WheelFocus); setFocusPolicy(QWidget::WheelFocus);
setFocus(); setFocus();
setCursor(ibeamCursor); setCursor(ibeamCursor);
#if QT_VERSION >= 0x030200 #if USE_INPUT_METHODS
// to make qt-immodule work // to make qt-immodule work
setInputMethodEnabled(true); setInputMethodEnabled(true);
#endif #endif
@ -108,7 +108,7 @@ QContentPane::QContentPane(QWorkArea * parent)
} }
#if QT_VERSION >= 0x030200 #if USE_INPUT_METHODS
// to make qt-immodule work // to make qt-immodule work
void QContentPane::imStartEvent(QIMEvent *e) void QContentPane::imStartEvent(QIMEvent *e)
{ {

6
src/frontends/qt2/QContentPane.h
View File

@ -25,6 +25,10 @@
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#if (defined(Q_WS_X11) && QT_VERSION >= 0x030200)
#define USE_INPUT_METHODS 1
#endif
class QWorkArea; class QWorkArea;
/// for emulating triple click /// for emulating triple click
@ -97,7 +101,7 @@ protected:
void wheelEvent(QWheelEvent * e); void wheelEvent(QWheelEvent * e);
/// key press /// key press
void keyPressEvent(QKeyEvent * e); void keyPressEvent(QKeyEvent * e);
#if QT_VERSION >= 0x030200 #if USE_INPUT_METHODS
/// IM events /// IM events
void imStartEvent(QIMEvent *); void imStartEvent(QIMEvent *);
void imComposeEvent(QIMEvent *); void imComposeEvent(QIMEvent *);

2
status.13x
View File

@ -121,7 +121,7 @@ What's new
- Fix crash when using math-mutate with invalid argument. - Fix crash when using math-mutate with invalid argument.
- Implement support for qt-immodule. This fixes the dead key problems - 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. - Fix math fonts display in LyX/Mac.