Commit c9197aad authored by Rein Klazes's avatar Rein Klazes Committed by Alexandre Julliard

Fix a bug in the test for italic font style property.

parent 3e22f432
...@@ -444,8 +444,8 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTA *lplf) ...@@ -444,8 +444,8 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTA *lplf)
char stname[20]; char stname[20];
}; };
static struct FONTSTYLE fontstyles[FSTYLES]={ static struct FONTSTYLE fontstyles[FSTYLES]={
{ 0,FW_NORMAL,"Regular"},{0,FW_BOLD,"Bold"}, { 0,FW_NORMAL,"Regular"}, { 1,FW_NORMAL,"Italic"},
{ 1,FW_NORMAL,"Italic"}, {1,FW_BOLD,"Bold Italic"} { 0,FW_BOLD,"Bold"}, { 1,FW_BOLD,"Bold Italic"}
}; };
HFONT hf; HFONT hf;
TEXTMETRICA tm; TEXTMETRICA tm;
...@@ -463,9 +463,9 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTA *lplf) ...@@ -463,9 +463,9 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTA *lplf)
GetTextMetricsA(hdc,&tm); GetTextMetricsA(hdc,&tm);
hf=SelectObject(hdc,hf); hf=SelectObject(hdc,hf);
DeleteObject(hf); DeleteObject(hf);
/* font successful created ? */
if (tm.tmWeight==fontstyles[i].weight && if (tm.tmWeight==fontstyles[i].weight &&
tm.tmItalic==fontstyles[i].italic) /* font successful created ? */ ((tm.tmItalic != 0)==fontstyles[i].italic))
{ {
j=SendMessageA(hwnd,CB_ADDSTRING,0,(LPARAM)fontstyles[i].stname ); j=SendMessageA(hwnd,CB_ADDSTRING,0,(LPARAM)fontstyles[i].stname );
if (j==CB_ERR) return 1; if (j==CB_ERR) return 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment