callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt branch for building with GTK+ 2.22.

Browse Source
This commit is contained in:
Matthew Barnes
2010-10-23 10:54:13 -04:00
parent ac3903ac0f
commit df5ff95999
5 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
e-util/gtk-compat.h
View File

@ -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)

1
libgnomecanvas/Makefile.am
View File

@ -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)

6
libgnomecanvas/gailcanvasitem.c
View File

@ -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);
}

1
widgets/misc/Makefile.am
View File

@ -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) \

1
widgets/table/Makefile.am
View File

@ -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) \