Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

* rcparse.y (control): ICON controls take an id as the first

Browse Source 
parameter, not an optional string.  Also, call new convenience
function that takes res_id's.
* resrc.c (define_control): missing text means zero-length string,
not zero ID.
(define_icon_control): New.
* windres.h: declare define_icon_control.
This commit is contained in:
DJ Delorie
2000-06-13 21:21:43 +00:00
parent 98ecb0a78b
commit 2104a50e3e
4 changed files with 65 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
binutils/resrc.c
View File

@@ -847,19 +847,42 @@ define_control (text, id, x, y, width, height, class, style, exstyle)
n->height = height;
n->class.named = 0;
n->class.u.id = class;
if (text != NULL)
res_string_to_id (&n->text, text);
else
{
n->text.named = 0;
n->text.u.id = 0;
}
if (text == NULL)
text = "";
res_string_to_id (&n->text, text);
n->data = NULL;
n->help = 0;
return n;
}
struct dialog_control *
define_icon_control (iid, id, x, y, style, exstyle, help, data, ex)
struct res_id iid;
unsigned long id;
unsigned long x;
unsigned long y;
unsigned long style;
unsigned long exstyle;
unsigned long help;
struct rcdata_item *data;
struct dialog_ex *ex;
{
struct dialog_control *n;
if (style == 0)
style = SS_ICON | WS_CHILD | WS_VISIBLE;
n = define_control (0, id, x, y, 0, 0, CTL_STATIC, style, exstyle);
n->text = iid;
if (help && !ex)
rcparse_warning (_("help ID requires DIALOGEX"));
if (data && !ex)
rcparse_warning (_("control data requires DIALOGEX"));
n->help = help;
n->data = data;
return n;
}
/* Define a font resource. */
void