Changeset 569 for trunk/src/gui/painting/qregion.cpp

Timestamp:

Feb 13, 2010, 6:36:55 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Adopted to 4.6.1 changes.

File:

• trunk/src/gui/painting/qregion.cpp (modified) (11 diffs)

trunk/src/gui/painting/qregion.cpp

@@ -281 +281 @@
     }
 #endif
+#if defined(Q_WS_PM)
+    else {
+        // cause a new HRGN to be created when necessary
+        disposeHandle(d->rgn);
+        d->height = 0;
+    }
+#endif
 }
 
@@ -546 +553 @@
     \sa intersected()
 */
-#if !defined (Q_OS_UNIX) && !defined (Q_WS_WIN)
+#if !defined (Q_OS_UNIX) && !defined (Q_WS_WIN) && !defined (Q_WS_PM)
 QRegion& QRegion::operator+=(const QRect &r)
 {
@@ -569 +576 @@
    \since 4.4
  */
-#if defined (Q_OS_UNIX) || defined (Q_WS_WIN)
+#if defined (Q_OS_UNIX) || defined (Q_WS_WIN) || defined (Q_WS_PM)
 QRegion& QRegion::operator&=(const QRect &r)
 {
@@ -728 +735 @@
 }
 
-#if !defined (Q_OS_UNIX) && !defined (Q_WS_WIN)
+#if !defined (Q_OS_UNIX) && !defined (Q_WS_WIN) && !defined (Q_WS_PM)
 /*!
     \overload
@@ -1091 +1098 @@
 }
 
-#if defined(Q_OS_UNIX) || defined(Q_WS_WIN)
+#if defined(Q_OS_UNIX) || defined(Q_WS_WIN) || defined(Q_WS_PM)
 
 //#define QT_REGION_DEBUG
@@ -1635 +1642 @@
 QT_BEGIN_INCLUDE_NAMESPACE
 # include "qregion_win.cpp"
+QT_END_INCLUDE_NAMESPACE
+#elif defined(Q_WS_PM)
+QT_BEGIN_INCLUDE_NAMESPACE
+# include "qregion_pm.cpp"
 QT_END_INCLUDE_NAMESPACE
 #elif defined(Q_WS_QWS)
@@ -3853 +3864 @@
 #elif defined(Q_WS_WIN)
         d->rgn = 0;
+#elif defined(Q_WS_PM)
+        d->rgn = 0;
+        d->height = 0;
 #endif
         if (t == Rectangle) {
@@ -3878 +3892 @@
 #elif defined(Q_WS_WIN)
             d->rgn = 0;
+#elif defined(Q_WS_PM)
+            d->rgn = 0;
+            d->height = 0;
 #endif
             d->qt_rgn = qt_rgn;
@@ -3910 +3927 @@
 #elif defined(Q_WS_WIN)
         d->rgn = 0;
+#elif defined(Q_WS_PM)
+        d->rgn = 0;
+        d->height = 0;
 #endif
         d->qt_rgn = qt_bitmapToRegion(bm);
@@ -3926 +3946 @@
     if (x->rgn)
         qt_win_dispose_rgn(x->rgn);
+#elif defined(Q_WS_PM)
+    if (x->rgn)
+        disposeHandle(x->rgn);
 #endif
     delete x;
@@ -3960 +3983 @@
 #elif defined(Q_WS_WIN)
     x->rgn = 0;
+#elif defined(Q_WS_PM)
+    x->rgn = 0;
+    x->height = 0;
 #endif
     if (d->qt_rgn)