1
1

* widget.h: Renamed define_label to buttonbar_set_label. Renamed

define_label_data to buttonbar_set_label_data. Renamed
	redraw_labels to buttonbar_redraw. Provided compatibility macros
	to enable a smooth transition between the old and the new names.
	* widget.c: Likewise.
Этот коммит содержится в:
Roland Illig 2005-02-08 09:40:52 +00:00
родитель 68249252cb
Коммит 77391f3981
3 изменённых файлов: 20 добавлений и 10 удалений

Просмотреть файл

@ -1,3 +1,11 @@
2005-02-08 Roland Illig <roland.illig@gmx.de>
* widget.h: Renamed define_label to buttonbar_set_label. Renamed
define_label_data to buttonbar_set_label_data. Renamed
redraw_labels to buttonbar_redraw. Provided compatibility macros
to enable a smooth transition between the old and the new names.
* widget.c: Likewise.
2005-02-08 Roland Illig <roland.illig@gmx.de> 2005-02-08 Roland Illig <roland.illig@gmx.de>
* *.c: Reordered header inclusion. * *.c: Reordered header inclusion.

Просмотреть файл

@ -2328,7 +2328,7 @@ find_buttonbar (Dlg_head *h)
} }
void void
define_label_data (Dlg_head *h, int idx, const char *text, buttonbarfn cback, buttonbar_set_label_data (Dlg_head *h, int idx, const char *text, buttonbarfn cback,
void *data) void *data)
{ {
WButtonBar *bb = find_buttonbar (h); WButtonBar *bb = find_buttonbar (h);
@ -2342,14 +2342,13 @@ define_label_data (Dlg_head *h, int idx, const char *text, buttonbarfn cback,
} }
void void
define_label (Dlg_head *h, int idx, const char *text, void (*cback) (void)) buttonbar_set_label (Dlg_head *h, int idx, const char *text, void (*cback) (void))
{ {
define_label_data (h, idx, text, (buttonbarfn) cback, 0); define_label_data (h, idx, text, (buttonbarfn) cback, 0);
} }
/* Redraw labels of the buttonbar */
void void
redraw_labels (Dlg_head *h) buttonbar_redraw (Dlg_head *h)
{ {
WButtonBar *bb = find_buttonbar (h); WButtonBar *bb = find_buttonbar (h);

Просмотреть файл

@ -197,13 +197,16 @@ char *listbox_add_item (WListbox *l, enum append_pos pos, int
/* Hintbar routines */ /* Hintbar routines */
/* Buttonbar routines */ /* Buttonbar routines */
typedef void (*voidfn)(void);
WButtonBar *buttonbar_new (int visible); WButtonBar *buttonbar_new (int visible);
WButtonBar *find_buttonbar (Dlg_head *h); WButtonBar *find_buttonbar (Dlg_head *h);
typedef void (*voidfn)(void); void buttonbar_set_label (Dlg_head *, int index, const char *text, voidfn);
void define_label (Dlg_head *, int index, const char *text, voidfn); #define define_label buttonbar_set_label
void define_label_data (Dlg_head *h, int idx, const char *text, void buttonbar_set_label_data (Dlg_head *h, int idx, const char *text,
buttonbarfn cback, void *data); buttonbarfn cback, void *data);
void redraw_labels (Dlg_head *h); #define define_label_data buttonbar_set_label_data
void buttonbar_hint (WButtonBar *bb, const char *s); void buttonbar_redraw (Dlg_head *h);
#define redraw_labels buttonbar_redraw
#endif #endif