diff options
author | Oliver Schinagl <oliver@schinagl.nl> | 2008-01-03 17:04:42 (GMT) |
---|---|---|
committer | Oliver Schinagl <oliver@schinagl.nl> | 2008-01-03 17:04:42 (GMT) |
commit | 909340f9a5299194c582f9224f21f4f4daf56e51 (patch) | |
tree | 987fdc136590a23ad59ad984a2c47798bade24a0 /Smoke/gtk_colormap.c | |
parent | 8edd0c2ad477886571fe1d75219d5ca17255fdf0 (diff) | |
download | 2iv35-909340f9a5299194c582f9224f21f4f4daf56e51.zip 2iv35-909340f9a5299194c582f9224f21f4f4daf56e51.tar.gz 2iv35-909340f9a5299194c582f9224f21f4f4daf56e51.tar.bz2 |
cleanup and fixes
Diffstat (limited to 'Smoke/gtk_colormap.c')
-rw-r--r-- | Smoke/gtk_colormap.c | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/Smoke/gtk_colormap.c b/Smoke/gtk_colormap.c index 24639b4..878d81f 100644 --- a/Smoke/gtk_colormap.c +++ b/Smoke/gtk_colormap.c @@ -23,14 +23,14 @@ static gboolean select_num_colors(GtkRange *adjustment, gpointer data) return TRUE; } -static gboolean set_scaling(GtkWidget *button, gpointer data) { - colormap_set_scaling(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))); +static gboolean set_scaling(GtkToggleButton *button, gpointer data) { + colormap_set_scaling(gtk_toggle_button_get_active(button)); return TRUE; } -static gboolean set_clamping(GtkWidget *button, gpointer data) { - colormap_set_clamping(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))); +static gboolean set_clamping(GtkToggleButton *button, gpointer data) { + colormap_set_clamping(gtk_toggle_button_get_active(button)); return TRUE; } @@ -42,6 +42,12 @@ static gboolean select_alpha(GtkRange *adjustment, gpointer data) return TRUE; } +static gboolean set_autoscaling(GtkToggleButton *button, gpointer data) { + colormap_set_autoscaling(gtk_toggle_button_get_active(button)); + + return TRUE; +} + GtkWidget *create_colormap_page(void) { @@ -49,7 +55,7 @@ GtkWidget *create_colormap_page(void) */ GtkWidget *page; GtkWidget *frame; - GtkWidget *box; + GtkWidget *box, *box2; GtkWidget *label; GtkWidget *button; GtkWidget *combo; @@ -62,17 +68,28 @@ GtkWidget *create_colormap_page(void) box = gtk_vbox_new(FALSE, 0); - button = gtk_check_button_new_with_label("Scaling"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), colormap_get_scaling()); - g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_scaling), NULL); - gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0); - gtk_widget_show(button); - - button = gtk_check_button_new_with_label("Clamping"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), colormap_get_clamping()); - g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_clamping), NULL); - gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0); - gtk_widget_show(button); + box2 = gtk_hbox_new(FALSE, 0); + + button = gtk_check_button_new_with_label("Scaling"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), colormap_get_scaling()); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_scaling), NULL); + gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0); + gtk_widget_show(button); + + button = gtk_check_button_new_with_label("Clamping"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), colormap_get_clamping()); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_clamping), NULL); + gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0); + gtk_widget_show(button); + + gtk_box_pack_start(GTK_BOX(box), box2, TRUE, TRUE, 0); + gtk_widget_show(box2); + + button = gtk_check_button_new_with_label("AutoScale"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), colormap_get_autoscaling()); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_autoscaling), NULL); + gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0); + gtk_widget_show(button); gtk_container_add(GTK_CONTAINER(frame), box); gtk_widget_show(box); |