Module: wine Branch: refs/heads/master Commit: 8f08fe6c0dc9ad3f2d5e00f2b79488eba622cd26 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f08fe6c0dc9ad3f2d5e00f2...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Feb 28 15:27:25 2006 +0100
wrc: Integer ids can be used for control labels instead of strings.
---
tools/wrc/parser.y | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index d001ce2..af8f14b 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -896,11 +896,9 @@ ctrls : /* Empty */ { $$ = NULL; } ;
lab_ctrl - : tSTRING opt_comma expr ',' expr ',' expr ',' expr ',' expr optional_style_pair { + : nameid_s opt_comma expr ',' expr ',' expr ',' expr ',' expr optional_style_pair { $$=new_control(); - $$->title = new_name_id(); - $$->title->type = name_str; - $$->title->name.s_name = $1; + $$->title = $1; $$->id = $3; $$->x = $5; $$->y = $7; @@ -1156,11 +1154,9 @@ gen_exctrl ;
lab_exctrl - : tSTRING opt_comma expr ',' expr ',' expr ',' expr ',' expr optional_style_pair helpid opt_data { + : nameid_s opt_comma expr ',' expr ',' expr ',' expr ',' expr optional_style_pair helpid opt_data { $$=new_control(); - $$->title = new_name_id(); - $$->title->type = name_str; - $$->title->name.s_name = $1; + $$->title = $1; $$->id = $3; $$->x = $5; $$->y = $7;