converted to seperate files in he makefile.

fixed combobox.

1 files changed, 35 insertions, 36 deletions

diff --git a/Smoke/gtk.c b/Smoke/gtk.c
index e9a2462..724291e 100644
--- a/Smoke/gtk.c
+++ b/Smoke/gtk.c
@@ -548,6 +548,7 @@ toggle_animation (GtkWidget *widget)
 }
 
 
+#if 0
 /**************************************************************************
  * The following section contains the GUI building function definitions.
  **************************************************************************/
@@ -587,10 +588,12 @@ create_popup_menu (GtkWidget *drawing_area)
   return menu;
 }
 
+
 void show_settings(GtkWidget *notebook)
 {
 
 }
+#endif
 
 /*
  * Draw main notebook page
@@ -659,6 +662,16 @@ GtkWidget *create_main_page(void)
   return page;
 }
 
+static gboolean
+select_colormap (GtkComboBox      *combo,
+		    gpointer        data) {
+
+        g_print("combo: %d\n", gtk_combo_box_get_active(combo));
+        selectColor(gtk_combo_box_get_active(combo));
+}
+
+
+
 /*
  * Draw colormap notebook page
  */
@@ -671,9 +684,6 @@ GtkWidget *create_colormap_page(void)
   GtkWidget *box;
   GtkWidget *button;
   GtkWidget *combo;
-  GList *glist;
-
-  glist = NULL;
 
   page = gtk_vbox_new(FALSE, 0);
 
@@ -705,20 +715,23 @@ GtkWidget *create_colormap_page(void)
 
     box = gtk_hbox_new(FALSE, 0);
 
-      combo = gtk_combo_new();
+      combo = gtk_combo_box_new_text();
 
-        glist = g_list_append(glist, "Black & White");
-        glist = g_list_append(glist, "Rainbow");
-        glist = g_list_append(glist, "Bands"); 
-        glist = g_list_append(glist, "Wilrik");
-        glist = g_list_append(glist, "Oliver");
+      gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Black & White");
+      gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Rainbow");
+      gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Bands");
+      gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Wilrik");
+      gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Oliver");
 
-    gtk_combo_set_popdown_strings (GTK_COMBO (combo), glist);
+      g_signal_connect(combo, "changed",
+          G_CALLBACK(select_colormap), (gpointer)NULL);
 
-        gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0);
-    gtk_widget_show(combo);
+      gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
 
-      gtk_container_add(GTK_CONTAINER(frame), box);
+      gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0);
+      gtk_widget_show(combo);
+
+    gtk_container_add(GTK_CONTAINER(frame), box);
     gtk_widget_show(box);
     
     gtk_box_pack_start(GTK_BOX(page), frame, FALSE, TRUE, 0);
@@ -927,6 +940,7 @@ create_window (GdkGLConfig *glconfig)
 
   gtk_widget_show (drawing_area);
 
+#if 0
   /*
    * Popup menu.
    */
@@ -936,7 +950,6 @@ create_window (GdkGLConfig *glconfig)
   g_signal_connect_swapped (G_OBJECT (drawing_area), "button_press_event",
 			    G_CALLBACK (button_press_event_popup_menu), menu);
 
-#if 0
   /*
    * Simple quit button.
    */
@@ -957,8 +970,8 @@ create_window (GdkGLConfig *glconfig)
 
   settings_notebook = gtk_notebook_new();
 
-  gtk_notebook_set_tab_pos(settings_notebook, GTK_POS_BOTTOM);
-  gtk_notebook_set_scrollable(settings_notebook, TRUE);
+  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(settings_notebook), GTK_POS_BOTTOM);
+  gtk_notebook_set_scrollable(GTK_NOTEBOOK(settings_notebook), TRUE);
 
   gtk_box_pack_start(GTK_BOX(hbox), settings_notebook, FALSE, FALSE, 0);
 
@@ -971,7 +984,7 @@ create_window (GdkGLConfig *glconfig)
   gtk_container_add(GTK_CONTAINER(window), notebook_page);
   gtk_widget_show(notebook_page);
 
-  gtk_notebook_append_page(settings_notebook, notebook_page, notebook_page_label);
+  gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label);
 
   notebook_page_label = gtk_label_new("Colormaps");
   gtk_widget_show(notebook_page_label);
@@ -980,7 +993,7 @@ create_window (GdkGLConfig *glconfig)
   gtk_container_add(GTK_CONTAINER(window), notebook_page);
   gtk_widget_show(notebook_page);
 
-  gtk_notebook_append_page(settings_notebook, notebook_page, notebook_page_label);
+  gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label);
 
   notebook_page_label = gtk_label_new("Glyphs");
   gtk_widget_show(notebook_page_label);
@@ -989,7 +1002,7 @@ create_window (GdkGLConfig *glconfig)
   gtk_container_add(GTK_CONTAINER(window), notebook_page);
   gtk_widget_show(notebook_page);
 
-  gtk_notebook_append_page(settings_notebook, notebook_page, notebook_page_label);
+  gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label);
 
   notebook_page_label = gtk_label_new("Divergence");
   gtk_widget_show(notebook_page_label);
@@ -998,7 +1011,7 @@ create_window (GdkGLConfig *glconfig)
   gtk_container_add(GTK_CONTAINER(window), notebook_page);
   gtk_widget_show(notebook_page);
 
-  gtk_notebook_append_page(settings_notebook, notebook_page, notebook_page_label);
+  gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label);
 
   notebook_page_label = gtk_label_new("Isolines");
   gtk_widget_show(notebook_page_label);
@@ -1007,7 +1020,7 @@ create_window (GdkGLConfig *glconfig)
   gtk_container_add(GTK_CONTAINER(window), notebook_page);
   gtk_widget_show(notebook_page);
 
-  gtk_notebook_append_page(settings_notebook, notebook_page, notebook_page_label);
+  gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label);
 
   notebook_page_label = gtk_label_new("Height plots");
   gtk_widget_show(notebook_page_label);
@@ -1016,21 +1029,7 @@ create_window (GdkGLConfig *glconfig)
   gtk_container_add(GTK_CONTAINER(window), notebook_page);
   gtk_widget_show(notebook_page);
 
-  gtk_notebook_append_page(settings_notebook, notebook_page, notebook_page_label);
-
-
-  /*
-   * Settings button.
-   */
-
-  button = gtk_button_new_with_label("<<");
-
-  g_signal_connect(G_OBJECT(button), "clicked",
-                    G_CALLBACK (show_settings), settings_notebook);
-
-  gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-
-  gtk_widget_show(button);
+  gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label);
 
   return window;
 }