Changeset 849

Timestamp:

Sep 6, 1999, 10:50:35 PM (26 years ago)

Author:

sandervl

Message:

Window text + dialog fixes

Location:

trunk/src/user32/new

Files:

• win32dlg.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/new/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.6 1999-09-05 17:11:25 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.7 1999-09-06 20:50:34 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -19 +19 @@
 #include <win32dlg.h>
 #include "oslibmsg.h"
+
+#define DEFAULT_DLGFONT "9.WarpSans"
 
 //******************************************************************************
@@ -68 +70 @@
         /* The font height must be negative as it is a point size */
         /* (see CreateFont() documentation in the Windows SDK).   */
+#if 0
+        hUserFont = CreateFontA(dlgInfo.pointSize, 0, 0, 0,
+                            dlgInfo.weight, dlgInfo.italic, FALSE,
+                            FALSE, DEFAULT_CHARSET, 0, 0, PROOF_QUALITY,
+                            FF_DONTCARE, DEFAULT_DLGFONT);
+#else
         hUserFont = CreateFontW(dlgInfo.pointSize, 0, 0, 0,
                             dlgInfo.weight, dlgInfo.italic, FALSE,
                             FALSE, DEFAULT_CHARSET, 0, 0, PROOF_QUALITY,
                             FF_DONTCARE, (LPCWSTR)dlgInfo.faceName );
+#endif
         if (hUserFont)
         {

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.13 1999-09-05 18:32:26 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.14 1999-09-06 20:50:35 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -385 +385 @@
 
   if(cs->lpszName)
-        SetWindowTextA((LPSTR)cs->lpszName);
+  {
+        if(isUnicode)
+                SetWindowTextW((LPWSTR)cs->lpszName);
+        else    SetWindowTextA((LPSTR)cs->lpszName);
+  }
 
   OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,