Changeset 342

Timestamp:

Nov 23, 2009, 11:35:40 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/image: Added QPixmap fromPmHBITMAP() to convert an OS/2 BITMAP to a QPixmap.

Location:

trunk/src/gui/image

Files:

• qpixmap.h (modified) (1 diff)
• qpixmap_pm.cpp (modified) (4 diffs)

trunk/src/gui/image/qpixmap.h

@@ -151 +151 @@
 #if defined(Q_WS_PM)
     HBITMAP toPmHBITMAP(HBITMAP *mask = 0, bool embedRealAlpha = false) const;
+
     static HPOINTER toPmHPOINTER(const QIcon &icon, bool isPointer = false,
                                  int hotX = 0, int hotY = 0,

trunk/src/gui/image/qpixmap_pm.cpp

@@ -115 +115 @@
 
     \warning This function is only available on OS/2.
+
+
 */
 HBITMAP QPixmap::toPmHBITMAP(HBITMAP *mask, bool embedRealAlpha) const
@@ -120 +122 @@
     if (data->classId() != QPixmapData::RasterClass) {
         QPixmapData *data = new QRasterPixmapData(depth() == 1 ?
-                                                  QPixmapData::BitmapType : QPixmapData::PixmapType);
+                                                  QPixmapData::BitmapType :
+                                                  QPixmapData::PixmapType);
         data->fromImage(toImage(), Qt::AutoColor);
-        return QPixmap(data).toPmHBITMAP(mask);
+        return QPixmap(data).toPmHBITMAP(mask);
     }
 
@@ -230 +233 @@
 
 /*!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     Creates a \c HPOINTER from the given QIcon. Returns the \c HPOINTER handle.
 
@@ -252 +337 @@
 
     \warning This function is only available on OS/2.
+
+
 */
 // static