aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Tietz <kai.tietz@onevision.com>2012-02-11 15:15:34 +0000
committerKai Tietz <kai.tietz@onevision.com>2012-02-11 15:15:34 +0000
commit7afcdbb2bf95b8bb7e139185b7e53df94aa45a99 (patch)
tree32a15f883dbd0b30eb6b2a2da4f13160a4068f04
parentfd08dafa6554542f0a48eb3bb16c818a42015c7a (diff)
downloadgdb-7afcdbb2bf95b8bb7e139185b7e53df94aa45a99.zip
gdb-7afcdbb2bf95b8bb7e139185b7e53df94aa45a99.tar.gz
gdb-7afcdbb2bf95b8bb7e139185b7e53df94aa45a99.tar.bz2
PR binutils/13297
* resrc.c (write_rc_dialog_control): Omit text dump for EDITTEXT, COMBOBOX, LISTBOX, and SCROLLBAR.
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/resrc.c8
2 files changed, 13 insertions, 1 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 1ff0555..1040f9e 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-11 Kai Tietz <ktietz@redhat.com>
+
+ PR binutils/13297
+ * resrc.c (write_rc_dialog_control): Omit text dump for
+ EDITTEXT, COMBOBOX, LISTBOX, and SCROLLBAR.
+
2012-02-09 Alan Modra <amodra@gmail.com>
* sysdep.h: Include sys/stat.h here.
diff --git a/binutils/resrc.c b/binutils/resrc.c
index 702d2f1..9d1abbc 100644
--- a/binutils/resrc.c
+++ b/binutils/resrc.c
@@ -2650,7 +2650,13 @@ write_rc_dialog_control (FILE *e, const rc_dialog_control *control)
ci = NULL;
}
- if (control->text.named || control->text.u.id != 0)
+ /* For EDITTEXT, COMBOBOX, LISTBOX, and SCROLLBAR don't dump text. */
+ if ((control->text.named || control->text.u.id != 0)
+ && (!ci
+ || (ci->class != CTL_EDIT
+ && ci->class != CTL_COMBOBOX
+ && ci->class != CTL_LISTBOX
+ && ci->class != CTL_SCROLLBAR)))
{
fprintf (e, " ");
res_id_print (e, control->text, 1);