Changeset 705 for trunk/src

Timestamp:

Apr 26, 2010, 1:02:23 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Added QWidget::addPmEventFilter()/removPmEventFilter() (OS/2 specific).

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (1 diff)
• qwidget.h (modified) (1 diff)
• qwidget_p.h (modified) (1 diff)
• qwidget_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -941 +941 @@
             if (!qt_try_modal(widget, &qmsg, rc))
                 return rc;
+        }
+
+        if (widget->xtra()) { // send through widget filter list
+            foreach(QWidget::PmEventFilter *filter, widget->xtra()->pmEventFilters) {
+                if (filter->pmEventFilter(&qmsg, &rc))
+                    return rc;
+            }
         }
 

trunk/src/gui/kernel/qwidget.h

@@ -604 +604 @@
     HPS getPS() const;
     void releasePS(HPS) const;
+
+    struct PmEventFilter {
+        virtual bool pmEventFilter(QMSG *message, MRESULT *result) = 0;
+    };
+    void addPmEventFilter(PmEventFilter *filter);
+    void removePmEventFilter(PmEventFilter *filter);
 #else
     Qt::HANDLE handle() const;

trunk/src/gui/kernel/qwidget_p.h

@@ -277 +277 @@
     uint receiveNativePaintEvents : 1;
 
+#elif defined(Q_WS_PM) // <----------------------------------------------------- PM
+    QList<QWidget::PmEventFilter*> pmEventFilters;
 #endif
 };

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1778 +1778 @@
 }
 
+/*!
+    Adds the PM event filter to this widget. This is functionally equivalent to
+    overriding the QWidget::pmEvent() virtual method.
+
+    Note that the event filters added with this method are called before
+    QWidget::pmEvent() and may prevent Qt from further event processing
+    including passing it to QWidget::pmEvent(). The order in which these filters
+    are called corresponds to the order they are added to this widget.
+
+    \warning This function is not portable and exists only on OS/2.
+*/
+void QWidget::addPmEventFilter(PmEventFilter *filter)
+{
+    Q_D(QWidget);
+    d->createExtra();
+    d->extra->pmEventFilters.prepend(filter);
+}
+
+/*!
+    Removes the PM event filter added with addPmEventFilter() from this widget.
+
+    \warning This function is not portable and exists only on OS/2.
+*/
+void QWidget::removePmEventFilter(PmEventFilter *filter)
+{
+    Q_D(QWidget);
+    if (d->extra)
+        d->extra->pmEventFilters.removeOne(filter);
+}
+
 void QWidgetPrivate::hide_sys()
 {