|
Line
Link Here
|
| 0 |
-- 1/configure.ac |
0 |
++ 2/configure.ac |
|
Lines 1393-1400
AC_SUBST(GDK_DEP_CFLAGS)
Link Here
|
| 1393 |
# Check for Accessibility Toolkit flags |
1393 |
# Check for Accessibility Toolkit flags |
| 1394 |
######################################## |
1394 |
######################################## |
| 1395 |
|
1395 |
|
| 1396 |
if test x$enable_x11_backend = xyes; then |
1396 |
AC_ARG_WITH(atk-bridge, |
|
|
1397 |
AS_HELP_STRING([--without-atk-bridge], [Do not use atk-bridge-2.0]), |
| 1398 |
:, with_atk_bridge=yes) |
| 1399 |
|
| 1400 |
if test x$enable_x11_backend = xyes -a x$with_atk_bridge = xyes; then |
| 1397 |
ATK_PACKAGES="atk atk-bridge-2.0" |
1401 |
ATK_PACKAGES="atk atk-bridge-2.0" |
|
|
1402 |
AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define if we're using atk-bridge-2.0]) |
| 1398 |
else |
1403 |
else |
| 1399 |
ATK_PACKAGES="atk" |
1404 |
ATK_PACKAGES="atk" |
| 1400 |
fi |
1405 |
fi |
| 1401 |
-- 1/config.h.in |
1406 |
++ 1/config.h.in |
|
Lines 10-15
Link Here
|
| 10 |
/* Disable deprecation warnings from glib */ |
10 |
/* Disable deprecation warnings from glib */ |
| 11 |
#undef GLIB_DISABLE_DEPRECATION_WARNINGS |
11 |
#undef GLIB_DISABLE_DEPRECATION_WARNINGS |
| 12 |
|
12 |
|
|
|
13 |
/* Define if we're using atk-bridge-2.0 */ |
| 14 |
#undef HAVE_ATK_BRIDGE |
| 15 |
|
| 13 |
/* Define to 1 if you have the `bind_textdomain_codeset' function. */ |
16 |
/* Define to 1 if you have the `bind_textdomain_codeset' function. */ |
| 14 |
#undef HAVE_BIND_TEXTDOMAIN_CODESET |
17 |
#undef HAVE_BIND_TEXTDOMAIN_CODESET |
| 15 |
|
18 |
|
| 16 |
-- 1/gtk/a11y/gtkaccessibility.c |
19 |
++ 1/gtk/a11y/gtkaccessibility.c |
|
Lines 38-45
Link Here
|
| 38 |
#include <gtk/gtkaccessible.h> |
38 |
#include <gtk/gtkaccessible.h> |
| 39 |
|
39 |
|
| 40 |
#ifdef GDK_WINDOWING_X11 |
40 |
#ifdef GDK_WINDOWING_X11 |
|
|
41 |
#ifdef HAVE_ATK_BRIDGE |
| 41 |
#include <atk-bridge.h> |
42 |
#include <atk-bridge.h> |
| 42 |
#endif |
43 |
#endif |
|
|
44 |
#endif |
| 43 |
|
45 |
|
| 44 |
static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, |
46 |
static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, |
| 45 |
guint n_param_values, |
47 |
guint n_param_values, |
|
Lines 989-996
_gtk_accessibility_init (void)
Link Here
|
| 989 |
do_window_event_initialization (); |
991 |
do_window_event_initialization (); |
| 990 |
|
992 |
|
| 991 |
#ifdef GDK_WINDOWING_X11 |
993 |
#ifdef GDK_WINDOWING_X11 |
|
|
994 |
#ifdef HAVE_ATK_BRIDGE |
| 992 |
atk_bridge_adaptor_init (NULL, NULL); |
995 |
atk_bridge_adaptor_init (NULL, NULL); |
| 993 |
#endif |
996 |
#endif |
|
|
997 |
#endif |
| 994 |
|
998 |
|
| 995 |
atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); |
999 |
atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); |
| 996 |
} |
1000 |
} |
