gnumeric r17231 - in trunk: . src

[mortenw svn gnome org]

Author: mortenw
Date: Fri Mar 20 19:34:30 2009
New Revision: 17231
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17231&view=rev

Log:
2009-03-20  Morten Welinder  <terra gnome org>

	* src/sheet-object-widget.c (sheet_widget_radio_button_create_widget):
	Set label.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/sheet-object-widget.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Fri Mar 20 19:34:30 2009
@@ -43,6 +43,7 @@
 	* Fix ODS crashes.  [#575600] [#575843] [#575981]
 	* Use goffice magic formats for certain date and time formats so we
 	can persist them in .gnumeric.
+	* Fix setting of radio button objects' text.
 
 Sum1:
 	* Implement OOO probing.  [#574381]

Modified: trunk/src/sheet-object-widget.c
==============================================================================
--- trunk/src/sheet-object-widget.c	(original)
+++ trunk/src/sheet-object-widget.c	Fri Mar 20 19:34:30 2009
@@ -1324,7 +1324,7 @@
 	switch (param_id) {
 	case SOC_PROP_TEXT:
 		sheet_widget_checkbox_set_label (SHEET_OBJECT (swc),
-					       g_value_get_string (value));
+						 g_value_get_string (value));
 		break;
 	case SOC_PROP_MARKUP:
 #if 0
@@ -1475,8 +1475,8 @@
 	GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), swc->value);
 	g_signal_connect (G_OBJECT (button),
-		"toggled",
-		G_CALLBACK (cb_checkbox_toggled), swc);
+			  "toggled",
+			  G_CALLBACK (cb_checkbox_toggled), swc);
 
 	return button;
 }
@@ -1891,10 +1891,13 @@
 static GtkWidget *
 sheet_widget_radio_button_create_widget (SheetObjectWidget *sow)
 {
-	GtkWidget *w = gtk_radio_button_new_with_label (NULL, "RadioButton");
+	SheetWidgetRadioButton *swrb = SHEET_WIDGET_RADIO_BUTTON (sow);
+	/* FIXME: NULL group?  */
+	GtkWidget *w = gtk_radio_button_new_with_label (NULL,
+							swrb->label);
 	g_signal_connect (G_OBJECT (w),
-		"toggled",
-		G_CALLBACK (sheet_widget_radio_button_toggled), sow);
+			  "toggled",
+			  G_CALLBACK (sheet_widget_radio_button_toggled), sow);
 	return w;
 }
 
@@ -1964,10 +1967,10 @@
 	SheetWidgetRadioButton *swrb = SHEET_WIDGET_RADIO_BUTTON (obj);
 
 	switch (param_id) {
-	case SOC_PROP_TEXT:
+	case SOR_PROP_TEXT:
 		g_value_set_string (value, swrb->label);
 		break;
-	case SOC_PROP_MARKUP:
+	case SOR_PROP_MARKUP:
 		g_value_set_boxed (value, NULL); /* swrb->markup */
 		break;
 	default :
@@ -1983,14 +1986,14 @@
 	SheetWidgetRadioButton *swrb = SHEET_WIDGET_RADIO_BUTTON (obj);
 
 	switch (param_id) {
-	case SOC_PROP_TEXT:
+	case SOR_PROP_TEXT:
 		sheet_widget_radio_button_set_label (SHEET_OBJECT (swrb),
-			g_value_get_string (value));
+						     g_value_get_string (value));
 		break;
-	case SOC_PROP_MARKUP:
+	case SOR_PROP_MARKUP:
 #if 0
-		sheet_widget_radio_button_set_markup (SHEET_OBJECT (swc),
-			g_value_peek_pointer (value));
+		sheet_widget_radio_button_set_markup (SHEET_OBJECT (swrb),
+						      g_value_peek_pointer (value));
 #endif
 		break;
 	default:
@@ -2016,7 +2019,7 @@
 				g_param_spec_string ("text", NULL, NULL, NULL,
 						     GSF_PARAM_STATIC | G_PARAM_READWRITE));
 		       g_object_class_install_property
-			       (object_class, SOC_PROP_MARKUP,
+			       (object_class, SOR_PROP_MARKUP,
 				g_param_spec_boxed ("markup", NULL, NULL, PANGO_TYPE_ATTR_LIST,
 						    GSF_PARAM_STATIC | G_PARAM_READWRITE));
 	       })