Changeset 5796 for trunk/src/user32/win32dlg.cpp

Timestamp:

May 24, 2001, 9:27:00 PM (24 years ago)

Author:

sandervl

Message:

minor logging updates

File:

• trunk/src/user32/win32dlg.cpp (modified) (3 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.63 2001-05-17 09:50:30 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.64 2001-05-24 19:27:00 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -83 +83 @@
         /* and must be converted to pixels first */
         /* (see CreateFont() documentation in the Windows SDK).   */
-        HDC dc = GetDC(0);
-        int pixels = dlgInfo.pointSize * GetDeviceCaps(dc , LOGPIXELSY)/72;
-        ReleaseDC(0, dc);
+        int pixels;
+        if (((short)dlgInfo.pointSize) < 0)
+            pixels = -((short)dlgInfo.pointSize);
+        else
+        {
+            HDC hdc = GetDC(0);
+            pixels = dlgInfo.pointSize * GetDeviceCaps(hdc, LOGPIXELSY)/72;
+            ReleaseDC(0, hdc);
+        }
 
         hUserFont = CreateFontW(-pixels, 0, 0, 0,
@@ -496 +502 @@
 BOOL Win32Dialog::getCharSize( HFONT hUserFont, SIZE * pSize )
 {
-    HDC  hDC = GetDC(0);
+    HDC  hDC = CreateCompatibleDC(0);
     BOOL Success = getCharSizeFromDC( hDC, hUserFont, pSize );
-    ReleaseDC(0, hDC);
+    DeleteDC(hDC);
     return Success;
 }