r19303 - gnucash/trunk/src/gnome-utils - Re-enable colored tabs on Windows. This works fine with gtk+2.16.
Geert Janssens
gjanssens at code.gnucash.org
Fri Jun 25 17:45:13 EDT 2010
Author: gjanssens
Date: 2010-06-25 17:45:13 -0400 (Fri, 25 Jun 2010)
New Revision: 19303
Trac: http://svn.gnucash.org/trac/changeset/19303
Modified:
gnucash/trunk/src/gnome-utils/gnc-main-window.c
Log:
Re-enable colored tabs on Windows. This works fine with gtk+2.16.
Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c 2010-06-25 18:48:56 UTC (rev 19302)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c 2010-06-25 21:45:13 UTC (rev 19303)
@@ -2590,17 +2590,11 @@
gtk_box_pack_start (GTK_BOX (tab_hbox), label, TRUE, TRUE, 0);
event_box = gtk_event_box_new();
-#if defined(G_OS_UNIX) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION != 18)
+ /* Note: this doesn't work properly on Windows with gtk+2.18.x (last
+ * with 2.18.7). Setting the eventbox visible with that version results
+ * in the tab's text being invisible. See bug #610675 for more on this.
+ */
gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box), TRUE);
-#else
- /* Bug#610675: On Windows (i.e. no G_OS_UNIX) and gtk-2.18.x,
- * having the event_box visible makes the text disappear. Hence we
- * leave it at non-visible, which unfortunately means there will
- * be no coloring, but at least the text is still there. This
- * doesn't occur with gtk-2.16.x and we hope it won't happen again
- * with gtk-2.20.x and higher. */
- gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box), FALSE);
-#endif
gtk_widget_show(event_box);
gtk_container_add(GTK_CONTAINER(event_box), tab_hbox);
color_string = gnc_plugin_page_get_page_color(page);
More information about the gnucash-changes
mailing list