Commit 42cc312d authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Add dependency on Atk for accessibility support.

Thu May  3 14:13:49 2001  Owen Taylor  <otaylor@redhat.com>

        * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add
	dependency on Atk for accessibility support.

	* configure.in **/Makefile.am: Major reworking of substituted
	variables for CFLAGS/LIBS to make a lot more sane and
	keep the the compile/link lines a bit shorter.

	* gdk/x11/gdkkeys-x11.c: Fix #endif with trailing stuff.
parent 3125dc0c
Thu May 3 14:13:49 2001 Owen Taylor <otaylor@redhat.com>
* INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add
dependency on Atk for accessibility support.
* configure.in **/Makefile.am: Major reworking of substituted
variables for CFLAGS/LIBS to make a lot more sane and
keep the the compile/link lines a bit shorter.
* gdk/x11/gdkkeys-x11.c: Fix #endif with trailing stuff.
Thu May 3 08:10:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_class_init): Fix return
......
Thu May 3 14:13:49 2001 Owen Taylor <otaylor@redhat.com>
* INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add
dependency on Atk for accessibility support.
* configure.in **/Makefile.am: Major reworking of substituted
variables for CFLAGS/LIBS to make a lot more sane and
keep the the compile/link lines a bit shorter.
* gdk/x11/gdkkeys-x11.c: Fix #endif with trailing stuff.
Thu May 3 08:10:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_class_init): Fix return
......
Thu May 3 14:13:49 2001 Owen Taylor <otaylor@redhat.com>
* INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add
dependency on Atk for accessibility support.
* configure.in **/Makefile.am: Major reworking of substituted
variables for CFLAGS/LIBS to make a lot more sane and
keep the the compile/link lines a bit shorter.
* gdk/x11/gdkkeys-x11.c: Fix #endif with trailing stuff.
Thu May 3 08:10:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_class_init): Fix return
......
Thu May 3 14:13:49 2001 Owen Taylor <otaylor@redhat.com>
* INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add
dependency on Atk for accessibility support.
* configure.in **/Makefile.am: Major reworking of substituted
variables for CFLAGS/LIBS to make a lot more sane and
keep the the compile/link lines a bit shorter.
* gdk/x11/gdkkeys-x11.c: Fix #endif with trailing stuff.
Thu May 3 08:10:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_class_init): Fix return
......
Thu May 3 14:13:49 2001 Owen Taylor <otaylor@redhat.com>
* INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add
dependency on Atk for accessibility support.
* configure.in **/Makefile.am: Major reworking of substituted
variables for CFLAGS/LIBS to make a lot more sane and
keep the the compile/link lines a bit shorter.
* gdk/x11/gdkkeys-x11.c: Fix #endif with trailing stuff.
Thu May 3 08:10:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_class_init): Fix return
......
Thu May 3 14:13:49 2001 Owen Taylor <otaylor@redhat.com>
* INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add
dependency on Atk for accessibility support.
* configure.in **/Makefile.am: Major reworking of substituted
variables for CFLAGS/LIBS to make a lot more sane and
keep the the compile/link lines a bit shorter.
* gdk/x11/gdkkeys-x11.c: Fix #endif with trailing stuff.
Thu May 3 08:10:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_class_init): Fix return
......
Thu May 3 14:13:49 2001 Owen Taylor <otaylor@redhat.com>
* INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add
dependency on Atk for accessibility support.
* configure.in **/Makefile.am: Major reworking of substituted
variables for CFLAGS/LIBS to make a lot more sane and
keep the the compile/link lines a bit shorter.
* gdk/x11/gdkkeys-x11.c: Fix #endif with trailing stuff.
Thu May 3 08:10:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_class_init): Fix return
......
......@@ -13,8 +13,8 @@ These should be available by ftp from ftp.gnu.org or any of the
fine GNU mirrors. Beta software can be found at alpha.gnu.org.
In order to get CVS gtk+ installed on your system, you need to have
the most recent CVS version of glib installed as well.
The installation process of glib is similar to that of gtk+, but
the most recent CVS version of glib, pango, and atk installed as well.
The installation process of these libraries is similar to that of gtk+, but
needs to be fulfilled prior to installation of gtk+.
To compile a CVS version of gtk+ on your system, you will need to take
......@@ -45,6 +45,8 @@ gtk+ and glib. You can do the following to get glib and gtk+ from cvs:
$ cvs login
(there is no password, just hit return)
$ cvs -z3 checkout glib
$ cvs -z3 checkout pango
$ cvs -z3 checkout atk
$ cvs -z3 checkout gtk+
For information about submitting patches and commiting changes
......
......@@ -3,15 +3,7 @@ Prerequisites
GTK+ requires the following packages:
- The GLIB library, available at the same location as GTK+
- The Pango library, available from:
http://www.pango.org/download.shtml
Pango also requires the FriBidi library, available from:
http://imagic.weizmann.ac.il/~dov/freesw/FriBidi/
- The GLIB, Pango, and Atk libraries, available at the same location as GTK+
- The TIFF, PNG, and JPEG image loading libraries. You most
likely have these installed on your system already. If not
......
......@@ -3,15 +3,7 @@ Prerequisites
GTK+ requires the following packages:
- The GLIB library, available at the same location as GTK+
- The Pango library, available from:
http://www.pango.org/download.shtml
Pango also requires the FriBidi library, available from:
http://imagic.weizmann.ac.il/~dov/freesw/FriBidi/
- The GLIB, Pango, and Atk libraries, available at the same location as GTK+
- The TIFF, PNG, and JPEG image loading libraries. You most
likely have these installed on your system already. If not
......
This diff is collapsed.
lib_LTLIBRARIES=libgdk_pixbuf_xlib-1.3.la
INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/gdk-pixbuf \
-I$(top_srcdir)/contrib \
$(GLIB_CFLAGS) \
@x_cflags@
LDADDS = @STRIP_BEGIN@ \
@x_ldflags@ \
@x_libs@ \
@GLIB_LIBS@ \
-lm \
@GDK_PIXBUF_XLIB_DEP_CFLAGS@ \
@STRIP_END@
LDADDS = @STRIP_BEGIN@ \
@GDK_PIXBUF_XLIB_DEP_LIBS@ \
@STRIP_END@
libgdk_pixbuf_xlib_1_3_la_LDFLAGS = \
......
......@@ -8,10 +8,7 @@ INCLUDES = @STRIP_BEGIN@ \
-DGTK_DISABLE_COMPAT_H \
-DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@PANGO_CFLAGS@ \
@GLIB_CFLAGS@ \
@more_cflags@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
DEPS = \
......@@ -23,13 +20,6 @@ LDADDS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@more_ldflags@ \
@more_libs@ \
@GDK_WLIBS@ \
@PANGO_LIBS@ \
@GLIB_LIBS@ \
@GTK_LIBS_EXTRA@ \
-lm \
@STRIP_END@
noinst_PROGRAMS = \
......
......@@ -26,10 +26,7 @@ INCLUDES = @STRIP_BEGIN@ \
-DGTK_DISABLE_COMPAT_H \
-DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@PANGO_CFLAGS@ \
@GLIB_CFLAGS@ \
@more_cflags@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
DEPS = \
......@@ -41,13 +38,6 @@ LDADDS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@more_ldflags@ \
@more_libs@ \
@GDK_WLIBS@ \
@PANGO_LIBS@ \
@GLIB_LIBS@ \
@GTK_LIBS_EXTRA@ \
-lm \
@STRIP_END@
bin_PROGRAMS = gtk-demo
......
......@@ -54,23 +54,14 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@ \
-I$(top_builddir)/gdk \
-DGTK_DISABLE_COMPAT_H \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@PANGO_CFLAGS@ \
@GLIB_CFLAGS@ \
@more_cflags@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
GTKDOC_LIBS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@more_ldflags@ \
@more_libs@ \
@GDK_WLIBS@ \
@PANGO_LIBS@ \
@GLIB_LIBS@ \
@GTK_LIBS_EXTRA@ \
-lm \
@GTK_DEP_LIBS@ \
@STRIP_END@
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
......
......@@ -70,23 +70,13 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@ \
-I$(top_builddir)/gdk \
-DGTK_ENABLE_BROKEN \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@PANGO_CFLAGS@ \
@GLIB_CFLAGS@ \
@more_cflags@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
GTKDOC_LIBS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@more_ldflags@ \
@more_libs@ \
@GDK_WLIBS@ \
@PANGO_LIBS@ \
@GLIB_LIBS@ \
@GTK_LIBS_EXTRA@ \
-lm \
@STRIP_END@
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
......
......@@ -7,6 +7,6 @@ target=@gdktarget@
Name: GDK
Description: GIMP Drawing Kit (${target} target)
Version: @VERSION@
Requires: gdk-pixbuf-2.0 @PANGO_PACKAGES@
Libs: -L${libdir} @more_ldflags@ -lgdk-${target}-1.3 @more_libs@ @GDK_WLIBS@
Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @more_cflags@
Requires: gdk-pixbuf-2.0 @GDK_PACKAGES@
Libs: -L${libdir} -lgdk-${target}-1.3 @GDK_EXTRA_LIBS@
Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @GDK_EXTRA_CFLAGS@
......@@ -7,6 +7,6 @@ Name: GdkPixbuf
Description: Image loading and scaling
Version: @VERSION@
Requires: gobject-2.0,gmodule-2.0
Libs: -L${libdir} -lgdk_pixbuf-1.3 @INTLLIBS@ @MATH_LIB@
Cflags: -I${includedir}/gtk-2.0
Libs: -L${libdir} -lgdk_pixbuf-1.3 @GDK_PIXBUF_EXTRA_LIBS@
Cflags: -I${includedir}/gtk-2.0 @GDK_PIXBUF_EXTRA_CFLAGS@
......@@ -154,22 +154,21 @@ noinst_LTLIBRARIES = \
builtin_objs = @INCLUDED_LOADER_OBJ@
static_libs = $(STATIC_LIB_DEPS)
endif
noinst_PROGRAMS = test-gdk-pixbuf
TESTS = test-gdk-pixbuf
DEPS = libgdk_pixbuf-1.3.la
INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/gdk-pixbuf \
-I$(top_builddir)/gdk-pixbuf \
@INCLUDED_LOADER_DEFINE@ \
@GLIB_CFLAGS@
INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/gdk-pixbuf \
-I$(top_builddir)/gdk-pixbuf \
@INCLUDED_LOADER_DEFINE@ \
@GTK_DEBUG_FLAGS@ \
@GDK_PIXBUF_DEP_CFLAGS@
AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\""
LDADDS = libgdk_pixbuf-1.3.la $(GLIB_LIBS) $(STATIC_LIB_DEPS) $(MATH_LIB)
LDADDS = libgdk_pixbuf-1.3.la
test_gdk_pixbuf_LDADD = $(LDADDS)
......@@ -179,8 +178,6 @@ make_inline_pixbuf_SOURCES=make-inline-pixbuf.c
make_inline_pixbuf_LDADD = $(LDADDS)
GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(INTLLIBS)
#
# The GdkPixBuf library
#
......@@ -205,7 +202,7 @@ libgdk_pixbuf_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
@LIBTOOL_EXPORT_OPTIONS@ \
$(GLIB_LIBS)
libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(static_libs)
libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS)
libgdk_pixbuf_1_3_la_DEPENDENCIES = $(builtin_objs)
libgdk_pixbufinclude_HEADERS = \
......
......@@ -17,10 +17,7 @@ common_includes = @STRIP_BEGIN@ \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk-pixbuf \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@PANGO_CFLAGS@ \
@GLIB_CFLAGS@ \
@more_cflags@ \
@GDK_DEP_CFLAGS@ \
@STRIP_END@
INCLUDES = $(common_includes)
......@@ -34,10 +31,7 @@ LDFLAGS = @STRIP_BEGIN@ \
-export-dynamic \
-rpath @prefix@/lib \
@LIBTOOL_EXPORT_OPTIONS@ \
@PANGO_LIBS@ \
@GLIB_DEPLIBS@ \
@more_ldflags@ \
@more_libs@ \
@GDK_DEP_LIBS@ \
-lm \
@STRIP_END@
......
......@@ -9,17 +9,12 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
@FREETYPE_CFLAGS@ \
@GDK_DEP_CFLAGS@ \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@GLIB_CFLAGS@ \
@PANGO_CFLAGS@ \
@STRIP_END@
LDFLAGS = @STRIP_BEGIN@ \
@GLIB_LIBS@ \
@PANGO_LIBS@ \
@FREETYPE_LIBS@ \
@GDK_DEP_LIBS@ \
-lm \
@STRIP_END@
......
......@@ -5,16 +5,11 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@GLIB_CFLAGS@ \
@more_cflags@ \
@GDK_DEP_CFLAGS@ \
@STRIP_END@
LDADDS = @STRIP_BEGIN@ \
@more_ldflags@ \
@more_libs@ \
@GLIB_LIBS@ \
-lm \
LDADDS = @STRIP_BEGIN@ \
@GDK_DEP_LIBS@ \
@STRIP_END@
noinst_LTLIBRARIES = libgdk-nanox.la
......
......@@ -9,18 +9,11 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@PANGO_CFLAGS@ \
@GLIB_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@x_cflags@ \
@GDK_DEP_CFLAGS@ \
@STRIP_END@
LDADDS = @STRIP_BEGIN@ \
@x_ldflags@ \
@x_libs@ \
@GLIB_LIBS@ \
-lm \
LDADDS = @STRIP_BEGIN@ \
@GDK_DEP_LIBS@ \
@STRIP_END@
noinst_LTLIBRARIES = libgdk-x11.la
......
......@@ -785,4 +785,4 @@ gdk_keyval_convert_case (guint symbol,
if (upper)
*upper = xupper;
}
#endif HAVE_XCONVERTCASE
#endif /* HAVE_XCONVERTCASE */
......@@ -34,16 +34,9 @@
#include <limits.h>
#include <errno.h>
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif /* HAVE_SYS_SELECT_H_ */
#define XLIB_ILLEGAL_ACCESS
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <X11/Xos.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
#ifdef HAVE_XKB
#include <X11/XKBlib.h>
......
......@@ -7,6 +7,6 @@ target=@gdktarget@
Name: GTK+
Description: GIMP Tool Kit (${target} target)
Version: @VERSION@
Requires: gdk-${target}-2.0
Libs: -L${libdir} -lgtk-${target}-1.3
Cflags: -I${includedir}/gtk-2.0
Requires: gdk-${target}-2.0 @GTK_PACKAGES@
Libs: -L${libdir} -lgtk-${target}-1.3 @GTK_EXTRA_LIBS@
Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@
......@@ -16,11 +16,7 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) -I../gdk \
-I$(top_srcdir)/gdk \
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@PANGO_CFLAGS@ \
@GLIB_CFLAGS@ \
@more_cflags@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
gtarget=@gdktarget@
......@@ -34,11 +30,7 @@ LDFLAGS = @STRIP_BEGIN@ \
-export-dynamic \
-rpath @prefix@/lib \
@LIBTOOL_EXPORT_OPTIONS@ \
@PANGO_LIBS@ \
@GLIB_DEPLIBS@ \
@more_ldflags@ \
@more_libs@ \
-lm \
@GTK_DEP_LIBS@ \
@STRIP_END@
#
......@@ -51,6 +43,7 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
gtk.h \
gtkaccelgroup.h \
gtkaccellabel.h \
gtkaccessible.h \
gtkadjustment.h \
gtkalignment.h \
gtkarg.h \
......@@ -209,6 +202,7 @@ gtk_private_h_sources = @STRIP_BEGIN@ \
gtk_c_sources = @STRIP_BEGIN@ \
gtkaccelgroup.c \
gtkaccellabel.c \
gtkaccessible.c \
gtkadjustment.c \
gtkalignment.c \
gtkarg.c \
......@@ -516,13 +510,6 @@ LDADDS = @STRIP_BEGIN@ \
@gtktargetlib@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
@more_ldflags@ \
@more_libs@ \
@GDK_WLIBS@ \
@PANGO_LIBS@ \
@GLIB_LIBS@ \
@GTK_LIBS_EXTRA@ \
-lm \
@STRIP_END@
#
......
......@@ -31,6 +31,7 @@
#include <gdk/gdk.h>
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkaccellabel.h>
#include <gtk/gtkaccessible.h>
#include <gtk/gtkadjustment.h>
#include <gtk/gtkalignment.h>
#include <gtk/gtkarg.h>
......
/* GTK - The GIMP Toolkit
* Copyright 2001 Sun Microsystems Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <string.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkaccessible.h>
static void gtk_accessible_class_init (GtkAccessibleClass *klass);
static void gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible);
GtkType
gtk_accessible_get_type (void)
{
static GtkType accessible_type = 0;
if (!accessible_type)
{
static const GTypeInfo accessible_info =
{
sizeof (GtkAccessibleClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gtk_accessible_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkAccessible),
16, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
accessible_type = g_type_register_static (ATK_TYPE_OBJECT, "GtkAccessible", &accessible_info, 0);
}
return accessible_type;
}
static void
gtk_accessible_class_init (GtkAccessibleClass *klass)
{
klass->connect_widget_destroyed = gtk_accessible_real_connect_widget_destroyed;
}
/**
* gtk_accessible_connect_widget_destroyed
* @accessible: a #GtkAccessible
*
* This function specifies the callback function to be called when the widget
* corresponding to a GtkAccessible is destroyed.
*/
void
gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)
{
GtkAccessibleClass *class;
g_return_if_fail (accessible != NULL);
g_return_if_fail (GTK_IS_ACCESSIBLE (accessible));
class = GTK_ACCESSIBLE_GET_CLASS (accessible);
if (class->connect_widget_destroyed)
class->connect_widget_destroyed (accessible);
}
static void
gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
{
if (accessible->widget)
{
gtk_signal_connect (GTK_OBJECT (accessible->widget),
"destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroyed),
&accessible->widget);
}
}
/* GTK - The GIMP Toolkit
* Copyright 2001 Sun Microsystems Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GTK_ACCESSIBLE_H__
#define __GTK_ACCESSIBLE_H__
#include <atk/atk.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_ACCESSIBLE (gtk_accessible_get_type ())
#define GTK_ACCESSIBLE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessible))
#define GTK_ACCESSIBLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
#define GTK_IS_ACCESSIBLE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_ACCESSIBLE))
#define GTK_IS_ACCESSIBLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCESSIBLE))
#define GTK_ACCESSIBLE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
typedef struct _GtkAccessible GtkAccessible;
typedef struct _GtkAccessibleClass GtkAccessibleClass;
/**
* This object is a thin wrapper, in the GTK+ namespace, for AtkObject
*/
struct _GtkAccessible
{
AtkObject parent;
/*
* The GtkWidget whose properties and features are exported via this
* accessible instance.
*/
GtkWidget *widget;
};
GtkType gtk_accessible_get_type (void);
struct _GtkAccessibleClass
{
AtkObjectClass parent_class;
void (*connect_widget_destroyed) (GtkAccessible *accessible);
};
void gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GTK_ACCESSIBLE_H__ */
......@@ -44,7 +44,7 @@
#include "gobject/gvaluecollector.h"
#include "gdk/gdkkeysyms.h"
#include "gtkintl.h"
#include "gtkaccessible.h"
#define WIDGET_CLASS(w) GTK_WIDGET_GET_CLASS (w)
#define INIT_PATH_SIZE (512)
......@@ -203,7 +203,11 @@ static gboolean gtk_widget_real_mnemonic_activate (GtkWidget *widget,
static void gtk_widget_aux_info_destroy (GtkWidgetAuxInfo *aux_info);
static void gtk_widget_do_uposition (GtkWidget *widget);
static AtkObject* gtk_widget_real_get_accessible (GtkWidget *widget);
static void gtk_widget_accessible_interface_init (AtkImplementorIface *iface);
static AtkObject * gtk_widget_ref_accessible (AtkImplementor *implementor);
static gpointer parent_class = NULL;
static guint widget_signals[LAST_SIGNAL] = { 0 };
......@@ -226,6 +230,7 @@ static GQuark quark_shape_info = 0;
static GQuark quark_colormap = 0;
static GQuark quark_pango_context = 0;
static GQuark quark_rc_style = 0;
static GQuark quark_accessible_object = 0;
/*****************************************
......@@ -255,7 +260,19 @@ gtk_widget_get_type (void)
(GtkClassInitFunc) NULL,
};
static const GInterfaceInfo accessibility_info =
{
(GInterfaceInitFunc) gtk_widget_accessible_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL /* interface data */
};
widget_type = gtk_type_unique (GTK_TYPE_OBJECT, &widget_info);
g_type_add_interface_static (widget_type, ATK_TYPE_IMPLEMENTOR,
&accessibility_info) ;
}
return widget_type;
......@@ -337,6 +354,9 @@ gtk_widget_class_init (GtkWidgetClass *klass)
klass->drag_drop = NULL;
klass->drag_data_received = NULL;
/* Accessibility support */
klass->get_accessible = gtk_widget_real_get_accessible;
klass->no_expose_event = NULL;