Changeset 8 for trunk/src/kernel/qrichtext.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/kernel/qrichtext.cpp (modified) (3 diffs)

trunk/src/kernel/qrichtext.cpp

@@ -76 +76 @@
 #endif
 
+#ifdef Q_WS_PM
+#include "qt_os2.h"
+#endif
+
 #define QChar_linesep QChar(0x2028U)
 
@@ -98 +102 @@
             value = value * metrics.logicalDpiY() / gdc;
         ReleaseDC( 0, hdc );
+#elif defined (Q_WS_PM)
+        LONG dpi;
+        DevQueryCaps( GpiQueryDevice( qt_display_ps() ),
+            CAPS_VERTICAL_FONT_RES, 1, &dpi );
+        value = value * metrics.logicalDpiY() / dpi;
 #elif defined (Q_WS_MAC)
         value = value * metrics.logicalDpiY() / 75; // ##### FIXME
@@ -517 +526 @@
     bool justInsert = TRUE;
     QString s( str );
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) 
     if ( checkNewLine ) {
         int i = 0;