From e42872a2e82d38623223495e5fdbaa31dacd2a80 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 31 Jul 1997 15:53:23 +0000 Subject: [PATCH] From Ton van Overbeek : * 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. --- binutils/ChangeLog | 8 ++++++++ binutils/rcparse.y | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index e317514b68c..2d286767d62 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,11 @@ +Thu Jul 31 11:51:35 1997 Ian Lance Taylor + + From Ton van Overbeek : + * 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. + Wed Jul 30 11:21:06 1997 Ian Lance Taylor From Ton van Overbeek : diff --git a/binutils/rcparse.y b/binutils/rcparse.y index 5c0618474a1..0ab87d2cf80 100644 --- a/binutils/rcparse.y +++ b/binutils/rcparse.y @@ -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) -- 2.30.2