Changeset 3062

Show
Ignore:
Timestamp:
03/24/03 13:17:54 (6 years ago)
Author:
himi
Message:

(mw32_logfont_equal): Check lfCharSet as well.
(mw32_set_encoding_to_lf): When encoding is Q2_byte_set_msb,
set ENCODING_BYTE2MSB11 instead.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • work/cvs2svn/src/mw32font.c

    r3055 r3062  
    341341      LOGFONT *plf2 = &((mw32_windows_font*) other->pphys)->logfont; 
    342342 
    343       return mw32_lf_equal(self, other) 
    344         && LF_EQUAL_ELEM(lfWeight) 
    345         && LF_EQUAL_ELEM(lfItalic) 
    346         && LF_EQUAL_ELEM(lfUnderline) 
    347         && LF_EQUAL_ELEM(lfStrikeOut) 
    348         && strcmp(plf1->lfFaceName, plf2->lfFaceName) == 0; 
     343      return (mw32_lf_equal (self, other) 
     344              && LF_EQUAL_ELEM (lfCharSet) 
     345              && LF_EQUAL_ELEM (lfWeight) 
     346              && LF_EQUAL_ELEM (lfItalic) 
     347              && LF_EQUAL_ELEM (lfUnderline) 
     348              && LF_EQUAL_ELEM (lfStrikeOut) 
     349              && strcmp (plf1->lfFaceName, plf2->lfFaceName) == 0); 
    349350      /* 
    350351        The following variables are ignored. 
    …… 
    10661067  else if (EQ (encoding, Q2_byte_set_msb)) 
    10671068    { 
    1068       plf->encoding.type = ENCODING_BYTE2MSB1; 
     1069      plf->encoding.type = ENCODING_BYTE2MSB11; 
    10691070      plf->encoding.font_unit_byte = 2; 
    10701071    }