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.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index e317514b68c0be5e22f19d8e1bae83637da817b3..2d286767d62a256239c2b3d9da97cc63ca64646b 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jul 31 11:51:35 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+       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.
+
 Wed Jul 30 11:21:06 1997  Ian Lance Taylor  <ian@cygnus.com>
 
        From Ton van Overbeek <tvoverbe@wk.estec.esa.nl>:

diff --git a/binutils/rcparse.y b/binutils/rcparse.y
index 5c0618474a15b4af82d6952bc13c894d82566984..0ab87d2cf80103000836753aa70856833522c14a 100644 (file)
--- 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)