From Ton van Overbeek <tvoverbe@wk.estec.esa.nl>:

* rcparse.y (dialog): Default menu and class to be named.
	(styles): If FONT is seen, set DS_SETFONT in dialog style.
	* resbin.c (res_to_bin_dialog): Correct computation of font
	information length.
This commit is contained in:
Ian Lance Taylor
1997-07-31 15:53:23 +00:00
parent 13eb6306e7
commit e42872a2e8
2 changed files with 16 additions and 0 deletions

View File

@@ -319,6 +319,8 @@ dialog:
dialog.height = $8;
dialog.style = WS_POPUP | WS_BORDER | WS_SYSMENU;
dialog.exstyle = $4;
dialog.menu.named = 1;
dialog.class.named = 1;
dialog.font = NULL;
dialog.ex = NULL;
dialog.controls = NULL;
@@ -338,6 +340,8 @@ dialog:
dialog.height = $8;
dialog.style = WS_POPUP | WS_BORDER | WS_SYSMENU;
dialog.exstyle = $4;
dialog.menu.named = 1;
dialog.class.named = 1;
dialog.font = NULL;
dialog.ex = ((struct dialog_ex *)
res_alloc (sizeof (struct dialog_ex)));
@@ -359,6 +363,8 @@ dialog:
dialog.height = $8;
dialog.style = WS_POPUP | WS_BORDER | WS_SYSMENU;
dialog.exstyle = $4;
dialog.menu.named = 1;
dialog.class.named = 1;
dialog.font = NULL;
dialog.ex = ((struct dialog_ex *)
res_alloc (sizeof (struct dialog_ex)));
@@ -406,11 +412,13 @@ styles:
}
| styles FONT numexpr ',' QUOTEDSTRING
{
dialog.style |= DS_SETFONT;
dialog.pointsize = $3;
unicode_from_ascii ((int *) NULL, &dialog.font, $5);
}
| styles FONT numexpr ',' QUOTEDSTRING cnumexpr cnumexpr
{
dialog.style |= DS_SETFONT;
dialog.pointsize = $3;
unicode_from_ascii ((int *) NULL, &dialog.font, $5);
if (dialog.ex == NULL)