Changeset 8 for trunk/src/kernel/qpixmap.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/kernel/qpixmap.cpp (modified) (4 diffs)

trunk/src/kernel/qpixmap.cpp

@@ -367 +367 @@
 #if defined(Q_WS_WIN)
         hdc = pixmap.hdc;                       // copy Windows device context
+#elif defined(Q_WS_PM)
+        hps = pixmap.hps;                       // copy OS/2 PM presentation space
 #elif defined(Q_WS_X11)
         hd = pixmap.hd;                         // copy X11 drawable
@@ -475 +477 @@
 #if defined(Q_WS_WIN)
         hdc = pixmap.hdc;
+#elif defined(Q_WS_PM)
+        hps = pixmap.hps;
 #elif defined(Q_WS_X11)
         hd = pixmap.hd;                         // copy QPaintDevice drawable
@@ -735 +739 @@
             delete data->mask;
             data->mask = 0;
+#if defined (Q_WS_PM)
+            if ( data->maskedHbm ) {
+                GpiDeleteBitmap( data->maskedHbm );
+                data->maskedHbm = 0;
+            }
+#endif
         }
         return;
@@ -754 +764 @@
     data->alphapm = 0;
 #endif // Q_WS_X11 && !QT_NO_XFTFREETYPE
+
+#if defined (Q_WS_PM)
+    if ( data->maskedHbm ) {
+        GpiDeleteBitmap( data->maskedHbm );
+        data->maskedHbm = 0;
+    }
+#endif
 
     delete data->mask;