r17932 - gnucash/branches/2.2/src/gnome-utils - [17930] Bug #565421: Remove dependency on GTK+ 2.10 in date edit control.

[Andreas Köhler]

Author: andi5
Date: 2009-02-18 15:56:12 -0500 (Wed, 18 Feb 2009)
New Revision: 17932
Trac: http://svn.gnucash.org/trac/changeset/17932

Modified:
   gnucash/branches/2.2/src/gnome-utils/gnc-date-edit.c
Log:
[17930] Bug #565421: Remove dependency on GTK+ 2.10 in date edit control.

Original commit by cedayiv.

Modified: gnucash/branches/2.2/src/gnome-utils/gnc-date-edit.c
===================================================================
--- gnucash/branches/2.2/src/gnome-utils/gnc-date-edit.c	2009-02-18 18:05:53 UTC (rev 17931)
+++ gnucash/branches/2.2/src/gnome-utils/gnc-date-edit.c	2009-02-18 20:56:12 UTC (rev 17932)
@@ -294,8 +294,13 @@
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (gde));
   if (GTK_IS_WINDOW (toplevel))
   {
-    gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)),
-                                 GTK_WINDOW (gde->cal_popup));
+    gtk_window_group_add_window (
+#ifdef HAVE_GTK_2_10
+      gtk_window_get_group (GTK_WINDOW (toplevel)),
+#else
+      _gtk_window_get_group (GTK_WINDOW (toplevel)),
+#endif
+      GTK_WINDOW (gde->cal_popup));
     gtk_window_set_transient_for (GTK_WINDOW (gde->cal_popup),
                                   GTK_WINDOW (toplevel));
   }
@@ -843,8 +848,10 @@
 	gde->cal_popup = gtk_window_new (GTK_WINDOW_POPUP);
         gtk_widget_set_name (gde->cal_popup, "gnc-date-edit-popup-window");
 
+#ifdef HAVE_GTK_2_10
         gtk_window_set_type_hint (GTK_WINDOW (gde->cal_popup),
                                   GDK_WINDOW_TYPE_HINT_COMBO);
+#endif
 
 	gtk_widget_set_events (GTK_WIDGET(gde->cal_popup),
 			       gtk_widget_get_events (GTK_WIDGET(gde->cal_popup)) |