Updates to Timer class and a couple of wxDC methods.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-11-28 22:13:33 +00:00
parent b9cf5e6d2b
commit 05a8bfed08
3 changed files with 22 additions and 6 deletions
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -1104,14 +1104,24 @@ void wxDC::EndPage()

 wxCoord wxDC::GetCharHeight() const
 {
-    // TODO
-    return(8);
+    FONTMETRICS                     vFM; // metrics structure
+
+    ::GpiQueryFontMetrics( m_hPS
+                          ,sizeof(FONTMETRICS)
+                          ,&vFM
+                         );
+    return YDEV2LOGREL(vFM.lXHeight);
 }

 wxCoord wxDC::GetCharWidth() const
 {
-    // TODO
-    return(8);
+    FONTMETRICS                     vFM; // metrics structure
+
+    ::GpiQueryFontMetrics( m_hPS
+                          ,sizeof(FONTMETRICS)
+                          ,&vFM
+                         );
+    return XDEV2LOGREL(vFM.lAveCharWidth);
 }

 void wxDC::DoGetTextExtent(