summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-06-30 15:40:43 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-06-30 15:40:43 +0200
commitee6f25f1fecc375fa6eb10c38e1b074345f898b1 (patch)
tree9070be678f79d0976d7a22fb708934757337d352 /src/corelib
parentce01064f834830793600cedd554dbe37f71a413c (diff)
QEventDispatcherWin32: Remove hook to dispatch GUI events.
In favour of doing it from within the windows procedure to maintain the ordering of messages.
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/kernel/qeventdispatcher_win.cpp6
-rw-r--r--src/corelib/kernel/qeventdispatcher_win_p.h1
2 files changed, 0 insertions, 7 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 4f923bf23e..fc66e9bfd6 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -643,11 +643,6 @@ QEventDispatcherWin32::~QEventDispatcherWin32()
{
}
-bool QEventDispatcherWin32::dispatchGuiEvents(QEventLoop::ProcessEventsFlags)
-{
- return false;
-}
-
bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
{
Q_D(QEventDispatcherWin32);
@@ -750,7 +745,6 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
if (!filterEvent(&msg)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
- dispatchGuiEvents(flags);
}
} 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 1329916b5f..4a7aac0c04 100644
--- a/src/corelib/kernel/qeventdispatcher_win_p.h
+++ b/src/corelib/kernel/qeventdispatcher_win_p.h
@@ -104,7 +104,6 @@ public:
protected:
QEventDispatcherWin32(QEventDispatcherWin32Private &dd, QObject *parent = 0);
- virtual bool dispatchGuiEvents(QEventLoop::ProcessEventsFlags flags);
private:
friend LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp);