[GNUnet-SVN] r16762 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2011-09-11 14:54:25 +0200 (Sun, 11 Sep 2011)
New Revision: 16762

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
Log:
fix buttons for gtk 3

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c    2011-09-11 
12:34:04 UTC (rev 16761)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c    2011-09-11 
12:54:25 UTC (rev 16762)
@@ -26,8 +26,8 @@
  * value reaches zero.
  */
 #include "gnunet-fs-gtk-common.h"
+#include <gdk/gdk.h>
 
-
 /**
  * Spin button is changed, update its colour.
  */
@@ -36,10 +36,8 @@
 {
   GtkSpinButton *spin;
   gint val;
-#if 0
-  GdkColor bcolor;
-  GdkColor fcolor;
-#endif
+  GdkRGBA bcolor;
+  GdkRGBA fcolor;
 
   spin = GTK_SPIN_BUTTON (w);
   if (spin == NULL)
@@ -48,29 +46,23 @@
     return;
   }
   val = gtk_spin_button_get_value_as_int (spin);
-  if (val == 0)
+  if (val == 0) 
   {
-#if 0
-    /* FIXME: port gtk_colormap_alloc_color and gdk_colormap_get_system calls 
to
-       Gtk3+ */
-    if ((TRUE == gdk_color_parse ("red", &bcolor)) &&
-        (TRUE ==
-         gdk_colormap_alloc_color (gdk_colormap_get_system (), &bcolor, FALSE,
-                                   TRUE)) &&
-        (TRUE == gdk_color_parse ("black", &fcolor)) &&
-        (TRUE ==
-         gdk_colormap_alloc_color (gdk_colormap_get_system (), &fcolor, FALSE,
-                                   TRUE)))
+    if ((TRUE == gdk_rgba_parse (&bcolor, "red")) &&
+        (TRUE == gdk_rgba_parse (&fcolor, "black")) )
     {
-      gtk_widget_modify_base (w, GTK_STATE_NORMAL, &bcolor);
-      gtk_widget_modify_text (w, GTK_STATE_NORMAL, &fcolor);
+      gtk_widget_override_background_color (w, GTK_STATE_NORMAL, &bcolor);
+      gtk_widget_override_color (w, GTK_STATE_NORMAL, &fcolor);
     }
-#endif
+    else
+    {
+      GNUNET_break (0);
+    }
   }
   else
   {
-    gtk_widget_modify_base (w, GTK_STATE_NORMAL, NULL);
-    gtk_widget_modify_text (w, GTK_STATE_NORMAL, NULL);
+    gtk_widget_override_background_color (w, GTK_STATE_NORMAL, NULL);
+    gtk_widget_override_color (w, GTK_STATE_NORMAL, NULL);
   }
 }