Changeset 1036 for tests

Timestamp:

Aug 29, 2011, 2:17:00 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

tests/embedded: Updated with QT_PM_NATIVEWIDGETMASK.

File:

• tests/embedded/embedded.cpp (modified) (5 diffs)

tests/embedded/embedded.cpp

@@ -1 @@
-#include <QDebug>
-#include <QtGui>
+#include <QtGlobal>
 
 #ifdef Q_WS_PM
@@ -9 +8 @@
 #include <qt_windows.h>
 #endif
+
+
+
 
 class VideoWidget : public QFrame
@@ -117 +119 @@
         {
             videoWidget->resize (800, 600);
+
+
+
+
+
+
             resize(size() - stackCentralW->size() + QSize(800, 600));
         }
@@ -124 +132 @@
         {
             qDebug() << "window handle" << qDebugFmtHex (id);
+
+
+
             HWND hwnd = id;
             RECTL rcl;
@@ -130 +141 @@
             if (hps)
             {
+
                 HRGN hrgn = GpiCreateRegion(hps, 1L, &rcl);
-                qt_WinProcessWindowObstacles (hwnd, NULL, hrgn, CRGN_DIFF, PWO_Default);
-
-                HRGN hrgnOld;
-                GpiSetClipRegion (hps, hrgn, &hrgnOld);
-
-                rcl.xLeft = 0;
-                rcl.yBottom = 0;
-                rcl.xRight = videoWidget->size().width();
-                rcl.yTop = videoWidget->size().height();
-
-                qDebug() << rcl.xRight << rcl.yTop;
-
-                WinDrawBorder (hps, &rcl, 3, 3, CLR_RED, CLR_DARKGREEN, DB_INTERIOR);
-
-                GpiDestroyRegion (hps, hrgnOld);
-
+                ULONG rc = qt_WinProcessWindowObstacles (hwnd, NULL, hrgn, CRGN_DIFF, PWO_Default);
+                qDebug() << "rc" << rc;
+                
+                if (rc == RGN_RECT || rc == RGN_COMPLEX)
+                {
+                    HRGN hrgnOld;
+                    GpiSetClipRegion (hps, hrgn, &hrgnOld);
+                    hrgn = hrgnOld;
+#endif
+                    rcl.xLeft = 0;
+                    rcl.yBottom = 0;
+                    rcl.xRight = videoWidget->size().width();
+                    rcl.yTop = videoWidget->size().height();
+
+                    qDebug() << rcl.xRight << rcl.yTop;
+
+                    WinDrawBorder (hps, &rcl, 3, 3, CLR_RED, CLR_DARKGREEN, DB_INTERIOR);
+                    
+#ifdef QT_PM_NATIVEWIDGETMASK
+                }
+
+                GpiDestroyRegion (hps, hrgn);
+#endif
                 WinReleasePS (hps);
             }