Changeset 260 for trunk/src

Timestamp:

Oct 28, 2009, 2:20:27 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QPixmap: Created OS/2 specific methods for converting pixmaps to HBITMAPs and HPOINTERs.

Location:

trunk/src/gui

Files:

• image/qpixmap.h (modified) (2 diffs)
• image/qpixmap_pm.cpp (modified) (1 diff)
• kernel/qwindowdefs_pm.h (modified) (1 diff)
• util/qsystemtrayicon_pm.cpp (modified) (3 diffs)

trunk/src/gui/image/qpixmap.h

@@ -60 +60 @@
 class QVariant;
 class QX11Info;
+
 
 class QPixmapData;
@@ -146 +147 @@
     HBITMAP toWinHBITMAP(HBitmapFormat format = NoAlpha) const;
     static QPixmap fromWinHBITMAP(HBITMAP hbitmap, HBitmapFormat format = NoAlpha);
+
+
+
+
+
+
 #endif
 

trunk/src/gui/image/qpixmap_pm.cpp

@@ -45 +45 @@
 #include "qpixmap_raster_p.h"
 
+
+
+
+
 QT_BEGIN_NAMESPACE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 QPixmap QPixmap::grabWindow(WId winId, int x, int y, int w, int h )

trunk/src/gui/kernel/qwindowdefs_pm.h

@@ -60 +60 @@
 typedef LHANDLE HWND;
 typedef LHANDLE HPS;
+
 typedef LHANDLE HPOINTER;
 typedef LHANDLE HRGN;

trunk/src/gui/util/qsystemtrayicon_pm.cpp

@@ -63 +63 @@
     ~QSystemTrayIconSys();
 
-    HBITMAP createIconMask(const QBitmap &bitmap);
     void createIcon();
 
@@ -93 +92 @@
 }
 
-HBITMAP QSystemTrayIconSys::createIconMask(const QBitmap &bitmap)
-{
-    // @todo
-    return NULL;
-}
-
 void QSystemTrayIconSys::createIcon()
 {
     HPOINTER hIconToDestroy = hIcon;
 
-    // @todo
+    
 
     if (hIconToDestroy != NULLHANDLE)
@@ -212 +205 @@
 void QSystemTrayIconPrivate::updateMenu_sys()
 {
-
+    // nothing to do
 }