diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-10-23 22:54:13 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-30 01:51:38 +0800 |
| commit | df5ff95999e486568f6c229ac9dcbef70aeaff4f (patch) | |
| tree | 74b4cba848c75d38776bbadb3c460a3167d58ab5 | |
| parent | ac3903ac0fccf9e64e993f861e97c11e232dbf32 (diff) | |
| download | gsoc2013-evolution-df5ff95999e486568f6c229ac9dcbef70aeaff4f.tar gsoc2013-evolution-df5ff95999e486568f6c229ac9dcbef70aeaff4f.tar.gz gsoc2013-evolution-df5ff95999e486568f6c229ac9dcbef70aeaff4f.tar.bz2 gsoc2013-evolution-df5ff95999e486568f6c229ac9dcbef70aeaff4f.tar.lz gsoc2013-evolution-df5ff95999e486568f6c229ac9dcbef70aeaff4f.tar.xz gsoc2013-evolution-df5ff95999e486568f6c229ac9dcbef70aeaff4f.tar.zst gsoc2013-evolution-df5ff95999e486568f6c229ac9dcbef70aeaff4f.zip | |
Adapt branch for building with GTK+ 2.22.
| -rw-r--r-- | e-util/gtk-compat.h | 19 | ||||
| -rw-r--r-- | libgnomecanvas/Makefile.am | 1 | ||||
| -rw-r--r-- | libgnomecanvas/gailcanvasitem.c | 6 | ||||
| -rw-r--r-- | widgets/misc/Makefile.am | 1 | ||||
| -rw-r--r-- | widgets/table/Makefile.am | 1 |
5 files changed, 24 insertions, 4 deletions
diff --git a/e-util/gtk-compat.h b/e-util/gtk-compat.h index 9dfa8a6bc0..ab4a87209b 100644 --- a/e-util/gtk-compat.h +++ b/e-util/gtk-compat.h @@ -33,6 +33,25 @@ static void gtk_combo_box_text_init (GtkComboBoxText *cbt) {} \ static void gtk_combo_box_text_class_init (GtkComboBoxTextClass *kl) {} +static inline gint +gdk_window_get_width (GdkWindow *window) +{ + gint width, height; + + gdk_drawable_get_size (GDK_DRAWABLE (window), &width, &height); + + return width; +} + +static inline gint +gdk_window_get_height (GdkWindow *window) +{ + gint width, height; + + gdk_drawable_get_size (GDK_DRAWABLE (window), &width, &height); + + return height; +} #endif #if GTK_CHECK_VERSION (2,23,0) diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am index 939712f37a..828de3c500 100644 --- a/libgnomecanvas/Makefile.am +++ b/libgnomecanvas/Makefile.am @@ -62,7 +62,6 @@ MARSHAL_GENERATED = \ gnome-canvas-marshal.h libgnomecanvas_la_LIBADD = \ - $(top_builddir)/libart_lgpl/libart_lgpl.la \ $(GNOME_PLATFORM_LIBS) libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED) diff --git a/libgnomecanvas/gailcanvasitem.c b/libgnomecanvas/gailcanvasitem.c index 1c08d66f5f..54e0b7c576 100644 --- a/libgnomecanvas/gailcanvasitem.c +++ b/libgnomecanvas/gailcanvasitem.c @@ -24,6 +24,9 @@ #include "gailcanvasitem.h" #include <libgail-util/gailmisc.h> +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + static void gail_canvas_item_initialize (AtkObject *obj, gpointer data); static AtkObject* gail_canvas_item_get_parent (AtkObject *obj); @@ -398,7 +401,8 @@ is_item_in_window (GnomeCanvasItem *item, window_rect.x = 0; window_rect.y = 0; - gdk_drawable_get_size (window, &window_rect.width, &window_rect.height); + window_rect.width = gdk_window_get_width (window); + window_rect.height = gdk_window_get_height (window); retval = gdk_rectangle_intersect (extents, &window_rect, NULL); } diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 4ee47766b4..4375c0641e 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -155,7 +155,6 @@ libemiscwidgets_la_LIBADD = \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/a11y/libevolution-a11y.la \ $(top_builddir)/libgnomecanvas/libgnomecanvas.la \ - $(top_builddir)/libart_lgpl/libart_lgpl.la \ $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(MATH_LIB) \ diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am index a1fe865e45..b2afc9990e 100644 --- a/widgets/table/Makefile.am +++ b/widgets/table/Makefile.am @@ -173,7 +173,6 @@ libetable_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/text/libetext.la \ $(top_builddir)/libgnomecanvas/libgnomecanvas.la \ - $(top_builddir)/libart_lgpl/libart_lgpl.la \ $(E_UTIL_LIBS) \ $(E_WIDGETS_LIBS) \ $(MATH_LIB) \ |