glom r1990 - in trunk: . glom/utility_widgets/calendar

[murrayc svn gnome org]

Author: murrayc
Date: Mon Mar 16 15:40:04 2009
New Revision: 1990
URL: http://svn.gnome.org/viewvc/glom?rev=1990&view=rev

Log:
2009-03-16  Murray Cumming  <murrayc murrayc com>

* glom/utility_widgets/calendar/glomcalendar.[h|cc]:
* glom/utility_widgets/calendar/glomgtkcalendar.[h|c]: Check for GTK+ 2.14, 
not GTK+ 2.16, because the GtkCalendar details_func API is in 2.14.
Correct a typedef to fix the build in that case.

Modified:
   trunk/ChangeLog
   trunk/glom/utility_widgets/calendar/README
   trunk/glom/utility_widgets/calendar/glomcalendar.cc
   trunk/glom/utility_widgets/calendar/glomcalendar.h
   trunk/glom/utility_widgets/calendar/glomgtkcalendar.c
   trunk/glom/utility_widgets/calendar/glomgtkcalendar.h

Modified: trunk/glom/utility_widgets/calendar/README
==============================================================================
--- trunk/glom/utility_widgets/calendar/README	(original)
+++ trunk/glom/utility_widgets/calendar/README	Mon Mar 16 15:40:04 2009
@@ -1,4 +1,4 @@
 This is a copy of GtkCalendar and Gtk::Calendar, to 
 avoiding depending on an unreleased version of GTK+, 
 so we can use new API. It should be removed when 
-GTK+ 2.16.0 has been released.
+GTK+ 2.14.0 has been released.

Modified: trunk/glom/utility_widgets/calendar/glomcalendar.cc
==============================================================================
--- trunk/glom/utility_widgets/calendar/glomcalendar.cc	(original)
+++ trunk/glom/utility_widgets/calendar/glomcalendar.cc	Mon Mar 16 15:40:04 2009
@@ -1,7 +1,7 @@
 #include "glomcalendar.h"
 
 #include <gtk/gtk.h>
-#if !GTK_CHECK_VERSION(2,16,0)
+#if !GTK_CHECK_VERSION(2,14,0)
 
 #include <gtkmm/private/widget_p.h>
 

Modified: trunk/glom/utility_widgets/calendar/glomcalendar.h
==============================================================================
--- trunk/glom/utility_widgets/calendar/glomcalendar.h	(original)
+++ trunk/glom/utility_widgets/calendar/glomcalendar.h	Mon Mar 16 15:40:04 2009
@@ -5,10 +5,10 @@
 //#include <gtk/gtkcalendar.h>
 #include <gtkmm/calendar.h>
 #include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(2,16,0)
+#if GTK_CHECK_VERSION(2,14,0)
 namespace GlomGtk
 {
-  typedef GlomGtk::Calendar Calendar;
+  typedef Gtk::Calendar Calendar;
 }
 #else
 

Modified: trunk/glom/utility_widgets/calendar/glomgtkcalendar.c
==============================================================================
--- trunk/glom/utility_widgets/calendar/glomgtkcalendar.c	(original)
+++ trunk/glom/utility_widgets/calendar/glomgtkcalendar.c	Mon Mar 16 15:40:04 2009
@@ -3,7 +3,7 @@
  * the GNOME release schedule.
  */
 #include <gtk/gtk.h>
-#if !GTK_CHECK_VERSION(2,16,0)
+#if !GTK_CHECK_VERSION(2,14,0)
 
 #include "config.h"
 

Modified: trunk/glom/utility_widgets/calendar/glomgtkcalendar.h
==============================================================================
--- trunk/glom/utility_widgets/calendar/glomgtkcalendar.h	(original)
+++ trunk/glom/utility_widgets/calendar/glomgtkcalendar.h	Mon Mar 16 15:40:04 2009
@@ -3,7 +3,7 @@
  * the GNOME release schedule.
  */
 #include <gtk/gtkcalendar.h>
-#if GTK_CHECK_VERSION(2,16,0)
+#if GTK_CHECK_VERSION(2,14,0)
 typedef GlomGlomGtkCalendar GlomGlomGtkCalendar; 
 #else
 /* GTK - The GIMP Toolkit