mouse fix

1 files changed, 21 insertions, 22 deletions

diff --git a/Smoke/gtk.c b/Smoke/gtk.c
index 3fd0274..681b6c8 100644
--- a/Smoke/gtk.c
+++ b/Smoke/gtk.c
@@ -307,14 +307,15 @@ button_press_event (GtkWidget      *widget,
 		    GdkEventButton *event,
 		    gpointer        data)
 {
-  g_print ("%s: \"button_press_event\": ", gtk_widget_get_name (widget));
+  
+//  g_print ("%s: \"button_press_event\": ", gtk_widget_get_name (widget));
 
   if (event->button == 1)
     {
       /*** Fill in the details here. ***/
       g_print ("button 1\n");
       // fluids
-      click(1, 1, (int)event->x, (int)event->y);
+      click(1, (event->type == GDK_BUTTON_PRESS) ? 0 : 1, (int)event->x, (int)event->y);
       // endf
 
       return TRUE;
@@ -701,14 +702,13 @@ GtkWidget *create_colormap_page(void)
     box = gtk_hbox_new(FALSE, 0);
 
       combo = gtk_combo_new();
-//        gtk_entry_set_text (GTK_ENTRY(GTK_COMBO(combo)->entry), "Aap");
 
-        glist = g_list_append(glist, "String 1");
-        glist = g_list_append(glist, "String 2");
-        glist = g_list_append(glist, "String 3"); 
-        glist = g_list_append(glist, "String 4");
+        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");
 
-//  free(glist);
     gtk_combo_set_popdown_strings (GTK_COMBO (combo), glist);
 
         gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0);
@@ -948,20 +948,6 @@ create_window (GdkGLConfig *glconfig)
 #endif
 
   /*
-   * 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);
-
-
-  /*
    * Draw the options notebook
    */
 
@@ -1029,6 +1015,19 @@ create_window (GdkGLConfig *glconfig)
   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);
+
   return window;
 }