From 77391f3981855719f6190cfaea10e7956da82faa Mon Sep 17 00:00:00 2001
From: Roland Illig <roland.illig@gmx.de>
Date: Tue, 8 Feb 2005 09:40:52 +0000
Subject: [PATCH] 	* 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.

---
 src/ChangeLog |  8 ++++++++
 src/widget.c  |  7 +++----
 src/widget.h  | 15 +++++++++------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index bb8aba2da..144c4b82a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>
 
 	* *.c: Reordered header inclusion.
diff --git a/src/widget.c b/src/widget.c
index a0459288c..533720531 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -2328,7 +2328,7 @@ find_buttonbar (Dlg_head *h)
 }
 
 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)
 {
     WButtonBar *bb = find_buttonbar (h);
@@ -2342,14 +2342,13 @@ define_label_data (Dlg_head *h, int idx, const char *text, buttonbarfn cback,
 }
 
 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);
 }
 
-/* Redraw labels of the buttonbar */
 void
-redraw_labels (Dlg_head *h)
+buttonbar_redraw (Dlg_head *h)
 {
     WButtonBar *bb = find_buttonbar (h);
 
diff --git a/src/widget.h b/src/widget.h
index 67b23ef9f..7456075ed 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -197,13 +197,16 @@ char *listbox_add_item (WListbox *l, enum append_pos pos, int
 /* Hintbar routines */
 
 /* Buttonbar routines */
+typedef void (*voidfn)(void);
+
 WButtonBar *buttonbar_new (int visible);
 WButtonBar *find_buttonbar (Dlg_head *h);
-typedef void (*voidfn)(void);
-void define_label (Dlg_head *, int index, const char *text, voidfn);
-void define_label_data (Dlg_head *h, int idx, const char *text,
-			buttonbarfn cback, void *data);
-void redraw_labels (Dlg_head *h);
-void buttonbar_hint (WButtonBar *bb, const char *s);
+void buttonbar_set_label (Dlg_head *, int index, const char *text, voidfn);
+#define define_label buttonbar_set_label
+void buttonbar_set_label_data (Dlg_head *h, int idx, const char *text,
+			       buttonbarfn cback, void *data);
+#define define_label_data buttonbar_set_label_data
+void buttonbar_redraw (Dlg_head *h);
+#define redraw_labels buttonbar_redraw
 
 #endif