From febe655b2c7f086ee2db8d74840a74b8e418b4a2 Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Sun, 31 Jan 2010 21:47:19 +0100 Subject: [PATCH] Fix selection problem with radio buttons (new node dialog) --- src/ui/callbacks.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/ui/callbacks.c b/src/ui/callbacks.c index da57e6d..5ccaa58 100644 --- a/src/ui/callbacks.c +++ b/src/ui/callbacks.c @@ -898,26 +898,6 @@ struct _newNodeToggleButtons GtkWidget *rbc; /* Checklist */ }; -void nntb_toggled(GtkToggleButton *togglebutton, gpointer user_data) -{ - newNodeToggleButtons *nntb = (newNodeToggleButtons*)user_data; - static gboolean toggle_in_progress = FALSE; - - /* The toggle_in_progress flag is needed, because the toggled - * signal is emitted when setting the active property of the - * GtkToggleButtons below - this would result in an endless - * recursion - so we don't allow recursive toggle signals. */ - - if (toggle_in_progress) return; - - toggle_in_progress = TRUE; - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(nntb->rbt), FALSE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(nntb->rbs), FALSE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(nntb->rbc), FALSE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(togglebutton), TRUE); - toggle_in_progress = FALSE; -} - void show_sketch_widget(GtkWidget *widget, gpointer user_data) { GtkWidget *dialog = (GtkWidget*)user_data; @@ -971,7 +951,6 @@ void new_node_dialog(nodeType typ, MainView * mainview) gtk_button_set_label(GTK_BUTTON(rb1), _("Rich text")); gtk_button_set_image(GTK_BUTTON(rb1), gtk_image_new_from_file(PIXMAPDIR "/text.png")); gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(rb1), TRUE, TRUE, 0); - g_signal_connect(G_OBJECT(rb1), "toggled", G_CALLBACK(nntb_toggled), nntb); nntb->rbt = rb1; /* Sketch toggle button */ @@ -979,7 +958,6 @@ void new_node_dialog(nodeType typ, MainView * mainview) gtk_button_set_label(GTK_BUTTON(rb2), _("Sketch")); gtk_button_set_image(GTK_BUTTON(rb2), gtk_image_new_from_file(PIXMAPDIR "/sketch.png")); gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(rb2), TRUE, TRUE, 0); - g_signal_connect(G_OBJECT(rb2), "toggled", G_CALLBACK(nntb_toggled), nntb); nntb->rbs = rb2; /* Checklist toggle button */ @@ -987,7 +965,6 @@ void new_node_dialog(nodeType typ, MainView * mainview) gtk_button_set_label(GTK_BUTTON(rb3), _("Checklist")); gtk_button_set_image(GTK_BUTTON(rb3), gtk_image_new_from_file(PIXMAPDIR "/checklist.png")); gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(rb3), TRUE, TRUE, 0); - g_signal_connect(G_OBJECT(rb3), "toggled", G_CALLBACK(nntb_toggled), nntb); nntb->rbc = rb3; /* Set mode to 0 to get correct styling */ -- 2.11.4.GIT