summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-06-22 12:23:59 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-06-22 13:43:47 +0200
commit111068f383a365d1aca453c6793aafb1f7faeca3 (patch)
treed6bf139d3928e7e564642067461b9d0aafd6f0dd /src/corelib/kernel
parent8c42defe671eddff5082ba20a7bd1060e41b8faf (diff)
Add QGuiEventDispatcherWin32.
Dispatches Gui events after DispatchMessage(). Reviewed-by: Samuel Rødal <sroedal@trolltech.com> Reviewed-by: Morten Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qeventdispatcher_win.cpp6
-rw-r--r--src/corelib/kernel/qeventdispatcher_win_p.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index fc66e9bfd6..d8fc208bf7 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -643,6 +643,11 @@ QEventDispatcherWin32::~QEventDispatcherWin32()
{
}
+bool QEventDispatcherWin32::dispatchGuiEvents()
+{
+ return false;
+}
+
bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
{
Q_D(QEventDispatcherWin32);
@@ -745,6 +750,7 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
if (!filterEvent(&msg)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
+ dispatchGuiEvents();
}
} else if (waitRet >= WAIT_OBJECT_0 && waitRet < WAIT_OBJECT_0 + nCount) {
d->activateEventNotifier(d->winEventNotifierList.at(waitRet - WAIT_OBJECT_0));
diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h
index 4a7aac0c04..8d9de7e364 100644
--- a/src/corelib/kernel/qeventdispatcher_win_p.h
+++ b/src/corelib/kernel/qeventdispatcher_win_p.h
@@ -104,6 +104,7 @@ public:
protected:
QEventDispatcherWin32(QEventDispatcherWin32Private &dd, QObject *parent = 0);
+ virtual bool dispatchGuiEvents();
private:
friend LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp);