[gnumeric] RdioButtons: fix new-view issue.



commit e3ad0a32d286ff4f5cd6b53257929ba17d00e5e1
Author: Morten Welinder <terra gnome org>
Date:   Sun Sep 27 11:32:36 2009 -0400

    RdioButtons: fix new-view issue.

 ChangeLog                 |    1 +
 src/sheet-object-widget.c |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f3f1781..d519ee9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2009-09-27  Morten Welinder  <terra gnome org>
 
 	* src/sheet-object-widget.c: Simplify radio button stuff.
+	(sheet_widget_radio_button_init_full): Add "active" argument too.
 
 2009-09-27  Andreas J. Guelzow <aguelzow pyrshep ca>
 
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 97e193f..2f77085 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -2351,35 +2351,35 @@ radio_button_debug_name (GnmDependent const *dep, GString *target)
 
 static DEPENDENT_MAKE_TYPE (radio_button, NULL)
 
-static guint rb_counter = 0;
-
 static void
 sheet_widget_radio_button_init_full (SheetObjectWidget *sow,
 				     GnmCellRef const *ref,
 				     char const *label,
-				     char const *value)
+				     char const *value,
+				     gboolean active)
 {
 	SheetWidgetRadioButton *swrb = SHEET_WIDGET_RADIO_BUTTON (sow);
 
 	g_return_if_fail (swrb != NULL);
 
 	swrb->being_updated = FALSE;
-	swrb->label = g_strdup (label?label:_("RadioButton"));
-	swrb->value = g_strdup (value?value:"");
-	swrb->active = TRUE;
+	swrb->label = g_strdup (label ? label : _("RadioButton"));
+	swrb->value = g_strdup (value ? value : "");
+	swrb->active = active;
 
 	swrb->dep.sheet = NULL;
 	swrb->dep.flags = radio_button_get_dep_type ();
 	swrb->dep.texpr = (ref != NULL)
 		? gnm_expr_top_new (gnm_expr_new_cellref (ref))
 		: NULL;
-	rb_counter++;
 }
 
 static void
 sheet_widget_radio_button_init (SheetWidgetRadioButton *swrb)
 {
-	sheet_widget_radio_button_init_full (SHEET_OBJECT (swrb), NULL, NULL, NULL);
+	sheet_widget_radio_button_init_full (SHEET_OBJECT (swrb),
+					     NULL, NULL, NULL,
+					     TRUE);
 }
 
 static void
@@ -2445,8 +2445,8 @@ sheet_widget_radio_button_copy (SheetObject *dst, SheetObject const *src)
 	sheet_widget_radio_button_init_full (SHEET_OBJECT (dst_swrb),
 					     so_get_ref (src, &ref, FALSE),
 					     src_swrb->label,
-					     src_swrb->value);
-	sheet_widget_radio_button_set_active (dst_swrb, dst_swrb->active); 
+					     src_swrb->value,
+					     src_swrb->active);
 }
 
 static gboolean



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]