From 8e085b98fd2a40630ed797cc5ef7ef4d49638ab3 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Mon, 1 Oct 2001 06:31:40 +0000 Subject: [PATCH] * widget.h: Use type "buttonbarfn" more consistently. * widget.c: Likewise. --- src/ChangeLog | 3 +++ src/widget.c | 4 ++-- src/widget.h | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9e7a3dd51..0cd1f7405 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2001-10-01 Pavel Roskin + * widget.h: Use type "buttonbarfn" more consistently. + * widget.c: Likewise. + * setup.c [!USE_VFS]: Warning fix. * hotlist.c [!USE_VFS]: Likewise. diff --git a/src/widget.c b/src/widget.c index 3a9a0ef7b..29e1d2497 100644 --- a/src/widget.c +++ b/src/widget.c @@ -2364,7 +2364,7 @@ define_label_data (Dlg_head *h, Widget *paneletc, int idx, char *text, return; set_label_text (bb, idx, text); - bb->labels [idx-1].function = (void (*)(void *)) cback; + bb->labels [idx-1].function = cback; bb->labels [idx-1].data = data; x_redefine_label (bb, idx); } @@ -2372,7 +2372,7 @@ define_label_data (Dlg_head *h, Widget *paneletc, int idx, char *text, void define_label (Dlg_head *h, Widget *paneletc, int idx, char *text, void (*cback)(void)) { - define_label_data (h, paneletc, idx, text, (void (*)(void *)) cback, 0); + define_label_data (h, paneletc, idx, text, (buttonbarfn) cback, 0); } void diff --git a/src/widget.h b/src/widget.h index 4e2f6371d..039fd2c9f 100644 --- a/src/widget.h +++ b/src/widget.h @@ -133,12 +133,14 @@ typedef struct { int cursor_x, cursor_y; /* Cache the values */ } WListbox; +typedef void (*buttonbarfn)(void *); + typedef struct { Widget widget; int visible; /* Is it visible? */ struct { char *text; - void (*function)(void *data); + buttonbarfn function; void *data; } labels [10]; } WButtonBar; @@ -204,7 +206,6 @@ char *listbox_add_item (WListbox *l, enum append_pos pos, int /* Buttonbar routines */ WButtonBar *buttonbar_new (int visible); -typedef void (*buttonbarfn )(void *); typedef void (*voidfn)(void); void define_label (Dlg_head *, Widget *paneletc, int index, char *text, voidfn); void define_label_data (Dlg_head *h, Widget *paneletc, int idx, char *text, -- 2.11.4.GIT