Changeset 124 for trunk/src/gui/text/qfont.cpp

Timestamp:

Aug 21, 2009, 3:34:10 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented QWidge::metric(). Added using of test (box) font engines on OS/2.

File:

• trunk/src/gui/text/qfont.cpp (modified) (3 diffs)

trunk/src/gui/text/qfont.cpp

@@ -66 +66 @@
 #include <private/qt_x11_p.h>
 #endif
+#ifdef Q_WS_PM
+#include "qt_os2.h"
+#include "qwindowdefs_pm.h"
+#endif
 #ifdef Q_WS_QWS
 #include "qscreen_qws.h"
@@ -159 +163 @@
 #elif defined(Q_WS_WIN)
     dpi = GetDeviceCaps(shared_dc(),LOGPIXELSX);
+#elif defined(Q_WS_PM)
+    LONG ulDpi;
+    DevQueryCaps(GpiQueryDevice(qt_display_ps()),
+                 CAPS_HORIZONTAL_FONT_RES, 1, &ulDpi);
+    Q_ASSERT(ulDpi != 0);
+    dpi = ulDpi;
 #elif defined(Q_WS_MAC)
     extern float qt_mac_defaultDpi_x(); //qpaintdevice_mac.cpp
@@ -185 +195 @@
 #elif defined(Q_WS_WIN)
     dpi = GetDeviceCaps(shared_dc(),LOGPIXELSY);
+#elif defined(Q_WS_PM)
+    LONG ulDpi;
+    DevQueryCaps(GpiQueryDevice(qt_display_ps()),
+                 CAPS_VERTICAL_FONT_RES, 1, &ulDpi);
+    Q_ASSERT(ulDpi != 0);
+    dpi = ulDpi;
 #elif defined(Q_WS_MAC)
     extern float qt_mac_defaultDpi_y(); //qpaintdevice_mac.cpp