Changeset 95 for trunk/src/gui/painting

Timestamp:

Jul 31, 2009, 1:13:57 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Added OS/2 stubs for platform-specific parts of all key GUI classes. Non-key classes are temporarily disabled with QT_NO_ defines.

Location:

trunk/src/gui/painting

Files:

• painting.pri (modified) (2 diffs)
• qcolormap_pm.cpp (added)
• qgraphicssystem.cpp (modified) (2 diffs)
• qpaintdevice_pm.cpp (added)
• qregion.cpp (modified) (2 diffs)
• qregion_pm.cpp (added)

trunk/src/gui/painting/painting.pri

@@ -112 +112 @@
 }
 
+os2 {
+        SOURCES += \
+                painting/qcolormap_pm.cpp \
+                painting/qpaintdevice_pm.cpp \
+                painting/qregion_pm.cpp
+}
+
 embedded {
     HEADERS += \
@@ -170 +177 @@
 }
 
-win32|x11|mac|embedded {
+win32|os2|x11|mac|embedded {
         SOURCES += painting/qbackingstore.cpp
         HEADERS += painting/qbackingstore_p.h

trunk/src/gui/painting/qgraphicssystem.cpp

@@ -48 +48 @@
 # include <private/qpixmap_raster_p.h>
 #endif
+#ifdef Q_WS_PM
+# include <private/qpixmap_raster_p.h> // @todo check this
+#endif
 #ifdef Q_WS_MAC
 # include <private/qpixmap_mac_p.h>
@@ -67 +70 @@
 #elif defined(Q_WS_WIN)
     return new QRasterPixmapData(type);
+#elif defined(Q_WS_PM)
+    return new QRasterPixmapData(type); // @todo check this
 #elif defined(Q_WS_MAC)
     return new QMacPixmapData(type);

trunk/src/gui/painting/qregion.cpp

@@ -566 +566 @@
   \sa intersected()
 */
-#if !defined(Q_WS_WIN) || defined(Q_OS_WINCE)
+#if (!defined(Q_WS_WIN) || defined(Q_OS_WINCE)) && !defined(Q_WS_PM)
 QRegion& QRegion::operator&=(const QRegion &r)
     { return *this = *this & r; }
@@ -596 +596 @@
   \sa subtracted()
 */
-#if !defined(Q_WS_WIN) || defined(Q_OS_WINCE)
+#if (!defined(Q_WS_WIN) || defined(Q_OS_WINCE)) && !defined(Q_WS_PM)
 QRegion& QRegion::operator-=(const QRegion &r)
     { return *this = *this - r; }