Changeset 1013 for trunk/src/gui/kernel/qwindowdefs_pm.h

Timestamp:

Aug 20, 2011, 8:26:35 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Export qt_WinProcessWindowObstacles() as APIENTRY and document it.

This routine is necessary when 3rd-party applications paint directly to a HWND
of a Qt Widget bypassing Qt.

File:

• trunk/src/gui/kernel/qwindowdefs_pm.h (modified) (2 diffs)

trunk/src/gui/kernel/qwindowdefs_pm.h

@@ -76 +76 @@
 #define NULLHANDLE ((LHANDLE)0)
 
+#define APIENTRY _System
+
 // constants to address extra window data (nothing so far)
 #define QT_EXTRAWINDATASIZE     (sizeof(LONG) * 0)
@@ -90 +92 @@
 Q_GUI_EXPORT QWidget *qt_widget_from_hwnd(HWND hwnd);
 
-/** \internal flags for qt_WinProcessWindowObstacles() */
-enum {
+enum PWOFlags {
     PWO_Children = 0x01,
-    PWO_Sibings = 0x02,
+    PWO_Siblings = 0x02,
     PWO_Ancestors = 0x04,
     PWO_Screen = 0x08,
     PWO_TopLevel = 0x80000000,
-    // PWO_Default is suitable in most cases (for simple paint operations)
-    PWO_Default = PWO_Children | PWO_Sibings | PWO_Ancestors | PWO_Screen,
+    PWO_Default = 0 /*PWO_Children | PWO_Siblings | PWO_Ancestors | PWO_Screen*/,
 };
 
-Q_GUI_EXPORT LONG qt_WinProcessWindowObstacles(HWND hwnd, RECTL *prcl, HRGN hrgn,
-                                               LONG op, LONG flags = PWO_Default);
+#ifdef Q_QDOC
+LONG qt_WinProcessWindowObstacles(HWND hwnd, RECTL *prcl, HRGN hrgn,
+                                  LONG op, LONG flags);
+#else
+Q_GUI_EXPORT LONG APIENTRY qt_WinProcessWindowObstacles(HWND hwnd, RECTL *prcl,
+                                                        HRGN hrgn, LONG op,
+                                                        LONG flags);
+#endif
 
 // QDebug helpers for debugging various API types