Changeset 92 for trunk/src/gui/kernel

Timestamp:

Jul 28, 2009, 11:08:37 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Started OS/2 versions of QApplication and QWidget.

Location:

trunk/src/gui/kernel

Files:

• kernel.pri (modified) (2 diffs)
• qapplication.cpp (modified) (4 diffs)
• qapplication_p.h (modified) (1 diff)
• qapplication_pm.cpp (added)
• qwidget.cpp (modified) (5 diffs)
• qwidget.h (modified) (1 diff)
• qwidget_p.h (modified) (1 diff)
• qwidget_pm.cpp (added)
• qwindowdefs_pm.h (modified) (1 diff)

trunk/src/gui/kernel/kernel.pri

@@ -91 +91 @@
 }
 
+os2 {
+        # @todo override everything since most things are not ready...
+        HEADERS = \
+                kernel/qapplication.h \
+                kernel/qapplication_p.h \
+                kernel/qwidget.h \
+                kernel/qwidget_p.h
+        SOURCES = \
+                kernel/qapplication.cpp \
+                kernel/qwidget.cpp
+
+        SOURCES += \
+                kernel/qapplication_pm.cpp \
+                kernel/qwidget_pm.cpp
+}
+
 unix:x11 {
         INCLUDEPATH += ../3rdparty/xorg
@@ -190 +206 @@
                 kernel/qeventdispatcher_mac_p.h
 
-        MENU_NIB.files = mac/qt_menu.nib 
-        MENU_NIB.path = Resources 
+        MENU_NIB.files = mac/qt_menu.nib
+        MENU_NIB.path = Resources
         MENU_NIB.version = Versions
-        QMAKE_BUNDLE_DATA += MENU_NIB 
+        QMAKE_BUNDLE_DATA += MENU_NIB
         RESOURCES += mac/maccursors.qrc
 

trunk/src/gui/kernel/qapplication.cpp

@@ -2579 +2579 @@
         w = leaveList.at(i);
         if (!qApp->activeModalWidget() || QApplicationPrivate::tryModalHelper(w, 0)) {
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_WS_X11)
             if (leaveAfterRelease == w)
                 leaveAfterRelease = 0;
@@ -2952 +2952 @@
 }
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_WS_X11)
 /*
     This function should only be called when the widget changes visibility, i.e.
@@ -3008 +3008 @@
 #endif // QT_NO_CURSOR
 }
-#endif // Q_WS_WIN || Q_WS_X11
+#endif // Q_WS_WIN || Q_WS_PM || Q_WS_X11
 
 /*!
@@ -3498 +3498 @@
     event loop receives events from the window system and dispatches these to
     the application widgets.
- 
+
     Generally, no user interaction can take place before calling exec(). As a
     special case, modal widgets like QMessageBox can be used before calling

trunk/src/gui/kernel/qapplication_p.h

@@ -421 +421 @@
     static bool sendMouseEvent(QWidget *receiver, QMouseEvent *event, QWidget *alienWidget,
                                QWidget *native, QWidget **buttonDown, QPointer<QWidget> &lastMouseReceiver);
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_WS_X11)
     void sendSyntheticEnterLeave(QWidget *widget);
 #endif

trunk/src/gui/kernel/qwidget.cpp

@@ -1346 +1346 @@
     if (isWindow() && isVisible() && internalWinId())
         hide();
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_WS_X11)
     else if (!internalWinId() && isVisible())
         qApp->d_func()->sendSyntheticEnterLeave(this);
@@ -6818 +6818 @@
     // hidden.
     if (wasVisible) {
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_WS_X11)
         qApp->d_func()->sendSyntheticEnterLeave(q);
 #endif
@@ -6947 +6947 @@
             d->show_helper();
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_WS_X11)
             qApp->d_func()->sendSyntheticEnterLeave(this);
 #endif
@@ -7062 +7062 @@
             }
         }
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_WS_X11)
         qApp->d_func()->sendSyntheticEnterLeave(widget);
 #endif
@@ -8645 +8645 @@
 */
 bool QWidget::winEvent(MSG *message, long *result)
+{
+    Q_UNUSED(message);
+    Q_UNUSED(result);
+    return false;
+}
+
+#endif
+#if defined(Q_WS_PM)
+
+/*!
+    This special event handler can be reimplemented in a subclass to
+    receive native OS/2 Presentation Manager events which are passed in
+    the \a message parameter.
+
+    In your reimplementation of this function, if you want to stop the
+    event being handled by Qt, return true and set \a result to the value
+    that the window procedure should return. If you return false, this
+    native event is passed back to Qt, which translates the event into
+    a Qt event and sends it to the widget.
+
+    \warning This function is not portable.
+
+    \sa QApplication::pmEventFilter()
+*/
+bool QWidget::pmEvent(QMSG *message, MRESULT *result)
 {
     Q_UNUSED(message);

trunk/src/gui/kernel/qwidget.h

@@ -658 +658 @@
 #if defined(Q_WS_WIN)
     virtual bool winEvent(MSG *message, long *result);
+#endif
+#if defined(Q_WS_PM)
+    virtual bool pmEvent(QMSG *message, MRESULT *result);
 #endif
 #if defined(Q_WS_X11)

trunk/src/gui/kernel/qwidget_p.h

@@ -594 +594 @@
 #endif
 
-#if defined(Q_WS_X11) || defined (Q_WS_WIN) || defined(Q_WS_MAC)
+#if defined(Q_WS_X11) || defined (Q_WS_WIN)  || defined (Q_WS_PM) || defined(Q_WS_MAC)
 #ifdef Q_WS_MAC
     void setWSGeometry(bool dontShow=false, const QRect &oldRect = QRect());

trunk/src/gui/kernel/qwindowdefs_pm.h

@@ -58 +58 @@
 typedef unsigned long LHANDLE;
 typedef LHANDLE HWND;
+typedef struct _QMSG QMSG;
+typedef void *MRESULT;
 
 typedef HWND WId;
+
+// constants to address extra window data
+#define QWL_QTCLIPRGN       (QWL_USER)
+#define QWL_QTMODAL         (QWL_USER + sizeof(ULONG))
+#define QT_EXTRAWINDATASIZE (sizeof(LONG) * 2)
 
 QT_BEGIN_NAMESPACE