From b9ae04920ab4f0d0c10fad9dff55c4ca3e2d2251 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Sat, 28 Jun 2003 02:37:43 +0000 Subject: * rcparse.y (res_text_field): New res_id variable. (res_null_text): New static const struct res_id object, with empty unicode name field. (control): Pop parsing of optresidc up one level. Set res_text_field to $2 except for controls which do not accept a text field. Set res_text_field to res_null_text for the special cases (viz. COMBOBOX, EDITTEXT, LISTBOX, SCROLLBAR). (control_params): Adjust to use res_text_field rather than optresidc. (COMBOBOX): Add comment about discrepency between documented vs. observed default style. * resrc.c (define_control): Make first param const. * windres.h (define_control): Adjust prototype. testsuite: * binutils-all/windres/checkbox.rc: New file. * binutils-all/windres/checkbox.rsd: New file. * binutils-all/windres/combobox.rc: New file. * binutils-all/windres/combobox.rsd: New file. * binutils-all/windres/edittext.rc: New file. * binutils-all/windres/edittext.rsd: New file. * binutils-all/windres/listbox.rc: New file. * binutils-all/windres/listbox.rsd: New file. * binutils-all/windres/scrollbar.rc: New file. * binutils-all/windres/scrollbar.rsd: New file. --- binutils/resrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'binutils/resrc.c') diff --git a/binutils/resrc.c b/binutils/resrc.c index a8955976363..cced3f20113 100644 --- a/binutils/resrc.c +++ b/binutils/resrc.c @@ -819,7 +819,7 @@ define_dialog (id, resinfo, dialog) struct dialog_control * define_control (iid, id, x, y, width, height, class, style, exstyle) - struct res_id iid; + const struct res_id iid; unsigned long id; unsigned long x; unsigned long y; -- cgit v1.2.1