diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-11 16:33:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-11 17:38:34 +0200 |
commit | 32ec981745e6abc9532a443f2e88c465a2fdb480 (patch) | |
tree | b75aff49914e092aaa997e77599a9c2248f32149 /src/plugins/platforms/windows/qwindowsinputcontext.h | |
parent | e941b37fcc715fc20d7365cae21cd657a215cf8f (diff) |
Windows: Adapt to new Lighthouse API
- Implement debug/deprecated options of QSurfaceFormat
- Implement stylehints
- Fixed input context to position the input window correctly.
Change-Id: Icba22f183c6895e30bd34d60cf6d2307ed3188cd
Reviewed-on: http://codereview.qt-project.org/6446
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsinputcontext.h')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsinputcontext.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.h b/src/plugins/platforms/windows/qwindowsinputcontext.h index 2c683ee4e7..17cae5b158 100644 --- a/src/plugins/platforms/windows/qwindowsinputcontext.h +++ b/src/plugins/platforms/windows/qwindowsinputcontext.h @@ -52,6 +52,8 @@ class QInputMethodEvent; class QWindowsInputContext : public QPlatformInputContext { + Q_OBJECT + struct CompositionContext { CompositionContext(); @@ -68,8 +70,7 @@ public: virtual void reset(); virtual void update(Qt::InputMethodQueries); - - virtual void mouseHandler(int x, QMouseEvent *event); + virtual void invokeAction(QInputPanel::Action, int cursorPosition); static QWindowsInputContext *instance(); @@ -81,6 +82,9 @@ public: bool handleIME_Request(WPARAM wparam, LPARAM lparam, LRESULT *result); +private slots: + void cursorRectChanged(); + private: void initContext(HWND hwnd); void doneContext(); |