[goffice] Fixed build with gtk+-2.20.



commit b8b6d5f4dcaa817e6de40cde15487788695df4d6
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sat Apr 10 08:04:03 2010 +0200

    Fixed build with gtk+-2.20.

 ChangeLog                   |    6 ++++++
 goffice/gtk/go-gtk-compat.h |    4 ++--
 goffice/gtk/goffice-gtk.c   |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b9c8d75..9569c6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-10  Jean Brefort  <jean brefort normalesup org>
+
+	* goffice/gtk/go-gtk-compat.h: make things build with gtk-2.20.
+	* goffice/gtk/goffice-gtk.c (cb_activate_default): use
+	gtk_widget_is_sensitive() instead of gtk_widget_get_sensitive().
+
 2010-04-09  Valek Filippov  <frob gnome org>
 
 	* goffice/canvas/goc-path.c: add Path support
diff --git a/goffice/gtk/go-gtk-compat.h b/goffice/gtk/go-gtk-compat.h
index bf9b7b3..89e8690 100644
--- a/goffice/gtk/go-gtk-compat.h
+++ b/goffice/gtk/go-gtk-compat.h
@@ -106,8 +106,8 @@
 #       define gtk_widget_get_visible(w) GTK_WIDGET_VISIBLE (w)
 #endif
 
-#ifndef HAVE_GTK_WIDGET_GET_SENSITIVE
-#       define gtk_widget_get_sensitive(w) GTK_WIDGET_IS_SENSITIVE (w)
+#ifndef HAVE_GTK_WIDGET_IS_SENSITIVE
+#       define gtk_widget_is_sensitive(w) GTK_WIDGET_IS_SENSITIVE (w)
 #endif
 
 #ifndef HAVE_GTK_WIDGET_SET_CAN_DEFAULT
diff --git a/goffice/gtk/goffice-gtk.c b/goffice/gtk/goffice-gtk.c
index 796c502..b2ba9ac 100644
--- a/goffice/gtk/goffice-gtk.c
+++ b/goffice/gtk/goffice-gtk.c
@@ -271,7 +271,7 @@ static void
 cb_activate_default (GtkWindow *window)
 {
 	GtkWidget *w = gtk_window_get_default_widget (window);
-	if (w && gtk_widget_get_sensitive (w))
+	if (w && gtk_widget_is_sensitive (w))
 		gtk_widget_activate (w);
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]