Mike Nordell wrote:
> If I am truly wrong regarding this issue you're *all* free to flame me.
But
> until that is proven I think my standpoint is correct.
Thank you for improving the patch code so that it respect the C++ standard.
> I have done some testing on W2k (i.e. NT5) and Win98 and it seems to work.
> I'll commit it within minutes. Since I don't have a "patch" ready for
win32
> would you mind checking that I got the patching right?
It work on Win95 too.
Looking at the code, I see that a little section was left in the file for no
reason in my previous patch. This one removes it. The font enumeration
procedure does the required work of setting the right lfCharSet.
Gilles
Index: abi/src/af/gr/win/gr_Win32Graphics.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/gr/win/gr_Win32Graphics.cpp,v
retrieving revision 1.52
diff -u -r1.52 gr_Win32Graphics.cpp
--- abi/src/af/gr/win/gr_Win32Graphics.cpp 2001/01/06 22:45:18 1.52
+++ abi/src/af/gr/win/gr_Win32Graphics.cpp 2001/01/14 14:47:23
@@ -173,15 +173,6 @@
strcpy(lf.lfFaceName, pszFontFamily);
}
- if (!UT_stricmp(pszFontFamily, "symbol") ||
- !UT_stricmp(pszFontFamily, "wingdings") ||
- !UT_stricmp(pszFontFamily, "webdings") ||
- !UT_stricmp(pszFontFamily, "marlett"))
- {
- lf.lfCharSet = SYMBOL_CHARSET;
- strcpy(lf.lfFaceName, pszFontFamily);
- }
-
// Get character set value from the font itself
LOGFONT enumlf = { 0 };
enumlf.lfCharSet = DEFAULT_CHARSET;
