code cleanup and fixes

1 files changed, 42 insertions, 3 deletions

diff --git a/Smoke/gtk_main.c b/Smoke/gtk_main.c
index 242578f..8d2fa9f 100644
--- a/Smoke/gtk_main.c
+++ b/Smoke/gtk_main.c
@@ -6,70 +6,106 @@
 
 
 #include "gtk_main.h"
+#include "renderer_gl.h"
 #include "smoke.h"
+#include "colormap.h"
+#include "glyphs.h"
+#include "divergence.h"
+#include "isolines.h"
+#include "heightplots.h"
+#include "streamlines.h"
+#include "flowvis.h"
 
 
 
 static gboolean select_render_smoke(GtkWidget *button, gpointer data) {
   smoke_set_render(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
+
+  return TRUE;
 }
 
 
 static gboolean select_render_glyphs(GtkWidget *button, gpointer data) {
   glyphs_set_render(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
+
+  return TRUE;
 }
 
 static gboolean select_render_isolines(GtkWidget *button, gpointer data) {
   isolines_set_render(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
+
+  return TRUE;
 }
 
 static gboolean select_render_streamlines(GtkWidget *button, gpointer data) {
   streamlines_set_render(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
+
+  return TRUE;
 }
 
 static gboolean select_render_flowvis(GtkWidget *button, gpointer data) {
   flowvis_set_render(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
+
+  return TRUE;
 }
 
 static gboolean select_calculate(GtkWidget *button, gpointer data) {
   fluids_set_calculate(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
+
+  return TRUE;
 }
 
-static gboolean set_dataset(GtkButton *button, gpointer data)
+static gboolean set_dataset(GtkToggleButton *button, gpointer data)
 {
   if (gtk_toggle_button_get_active(button)) {
     smoke_set_dataset((int)data);
   }
+
+  return TRUE;
 }
 
 static gboolean select_normals(GtkWidget *button, gpointer data) {
   normals_set_render(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
+
+  return TRUE;
 }
 
 static gboolean reset_zoom(GtkWidget *button, gpointer data) {
   renderer_reset_zoom();
+
+  return TRUE;
 }
 
 static gboolean reset_pos(GtkWidget *button, gpointer data) {
   renderer_reset_pos();
+
+  return TRUE;
 }
 
 static gboolean reset_yaw(GtkWidget *button, gpointer data) {
   renderer_reset_yaw();
+
+  return TRUE;
 }
 
 static gboolean reset_pitch(GtkWidget *button, gpointer data) {
   renderer_reset_pitch();
+
+  return TRUE;
 }
 
 static gboolean reset_roll(GtkWidget *button, gpointer data) {
   renderer_reset_roll();
+
+  return TRUE;
 }
 
 static gboolean reset_rotate(GtkWidget *button, gpointer data) {
   renderer_reset_yaw();
   renderer_reset_pitch();
   renderer_reset_roll();
+
+  return TRUE;
 }
 
 static gboolean reset_all(GtkWidget *button, gpointer data) {
@@ -78,11 +114,15 @@ static gboolean reset_all(GtkWidget *button, gpointer data) {
   renderer_reset_roll();
   renderer_reset_zoom();
   renderer_reset_pos();
+
+  return TRUE;
 }
 
 static gboolean select_zoom_speed(GtkRange *adjustment, gpointer data)
 {
-        renderer_set_zoomspeed((int)gtk_range_get_value(adjustment));
+  renderer_set_zoomspeed((int)gtk_range_get_value(adjustment));
+
+  return TRUE;
 }
 
 
@@ -94,7 +134,6 @@ GtkWidget *create_main_page(void)
   GtkWidget *frame;
   GtkWidget *box, *box2;
   GtkWidget *button;
-  GtkWidget *combo;
   GtkAdjustment *zoom_adjustment;
   GtkWidget *zoom_scale;
   GSList *dataset_group;