Changeset 706 for trunk/src

Timestamp:

Apr 26, 2010, 1:05:08 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented drawing widgets through Dive (see #101) and enabled it by default.

Location:

trunk/src/gui

Files:

• kernel/qwidget_pm.cpp (modified) (2 diffs)
• painting/painting.pri (modified) (1 diff)
• painting/qgraphicssystemfactory.cpp (modified) (1 diff)
• painting/qwindowsurface_pm.cpp (added)
• painting/qwindowsurface_pm_p.h (added)

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -56 +56 @@
 #include "private/qbackingstore_p.h"
 #include "private/qwindowsurface_raster_p.h"
+
 
 //#define QT_DEBUGWINCREATEDESTROY
@@ -2471 +2472 @@
 {
     Q_Q(QWidget);
-    return new QRasterWindowSurface(q);
+    QWindowSurface *surface = QPMDiveWindowSurface::create(q);
+    if (!surface)
+        surface = new QRasterWindowSurface(q);
+    return surface;
 }
 

trunk/src/gui/painting/painting.pri

@@ -411 +411 @@
 }
 
-
+os2 {
+        HEADERS += painting/qwindowsurface_pm_p.h
+        SOURCES += painting/qwindowsurface_pm.cpp
+}
 
 symbian {

trunk/src/gui/painting/qgraphicssystemfactory.cpp

@@ -69 +69 @@
         system = QLatin1String("openvg");
     }
-#elif defined (QT_GRAPHICSSYSTEM_RASTER) && !defined(Q_WS_WIN) && !defined(Q_OS_SYMBIAN)
+#elif defined (QT_GRAPHICSSYSTEM_RASTER) && !defined(Q_WS_WIN) && !defined(Q_OS_SYMBIAN)
     if (system.isEmpty()) {
         system = QLatin1String("raster");