8507,8526d8506
< 
< procedure SafeChangeFont(aFontToChange: TFont; aLogFont: tagLOGFONTW);
< var
<   LTmpFont: TFont;
< begin
<   LTmpFont := TFont.Create;
<   try
<     LTmpFont.Assign(aFontToChange);
<     LTmpFont.Handle := CreateFontIndirect(aLogFont);
<     if (LTmpFont.Size <> aFontToChange.Size)
<       or (LTmpFont.Name <> aFontToChange.Name)
<       or (LTmpFont.Style <> aFontToChange.Style) then
<     begin
<       aFontToChange.Handle := CreateFontIndirect(aLogFont);
<     end;
<   finally
<     FreeAndNil(LTmpFont);
<   end;
< end;
< 
8538,8541c8518
< //      FIconFont.Handle := CreateFontIndirect(LogFont)
<     begin
<       SafeChangeFont(FIconFont, LogFont);
<     end
---
>       FIconFont.Handle := CreateFontIndirect(LogFont)
8552,8559c8529,8532
<     //  FHintFont.Handle := CreateFontIndirect(NonClientMetrics.lfStatusFont);
<     //  FMenuFont.Handle := CreateFontIndirect(NonClientMetrics.lfMenuFont);
<     //  FMessageFont.Handle := CreateFontIndirect(NonClientMetrics.lfMessageFont);
<     //  FCaptionFont.Handle := CreateFontIndirect(NonClientMetrics.lfCaptionFont);
<       SafeChangeFont(FHintFont, NonClientMetrics.lfStatusFont);
<       SafeChangeFont(FMenuFont, NonClientMetrics.lfMenuFont);
<       SafeChangeFont(FMessageFont, NonClientMetrics.lfMessageFont);
<       SafeChangeFont(FCaptionFont, NonClientMetrics.lfCaptionFont);
---
>       FHintFont.Handle := CreateFontIndirect(NonClientMetrics.lfStatusFont);
>       FMenuFont.Handle := CreateFontIndirect(NonClientMetrics.lfMenuFont);
>       FMessageFont.Handle := CreateFontIndirect(NonClientMetrics.lfMessageFont);
>       FCaptionFont.Handle := CreateFontIndirect(NonClientMetrics.lfCaptionFont);