Changeset 5868 for trunk/src/gdi32/text.cpp

Timestamp:

Jun 1, 2001, 9:59:00 PM (24 years ago)

Author:

sandervl

Message:

ExtTextOutA fix

File:

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

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.23 2001-05-27 19:01:14 sandervl Exp $ */
+/* $Id: text.cpp,v 1.24 2001-06-01 19:59:00 sandervl Exp $ */
 
 /*
@@ -451 +451 @@
 INT SYSTEM EXPORT InternalDrawTextExW(HDC hdc,LPCWSTR lpchText,INT cchText,LPRECT lprc,UINT dwDTFormat,LPDRAWTEXTPARAMS lpDTParams,BOOL isDrawTextEx)
 {
-  char *astring;
+  char *astring = NULL;
   INT  rc;
 
@@ -711 +711 @@
     if (fuOptions & ETO_OPAQUE)
     {
+//SvL: This doesn't seem to work (anymore). Look at MFC apps for the missing border
+//     between menu & button bar (all white). (e.g. odin app & acrobat reader 4.05)
+#if 0
         lpszString = " ";
         cbCount = 1;
         flOptions |= CHSOS_CLIP;
+#else
+        HBRUSH hbrush = CreateSolidBrush(GetBkColor(hdc));
+        HBRUSH oldbrush;
+
+        oldbrush = SelectObject(hdc, hbrush);
+        FillRect(hdc, lprc, hbrush);
+        SelectObject(hdc, oldbrush);
+        return TRUE;
+#endif
     }
     else {