Compare commits

...

11 Commits

Author SHA1 Message Date
Matthias Clasen
91b8dbdff0 Fix inter-header includes 2012-10-30 11:59:24 -04:00
Matthias Clasen
4c980c6310 Include a11y headers in gtk.h 2012-10-30 11:59:02 -04:00
Matthias Clasen
74ce4889ab Trivial sorting fix 2012-10-30 11:58:47 -04:00
Matthias Clasen
38f18f1f6f Add single-include guards to a11y headers
More preparation for installing these headers.
2012-10-30 11:39:38 -04:00
Matthias Clasen
3912404893 More gail-removal
Rename GailMisc to GtkMiscImpl.
2012-10-30 11:31:37 -04:00
Matthias Clasen
8b0a955964 Rename and clean up gailutil.[hc] 2012-10-30 11:09:02 -04:00
Matthias Clasen
c870777bff Cosmetics
Replace GAIL in top comments by 'GTK+ - accessibility implementations'.
2012-10-30 10:21:44 -04:00
Matthias Clasen
386fe31199 Some renaming
Move gail.h to gtkaccessibility.h, and libgail to libgtka11y.
2012-10-30 10:20:59 -04:00
Matthias Clasen
ef1a644f71 fixup
forgot to re-prefix set_layer
2012-10-30 10:07:13 -04:00
Matthias Clasen
4a7168d17a fixup
forgotten include in gtktreeviewcolumn.c
2012-10-30 10:06:25 -04:00
Matthias Clasen
f8ea4cfff2 Make accessible implementations public
This commit exposes the get_type() functions for gtks accessible
implementations. Header files are installed in the same location
as other gtk headers.
2012-10-30 09:52:05 -04:00
117 changed files with 1578 additions and 1174 deletions

View File

@@ -107,12 +107,12 @@ endif
libgtkincludedir = $(includedir)/gtk-3.0/gtk libgtkincludedir = $(includedir)/gtk-3.0/gtk
libadd = \ libadd = \
$(top_builddir)/gdk/libgdk-3.la \ $(top_builddir)/gdk/libgdk-3.la \
$(top_builddir)/gtk/a11y/libgail.la \ $(top_builddir)/gtk/a11y/libgtka11y.la \
$(GMODULE_LIBS) \ $(GMODULE_LIBS) \
$(GTK_DEP_LIBS) $(GTK_DEP_LIBS)
deps = \ deps = \
$(top_builddir)/gdk/libgdk-3.la \ $(top_builddir)/gdk/libgdk-3.la \
$(top_builddir)/gtk/a11y/libgail.la $(top_builddir)/gtk/a11y/libgtka11y.la
# libtool stuff: set version and export symbols for resolving # libtool stuff: set version and export symbols for resolving
# since automake doesn't support conditionalized libsomething_la_LDFLAGS # since automake doesn't support conditionalized libsomething_la_LDFLAGS

View File

@@ -1,9 +1,11 @@
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
noinst_LTLIBRARIES = libgail.la noinst_LTLIBRARIES = libgtka11y.la
gail_c_sources = \ gtka11y_c_sources = \
gail.c \ gtkaccessibility.c \
gtkaccessibilityutil.c \
gtkaccessibilitymisc.c \
gtkarrowaccessible.c \ gtkarrowaccessible.c \
gtkbooleancellaccessible.c \ gtkbooleancellaccessible.c \
gtkboxaccessible.c \ gtkboxaccessible.c \
@@ -49,12 +51,10 @@ gail_c_sources = \
gtktoplevelaccessible.c \ gtktoplevelaccessible.c \
gtktreeviewaccessible.c \ gtktreeviewaccessible.c \
gtkwidgetaccessible.c \ gtkwidgetaccessible.c \
gtkwindowaccessible.c \ gtkwindowaccessible.c
gailutil.c \
gailmisc.c
gail_private_h_sources = \ gtka11yincludedir = $(includedir)/gtk-3.0/gtk/a11y
gail.h \ gtka11yinclude_HEADERS = \
gtkarrowaccessible.h \ gtkarrowaccessible.h \
gtkbooleancellaccessible.h \ gtkbooleancellaccessible.h \
gtkboxaccessible.h \ gtkboxaccessible.h \
@@ -62,7 +62,6 @@ gail_private_h_sources = \
gtkcellaccessible.h \ gtkcellaccessible.h \
gtkcellaccessibleparent.h \ gtkcellaccessibleparent.h \
gtkcheckmenuitemaccessible.h \ gtkcheckmenuitemaccessible.h \
gtkcolorswatchaccessible.h \
gtkcomboboxaccessible.h \ gtkcomboboxaccessible.h \
gtkcontaineraccessible.h \ gtkcontaineraccessible.h \
gtkcontainercellaccessible.h \ gtkcontainercellaccessible.h \
@@ -76,8 +75,8 @@ gail_private_h_sources = \
gtklinkbuttonaccessible.h \ gtklinkbuttonaccessible.h \
gtklockbuttonaccessible.h \ gtklockbuttonaccessible.h \
gtkmenuaccessible.h \ gtkmenuaccessible.h \
gtkmenushellaccessible.h \
gtkmenuitemaccessible.h \ gtkmenuitemaccessible.h \
gtkmenushellaccessible.h \
gtknotebookaccessible.h \ gtknotebookaccessible.h \
gtknotebookpageaccessible.h \ gtknotebookpageaccessible.h \
gtkpanedaccessible.h \ gtkpanedaccessible.h \
@@ -100,15 +99,25 @@ gail_private_h_sources = \
gtktoplevelaccessible.h \ gtktoplevelaccessible.h \
gtktreeviewaccessible.h \ gtktreeviewaccessible.h \
gtkwidgetaccessible.h \ gtkwidgetaccessible.h \
gtkwindowaccessible.h \ gtkwindowaccessible.h
gailutil.h \
gailmisc.h
libgail_la_SOURCES = \ gtka11y_private_h_sources = \
$(gail_c_sources) \ gtkaccessibility.h \
$(gail_private_h_sources) gtkaccessibilityutil.h \
gtkaccessibilitymisc.h \
gtkcolorswatchaccessible.h \
gtkcellaccessibleprivate.h \
gtklockbuttonaccessibleprivate.h \
gtkiconviewaccessibleprivate.h \
gtktreeviewaccessibleprivate.h \
gtktextviewaccessibleprivate.h \
gtkwidgetaccessibleprivate.h
libgail_la_CPPFLAGS = \ libgtka11y_la_SOURCES = \
$(gtka11y_c_sources) \
$(gtka11y_private_h_sources)
libgtka11y_la_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
@@ -118,18 +127,18 @@ libgail_la_CPPFLAGS = \
-DGTK_COMPILATION \ -DGTK_COMPILATION \
$(AM_CPPFLAGS) $(AM_CPPFLAGS)
libgail_la_CFLAGS = \ libgtka11y_la_CFLAGS = \
$(GTK_DEP_CFLAGS) \ $(GTK_DEP_CFLAGS) \
$(GTK_DEBUG_FLAGS) \ $(GTK_DEBUG_FLAGS) \
$(AM_CFLAGS) $(AM_CFLAGS)
libgail_la_LIBADD = \ libgtka11y_la_LIBADD = \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(INTLLIBS) $(INTLLIBS)
libgail_la_LDFLAGS = \ libgtka11y_la_LDFLAGS = \
$(LDFLAGS) $(LDFLAGS)
dist-hook: ../../build/win32/vs9/libgail.vcproj ../../build/win32/vs10/libgail.vcxproj ../../build/win32/vs10/libgail.vcxproj.filters dist-hook: ../../build/win32/vs9/libgail.vcproj ../../build/win32/vs10/libgail.vcxproj ../../build/win32/vs10/libgail.vcxproj.filters
../../build/win32/vs9/libgail.vcproj: ../../build/win32/vs9/libgail.vcprojin ../../build/win32/vs9/libgail.vcproj: ../../build/win32/vs9/libgail.vcprojin
@@ -141,7 +150,7 @@ dist-hook: ../../build/win32/vs9/libgail.vcproj ../../build/win32/vs10/libgail.v
done >libgail.sourcefiles done >libgail.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/libgail.vcprojin >$@ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/libgail.vcprojin >$@
rm libgail.sourcefiles rm libgail.sourcefiles
../../build/win32/vs10/libgail.vcxproj: ../../build/win32/vs10/libgail.vcxprojin ../../build/win32/vs10/libgail.vcxproj: ../../build/win32/vs10/libgail.vcxprojin
for F in $(libgail_la_SOURCES); do \ for F in $(libgail_la_SOURCES); do \
case $$F in \ case $$F in \

View File

@@ -1,49 +0,0 @@
/* GAIL - The GNOME Accessibility Implementation Library
* 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, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GAIL_MISC_H__
#define __GAIL_MISC_H__
#include <atk/atk.h>
G_BEGIN_DECLS
#define GAIL_TYPE_MISC (_gail_misc_get_type ())
#define GAIL_MISC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_MISC, GailMisc))
#define GAIL_MISC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_MISC, GailMiscClass))
#define GAIL_IS_MISC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_MISC))
#define GAIL_IS_MISC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_MISC))
#define GAIL_MISC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_MISC, GailMiscClass))
typedef struct _GailMisc GailMisc;
typedef struct _GailMiscClass GailMiscClass;
struct _GailMisc
{
AtkMisc parent;
};
struct _GailMiscClass
{
AtkMiscClass parent_class;
};
GType _gail_misc_get_type (void);
G_END_DECLS
#endif /* __GAIL_MISC_H__ */

View File

@@ -1,373 +0,0 @@
/* GAIL - The GNOME Accessibility Implementation Library
* Copyright 2011, F123 Consulting & Mais Diferenças
* Copyright 2001, 2002, 2003 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, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <stdlib.h>
#include <gtk/gtk.h>
#include "gailutil.h"
#include "gtktoplevelaccessible.h"
#include "gtkwindowaccessible.h"
static GSList *key_listener_list = NULL;
typedef struct _GailKeyEventInfo GailKeyEventInfo;
struct _GailKeyEventInfo
{
AtkKeyEventStruct *key_event;
gpointer func_data;
};
static gboolean
state_event_watcher (GSignalInvocationHint *hint,
guint n_param_values,
const GValue *param_values,
gpointer data)
{
GObject *object;
GtkWidget *widget;
AtkObject *atk_obj;
AtkObject *parent;
GdkEventWindowState *event;
gchar *signal_name;
object = g_value_get_object (param_values + 0);
if (!GTK_IS_WINDOW (object))
return FALSE;
event = g_value_get_boxed (param_values + 1);
if (event->type == GDK_WINDOW_STATE)
return FALSE;
widget = GTK_WIDGET (object);
if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
signal_name = "maximize";
else if (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED)
signal_name = "minimize";
else if (event->new_window_state == 0)
signal_name = "restore";
else
return TRUE;
atk_obj = gtk_widget_get_accessible (widget);
if (GTK_IS_WINDOW_ACCESSIBLE (atk_obj))
{
parent = atk_object_get_parent (atk_obj);
if (parent == atk_get_root ())
g_signal_emit_by_name (atk_obj, signal_name);
return TRUE;
}
return FALSE;
}
static gboolean
configure_event_watcher (GSignalInvocationHint *hint,
guint n_param_values,
const GValue *param_values,
gpointer data)
{
GtkAllocation allocation;
GObject *object;
GtkWidget *widget;
AtkObject *atk_obj;
AtkObject *parent;
GdkEvent *event;
gchar *signal_name;
object = g_value_get_object (param_values + 0);
if (!GTK_IS_WINDOW (object))
return FALSE;
event = g_value_get_boxed (param_values + 1);
if (event->type != GDK_CONFIGURE)
return FALSE;
widget = GTK_WIDGET (object);
gtk_widget_get_allocation (widget, &allocation);
if (allocation.x == ((GdkEventConfigure *)event)->x &&
allocation.y == ((GdkEventConfigure *)event)->y &&
allocation.width == ((GdkEventConfigure *)event)->width &&
allocation.height == ((GdkEventConfigure *)event)->height)
return TRUE;
if (allocation.width != ((GdkEventConfigure *)event)->width ||
allocation.height != ((GdkEventConfigure *)event)->height)
signal_name = "resize";
else
signal_name = "move";
atk_obj = gtk_widget_get_accessible (widget);
if (GTK_IS_WINDOW_ACCESSIBLE (atk_obj))
{
parent = atk_object_get_parent (atk_obj);
if (parent == atk_get_root ())
g_signal_emit_by_name (atk_obj, signal_name);
return TRUE;
}
return FALSE;
}
static gboolean
window_focus (GtkWidget *widget,
GdkEventFocus *event)
{
AtkObject *atk_obj;
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
atk_obj = gtk_widget_get_accessible (widget);
g_signal_emit_by_name (atk_obj, event->in ? "activate" : "deactivate");
return FALSE;
}
static void
window_added (AtkObject *atk_obj,
guint index,
AtkObject *child)
{
GtkWidget *widget;
if (!GTK_IS_WINDOW_ACCESSIBLE (child))
return;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (child));
if (!widget)
return;
g_signal_connect (widget, "focus-in-event", (GCallback) window_focus, NULL);
g_signal_connect (widget, "focus-out-event", (GCallback) window_focus, NULL);
g_signal_emit_by_name (child, "create");
}
static void
window_removed (AtkObject *atk_obj,
guint index,
AtkObject *child)
{
GtkWidget *widget;
GtkWindow *window;
if (!GTK_IS_WINDOW_ACCESSIBLE (child))
return;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (child));
if (!widget)
return;
window = GTK_WINDOW (widget);
/*
* Deactivate window if it is still focused and we are removing it. This
* can happen when a dialog displayed by gok is removed.
*/
if (gtk_window_is_active (window) &&
gtk_window_has_toplevel_focus (window))
g_signal_emit_by_name (child, "deactivate");
g_signal_handlers_disconnect_by_func (widget, (gpointer) window_focus, NULL);
g_signal_emit_by_name (child, "destroy");
}
static void
do_window_event_initialization (void)
{
AtkObject *root;
g_type_class_ref (GTK_TYPE_WINDOW_ACCESSIBLE);
g_signal_add_emission_hook (g_signal_lookup ("window-state-event", GTK_TYPE_WIDGET),
0, state_event_watcher, NULL, (GDestroyNotify) NULL);
g_signal_add_emission_hook (g_signal_lookup ("configure-event", GTK_TYPE_WIDGET),
0, configure_event_watcher, NULL, (GDestroyNotify) NULL);
root = atk_get_root ();
g_signal_connect (root, "children-changed::add",
(GCallback) window_added, NULL);
g_signal_connect (root, "children-changed::remove",
(GCallback) window_removed, NULL);
}
static void
undo_window_event_initialization (void)
{
AtkObject *root;
root = atk_get_root ();
g_signal_handlers_disconnect_by_func (root, (GCallback) window_added, NULL);
g_signal_handlers_disconnect_by_func (root, (GCallback) window_removed, NULL);
}
static AtkKeyEventStruct *
atk_key_event_from_gdk_event_key (GdkEventKey *key)
{
AtkKeyEventStruct *event = g_new0 (AtkKeyEventStruct, 1);
switch (key->type)
{
case GDK_KEY_PRESS:
event->type = ATK_KEY_EVENT_PRESS;
break;
case GDK_KEY_RELEASE:
event->type = ATK_KEY_EVENT_RELEASE;
break;
default:
g_assert_not_reached ();
return NULL;
}
event->state = key->state;
event->keyval = key->keyval;
event->length = key->length;
if (key->string && key->string [0] &&
(key->state & GDK_CONTROL_MASK ||
g_unichar_isgraph (g_utf8_get_char (key->string))))
{
event->string = key->string;
}
else if (key->type == GDK_KEY_PRESS ||
key->type == GDK_KEY_RELEASE)
{
event->string = gdk_keyval_name (key->keyval);
}
event->keycode = key->hardware_keycode;
event->timestamp = key->time;
#ifdef GAIL_DEBUG
g_print ("GailKey:\tsym %u\n\tmods %x\n\tcode %u\n\ttime %lx\n",
(unsigned int) event->keyval,
(unsigned int) event->state,
(unsigned int) event->keycode,
(unsigned long int) event->timestamp);
#endif
return event;
}
typedef struct {
AtkKeySnoopFunc func;
gpointer data;
guint key;
} KeyEventListener;
gboolean
_gail_util_key_snooper (GtkWidget *the_widget,
GdkEventKey *event)
{
GSList *l;
AtkKeyEventStruct *atk_event;
gboolean result;
atk_event = atk_key_event_from_gdk_event_key (event);
result = FALSE;
for (l = key_listener_list; l; l = l->next)
{
KeyEventListener *listener = l->data;
result |= listener->func (atk_event, listener->data);
}
g_free (atk_event);
return result;
}
static guint
gail_util_add_key_event_listener (AtkKeySnoopFunc listener_func,
gpointer listener_data)
{
static guint key = 0;
KeyEventListener *listener;
key++;
listener = g_slice_new0 (KeyEventListener);
listener->func = listener_func;
listener->data = listener_data;
listener->key = key;
key_listener_list = g_slist_append (key_listener_list, listener);
return key;
}
static void
gail_util_remove_key_event_listener (guint listener_key)
{
GSList *l;
for (l = key_listener_list; l; l = l->next)
{
KeyEventListener *listener = l->data;
if (listener->key == listener_key)
{
g_slice_free (KeyEventListener, listener);
key_listener_list = g_slist_delete_link (key_listener_list, l);
break;
}
}
}
static AtkObject *
gail_util_get_root (void)
{
static AtkObject *root = NULL;
if (!root)
{
root = g_object_new (GTK_TYPE_TOPLEVEL_ACCESSIBLE, NULL);
atk_object_initialize (root, NULL);
}
return root;
}
static const gchar *
gail_util_get_toolkit_name (void)
{
return "gtk";
}
static const gchar *
gail_util_get_toolkit_version (void)
{
return GTK_VERSION;
}
void
_gail_util_uninstall (void)
{
undo_window_event_initialization ();
}
void
_gail_util_install (void)
{
AtkUtilClass *atk_class = ATK_UTIL_CLASS (g_type_class_ref (ATK_TYPE_UTIL));
atk_class->add_key_event_listener = gail_util_add_key_event_listener;
atk_class->remove_key_event_listener = gail_util_remove_key_event_listener;
atk_class->get_root = gail_util_get_root;
atk_class->get_toolkit_name = gail_util_get_toolkit_name;
atk_class->get_toolkit_version = gail_util_get_toolkit_version;
do_window_event_initialization ();
}

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -17,7 +17,11 @@
#include "config.h" #include "config.h"
#include "gail.h" #include "gtkaccessibility.h"
#include "gtkaccessibilityutil.h"
#include "gtkaccessibilitymisc.h"
#include "gtkwindowaccessible.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -32,8 +36,6 @@
#include <gtk/gtktogglebutton.h> #include <gtk/gtktogglebutton.h>
#include <gtk/gtkcombobox.h> #include <gtk/gtkcombobox.h>
#include <gtk/gtkaccessible.h> #include <gtk/gtkaccessible.h>
#include "gailutil.h"
#include "gailmisc.h"
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include <atk-bridge.h> #include <atk-bridge.h>
@@ -66,7 +68,7 @@ static void gail_focus_tracker_init (void);
static void gail_focus_object_destroyed (gpointer data); static void gail_focus_object_destroyed (gpointer data);
static void gail_focus_tracker (AtkObject *object); static void gail_focus_tracker (AtkObject *object);
static void gail_set_focus_widget (GtkWidget *focus_widget, static void gail_set_focus_widget (GtkWidget *focus_widget,
GtkWidget *widget); GtkWidget *widget);
static void gail_set_focus_object (AtkObject *focus_obj, static void gail_set_focus_object (AtkObject *focus_obj,
AtkObject *obj); AtkObject *obj);
@@ -75,14 +77,14 @@ static GtkWidget* next_focus_widget = NULL;
static gboolean was_deselect = FALSE; static gboolean was_deselect = FALSE;
static GtkWidget* subsequent_focus_widget = NULL; static GtkWidget* subsequent_focus_widget = NULL;
static GtkWidget* focus_before_menu = NULL; static GtkWidget* focus_before_menu = NULL;
static guint focus_notify_handler = 0; static guint focus_notify_handler = 0;
static guint focus_tracker_id = 0; static guint focus_tracker_id = 0;
static GQuark quark_focus_object = 0; static GQuark quark_focus_object = 0;
static int initialized = FALSE; static int initialized = FALSE;
static AtkObject* static AtkObject*
gail_get_accessible_for_widget (GtkWidget *widget, get_accessible_for_widget (GtkWidget *widget,
gboolean *transient) gboolean *transient)
{ {
AtkObject *obj = NULL; AtkObject *obj = NULL;
@@ -516,13 +518,13 @@ gail_focus_notify (GtkWidget *widget)
else else
{ {
if (_focus_widget) if (_focus_widget)
atk_obj = gail_get_accessible_for_widget (_focus_widget, &transient); atk_obj = get_accessible_for_widget (_focus_widget, &transient);
else else
atk_obj = NULL; atk_obj = NULL;
/* /*
* Do not report focus on redundant object * Do not report focus on redundant object
*/ */
if (atk_obj && if (atk_obj &&
(atk_object_get_role(atk_obj) != ATK_ROLE_REDUNDANT_OBJECT)) (atk_object_get_role(atk_obj) != ATK_ROLE_REDUNDANT_OBJECT))
atk_focus_tracker_notify (atk_obj); atk_focus_tracker_notify (atk_obj);
if (atk_obj && transient) if (atk_obj && transient)
@@ -797,6 +799,186 @@ gail_set_focus_object (AtkObject *focus_obj,
} }
} }
static gboolean
state_event_watcher (GSignalInvocationHint *hint,
guint n_param_values,
const GValue *param_values,
gpointer data)
{
GObject *object;
GtkWidget *widget;
AtkObject *atk_obj;
AtkObject *parent;
GdkEventWindowState *event;
gchar *signal_name;
object = g_value_get_object (param_values + 0);
if (!GTK_IS_WINDOW (object))
return FALSE;
event = g_value_get_boxed (param_values + 1);
if (event->type == GDK_WINDOW_STATE)
return FALSE;
widget = GTK_WIDGET (object);
if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
signal_name = "maximize";
else if (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED)
signal_name = "minimize";
else if (event->new_window_state == 0)
signal_name = "restore";
else
return TRUE;
atk_obj = gtk_widget_get_accessible (widget);
if (GTK_IS_WINDOW_ACCESSIBLE (atk_obj))
{
parent = atk_object_get_parent (atk_obj);
if (parent == atk_get_root ())
g_signal_emit_by_name (atk_obj, signal_name);
return TRUE;
}
return FALSE;
}
static gboolean
configure_event_watcher (GSignalInvocationHint *hint,
guint n_param_values,
const GValue *param_values,
gpointer data)
{
GtkAllocation allocation;
GObject *object;
GtkWidget *widget;
AtkObject *atk_obj;
AtkObject *parent;
GdkEvent *event;
gchar *signal_name;
object = g_value_get_object (param_values + 0);
if (!GTK_IS_WINDOW (object))
return FALSE;
event = g_value_get_boxed (param_values + 1);
if (event->type != GDK_CONFIGURE)
return FALSE;
widget = GTK_WIDGET (object);
gtk_widget_get_allocation (widget, &allocation);
if (allocation.x == ((GdkEventConfigure *)event)->x &&
allocation.y == ((GdkEventConfigure *)event)->y &&
allocation.width == ((GdkEventConfigure *)event)->width &&
allocation.height == ((GdkEventConfigure *)event)->height)
return TRUE;
if (allocation.width != ((GdkEventConfigure *)event)->width ||
allocation.height != ((GdkEventConfigure *)event)->height)
signal_name = "resize";
else
signal_name = "move";
atk_obj = gtk_widget_get_accessible (widget);
if (GTK_IS_WINDOW_ACCESSIBLE (atk_obj))
{
parent = atk_object_get_parent (atk_obj);
if (parent == atk_get_root ())
g_signal_emit_by_name (atk_obj, signal_name);
return TRUE;
}
return FALSE;
}
static gboolean
window_focus (GtkWidget *widget,
GdkEventFocus *event)
{
AtkObject *atk_obj;
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
atk_obj = gtk_widget_get_accessible (widget);
g_signal_emit_by_name (atk_obj, event->in ? "activate" : "deactivate");
return FALSE;
}
static void
window_added (AtkObject *atk_obj,
guint index,
AtkObject *child)
{
GtkWidget *widget;
if (!GTK_IS_WINDOW_ACCESSIBLE (child))
return;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (child));
if (!widget)
return;
g_signal_connect (widget, "focus-in-event", (GCallback) window_focus, NULL);
g_signal_connect (widget, "focus-out-event", (GCallback) window_focus, NULL);
g_signal_emit_by_name (child, "create");
}
static void
window_removed (AtkObject *atk_obj,
guint index,
AtkObject *child)
{
GtkWidget *widget;
GtkWindow *window;
if (!GTK_IS_WINDOW_ACCESSIBLE (child))
return;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (child));
if (!widget)
return;
window = GTK_WINDOW (widget);
/*
* Deactivate window if it is still focused and we are removing it. This
* can happen when a dialog displayed by gok is removed.
*/
if (gtk_window_is_active (window) && gtk_window_has_toplevel_focus (window))
g_signal_emit_by_name (child, "deactivate");
g_signal_handlers_disconnect_by_func (widget, (gpointer) window_focus, NULL);
g_signal_emit_by_name (child, "destroy");
}
static void
do_window_event_initialization (void)
{
AtkObject *root;
g_type_class_ref (GTK_TYPE_WINDOW_ACCESSIBLE);
g_signal_add_emission_hook (g_signal_lookup ("window-state-event", GTK_TYPE_WIDGET),
0, state_event_watcher, NULL, (GDestroyNotify) NULL);
g_signal_add_emission_hook (g_signal_lookup ("configure-event", GTK_TYPE_WIDGET),
0, configure_event_watcher, NULL, (GDestroyNotify) NULL);
root = atk_get_root ();
g_signal_connect (root, "children-changed::add", (GCallback) window_added, NULL);
g_signal_connect (root, "children-changed::remove", (GCallback) window_removed, NULL);
}
static void
undo_window_event_initialization (void)
{
AtkObject *root;
root = atk_get_root ();
g_signal_handlers_disconnect_by_func (root, (GCallback) window_added, NULL);
g_signal_handlers_disconnect_by_func (root, (GCallback) window_removed, NULL);
}
void void
_gtk_accessibility_shutdown (void) _gtk_accessibility_shutdown (void)
{ {
@@ -810,13 +992,13 @@ _gtk_accessibility_shutdown (void)
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
atk_bridge_adaptor_cleanup (); atk_bridge_adaptor_cleanup ();
#endif #endif
_gail_util_uninstall ();
undo_window_event_initialization ();
} }
void void
_gtk_accessibility_init (void) _gtk_accessibility_init (void)
{ {
if (initialized) if (initialized)
return; return;
@@ -826,10 +1008,12 @@ _gtk_accessibility_init (void)
atk_focus_tracker_init (gail_focus_tracker_init); atk_focus_tracker_init (gail_focus_tracker_init);
focus_tracker_id = atk_add_focus_tracker (gail_focus_tracker); focus_tracker_id = atk_add_focus_tracker (gail_focus_tracker);
_gail_util_install (); _gtk_accessibility_override_atk_util ();
do_window_event_initialization ();
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
atk_bridge_adaptor_init (NULL, NULL); atk_bridge_adaptor_init (NULL, NULL);
#endif #endif
atk_misc_instance = g_object_new (GAIL_TYPE_MISC, NULL); atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,16 +15,20 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __GTK_GAIL_H__ #ifndef __GTK_ACCESSIBILITY_H__
#define __GTK_GAIL_H__ #define __GTK_ACCESSIBILITY_H__
#include <glib.h> #include <glib.h>
#include "gtk/gtkwidget.h"
G_BEGIN_DECLS G_BEGIN_DECLS
void _gtk_accessibility_shutdown (void); void _gtk_accessibility_shutdown (void);
void _gtk_accessibility_init (void); void _gtk_accessibility_init (void);
gboolean _gtk_accessibility_key_snooper (GtkWidget *widget,
GdkEventKey *event);
G_END_DECLS G_END_DECLS
#endif /* __GTK_GAIL_H__ */ #endif /* __GTK_ACCESSIBILITY_H__ */

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -18,33 +18,33 @@
#include "config.h" #include "config.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gailmisc.h" #include "gtkaccessibilitymisc.h"
G_DEFINE_TYPE (GailMisc, _gail_misc, ATK_TYPE_MISC) G_DEFINE_TYPE (GtkMiscImpl, _gtk_misc_impl, ATK_TYPE_MISC)
static void static void
gail_misc_threads_enter (AtkMisc *misc) gtk_misc_impl_threads_enter (AtkMisc *misc)
{ {
gdk_threads_enter (); gdk_threads_enter ();
} }
static void static void
gail_misc_threads_leave (AtkMisc *misc) gtk_misc_impl_threads_leave (AtkMisc *misc)
{ {
gdk_threads_leave (); gdk_threads_leave ();
} }
static void static void
_gail_misc_class_init (GailMiscClass *klass) _gtk_misc_impl_class_init (GtkMiscImplClass *klass)
{ {
AtkMiscClass *misc_class = ATK_MISC_CLASS (klass); AtkMiscClass *misc_class = ATK_MISC_CLASS (klass);
misc_class->threads_enter = gail_misc_threads_enter; misc_class->threads_enter = gtk_misc_impl_threads_enter;
misc_class->threads_leave = gail_misc_threads_leave; misc_class->threads_leave = gtk_misc_impl_threads_leave;
} }
static void static void
_gail_misc_init (GailMisc *misc) _gtk_misc_impl_init (GtkMiscImpl *misc)
{ {
} }

View File

@@ -0,0 +1,44 @@
/* GTK+ - accessibility implementations
* 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, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GTK_ACCESSIBILITY_MISC_H__
#define __GTK_ACCESSIBILITY_MISC_H__
#include <atk/atk.h>
G_BEGIN_DECLS
#define GTK_TYPE_MISC_IMPL (_gtk_misc_impl_get_type ())
typedef struct _GtkMiscImpl GtkMiscImpl;
typedef struct _GtkMiscImplClass GtkMiscImplClass;
struct _GtkMiscImpl
{
AtkMisc parent;
};
struct _GtkMiscImplClass
{
AtkMiscClass parent_class;
};
GType _gtk_misc_impl_get_type (void);
G_END_DECLS
#endif /* __GTK_ACCESSIBILITY_MISC_H__ */

View File

@@ -0,0 +1,156 @@
/* GTK+ - accessibility implementations
* Copyright 2011, F123 Consulting & Mais Diferenças
* Copyright 2001, 2002, 2003 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, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <stdlib.h>
#include <gtk/gtk.h>
#include "gtkaccessibility.h"
#include "gtkaccessibilityutil.h"
#include "gtktoplevelaccessible.h"
static GSList *key_listener_list = NULL;
typedef struct {
AtkKeySnoopFunc func;
gpointer data;
guint key;
} KeyEventListener;
static guint
add_key_event_listener (AtkKeySnoopFunc listener_func,
gpointer listener_data)
{
static guint key = 0;
KeyEventListener *listener;
key++;
listener = g_slice_new0 (KeyEventListener);
listener->func = listener_func;
listener->data = listener_data;
listener->key = key;
key_listener_list = g_slist_append (key_listener_list, listener);
return key;
}
static void
remove_key_event_listener (guint listener_key)
{
GSList *l;
for (l = key_listener_list; l; l = l->next)
{
KeyEventListener *listener = l->data;
if (listener->key == listener_key)
{
g_slice_free (KeyEventListener, listener);
key_listener_list = g_slist_delete_link (key_listener_list, l);
break;
}
}
}
static AtkObject *
get_root (void)
{
static AtkObject *root = NULL;
if (!root)
{
root = g_object_new (GTK_TYPE_TOPLEVEL_ACCESSIBLE, NULL);
atk_object_initialize (root, NULL);
}
return root;
}
static const gchar *
get_toolkit_name (void)
{
return "gtk";
}
static const gchar *
get_toolkit_version (void)
{
return GTK_VERSION;
}
void
_gtk_accessibility_override_atk_util (void)
{
AtkUtilClass *atk_class = ATK_UTIL_CLASS (g_type_class_ref (ATK_TYPE_UTIL));
atk_class->add_key_event_listener = add_key_event_listener;
atk_class->remove_key_event_listener = remove_key_event_listener;
atk_class->get_root = get_root;
atk_class->get_toolkit_name = get_toolkit_name;
atk_class->get_toolkit_version = get_toolkit_version;
}
static void
atk_key_event_from_gdk_event_key (GdkEventKey *key,
AtkKeyEventStruct *event)
{
if (key->type == GDK_KEY_PRESS)
event->type = ATK_KEY_EVENT_PRESS;
else if (key->type == GDK_KEY_RELEASE)
event->type = ATK_KEY_EVENT_RELEASE;
else
g_assert_not_reached ();
event->state = key->state;
event->keyval = key->keyval;
event->length = key->length;
if (key->string && key->string[0] &&
(key->state & GDK_CONTROL_MASK ||
g_unichar_isgraph (g_utf8_get_char (key->string))))
event->string = key->string;
else
event->string = gdk_keyval_name (key->keyval);
event->keycode = key->hardware_keycode;
event->timestamp = key->time;
}
gboolean
_gtk_accessibility_key_snooper (GtkWidget *widget,
GdkEventKey *event)
{
GSList *l;
AtkKeyEventStruct atk_event;
gboolean result;
result = FALSE;
atk_key_event_from_gdk_event_key (event, &atk_event);
for (l = key_listener_list; l; l = l->next)
{
KeyEventListener *listener = l->data;
result |= listener->func (&atk_event, listener->data);
}
return result;
}

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,19 +15,15 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __GAIL_UTIL_H__ #ifndef __GTK_ACCESSIBILITY_UTIL_H__
#define __GAIL_UTIL_H__ #define __GTK_ACCESSIBILITY_UTIL_H__
#include <atk/atk.h> #include <atk/atk.h>
G_BEGIN_DECLS G_BEGIN_DECLS
void _gail_util_install (void); void _gtk_accessibility_override_atk_util (void);
void _gail_util_uninstall (void);
gboolean _gail_util_key_snooper (GtkWidget *the_widget,
GdkEventKey *event);
G_END_DECLS G_END_DECLS
#endif /* __GAIL_UTIL_H__ */ #endif /* __GTK_ACCESSIBILITY_UTIL_H__ */

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -27,14 +27,14 @@ struct _GtkArrowAccessiblePrivate
static void atk_image_interface_init (AtkImageIface *iface); static void atk_image_interface_init (AtkImageIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkArrowAccessible, _gtk_arrow_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkArrowAccessible, gtk_arrow_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init))
static void static void
gtk_arrow_accessible_initialize (AtkObject *accessible, gtk_arrow_accessible_initialize (AtkObject *accessible,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_arrow_accessible_parent_class)->initialize (accessible, data); ATK_OBJECT_CLASS (gtk_arrow_accessible_parent_class)->initialize (accessible, data);
accessible->role = ATK_ROLE_ICON; accessible->role = ATK_ROLE_ICON;
} }
@@ -46,11 +46,11 @@ gtk_arrow_accessible_finalize (GObject *object)
g_free (arrow->priv->image_description); g_free (arrow->priv->image_description);
G_OBJECT_CLASS (_gtk_arrow_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_arrow_accessible_parent_class)->finalize (object);
} }
static void static void
_gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass) gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
@@ -63,7 +63,7 @@ _gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass)
} }
static void static void
_gtk_arrow_accessible_init (GtkArrowAccessible *arrow) gtk_arrow_accessible_init (GtkArrowAccessible *arrow)
{ {
arrow->priv = G_TYPE_INSTANCE_GET_PRIVATE (arrow, arrow->priv = G_TYPE_INSTANCE_GET_PRIVATE (arrow,
GTK_TYPE_ARROW_ACCESSIBLE, GTK_TYPE_ARROW_ACCESSIBLE,

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_ARROW_ACCESSIBLE_H__ #ifndef __GTK_ARROW_ACCESSIBLE_H__
#define __GTK_ARROW_ACCESSIBLE_H__ #define __GTK_ARROW_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h" #include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_ARROW_ACCESSIBLE (_gtk_arrow_accessible_get_type ()) #define GTK_TYPE_ARROW_ACCESSIBLE (gtk_arrow_accessible_get_type ())
#define GTK_ARROW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ARROW_ACCESSIBLE, GtkArrowAccessible)) #define GTK_ARROW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ARROW_ACCESSIBLE, GtkArrowAccessible))
#define GTK_ARROW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ARROW_ACCESSIBLE, GtkArrowAccessibleClass)) #define GTK_ARROW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ARROW_ACCESSIBLE, GtkArrowAccessibleClass))
#define GTK_IS_ARROW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ARROW_ACCESSIBLE)) #define GTK_IS_ARROW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ARROW_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkArrowAccessibleClass
GtkWidgetAccessibleClass parent_class; GtkWidgetAccessibleClass parent_class;
}; };
GType _gtk_arrow_accessible_get_type (void); GType gtk_arrow_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -76,7 +76,7 @@ gtk_boolean_cell_accessible_action_interface_init (AtkActionIface *iface)
} }
G_DEFINE_TYPE_EXTENDED (GtkBooleanCellAccessible, _gtk_boolean_cell_accessible, GTK_TYPE_RENDERER_CELL_ACCESSIBLE, 0, G_DEFINE_TYPE_EXTENDED (GtkBooleanCellAccessible, gtk_boolean_cell_accessible, GTK_TYPE_RENDERER_CELL_ACCESSIBLE, 0,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, gtk_boolean_cell_accessible_action_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, gtk_boolean_cell_accessible_action_interface_init))
@@ -86,7 +86,7 @@ gtk_boolean_cell_accessible_ref_state_set (AtkObject *accessible)
GtkBooleanCellAccessible *cell = GTK_BOOLEAN_CELL_ACCESSIBLE (accessible); GtkBooleanCellAccessible *cell = GTK_BOOLEAN_CELL_ACCESSIBLE (accessible);
AtkStateSet *state_set; AtkStateSet *state_set;
state_set = ATK_OBJECT_CLASS (_gtk_boolean_cell_accessible_parent_class)->ref_state_set (accessible); state_set = ATK_OBJECT_CLASS (gtk_boolean_cell_accessible_parent_class)->ref_state_set (accessible);
if (cell->priv->cell_value) if (cell->priv->cell_value)
atk_state_set_add_state (state_set, ATK_STATE_CHECKED); atk_state_set_add_state (state_set, ATK_STATE_CHECKED);
@@ -130,7 +130,7 @@ gtk_boolean_cell_accessible_update_cache (GtkCellAccessible *cell)
} }
static void static void
_gtk_boolean_cell_accessible_class_init (GtkBooleanCellAccessibleClass *klass) gtk_boolean_cell_accessible_class_init (GtkBooleanCellAccessibleClass *klass)
{ {
GtkCellAccessibleClass *cell_class = GTK_CELL_ACCESSIBLE_CLASS (klass); GtkCellAccessibleClass *cell_class = GTK_CELL_ACCESSIBLE_CLASS (klass);
AtkObjectClass *atkobject_class = ATK_OBJECT_CLASS (klass); AtkObjectClass *atkobject_class = ATK_OBJECT_CLASS (klass);
@@ -143,7 +143,7 @@ _gtk_boolean_cell_accessible_class_init (GtkBooleanCellAccessibleClass *klass)
} }
static void static void
_gtk_boolean_cell_accessible_init (GtkBooleanCellAccessible *cell) gtk_boolean_cell_accessible_init (GtkBooleanCellAccessible *cell)
{ {
cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (cell, cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (cell,
GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE, GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE,

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,15 +15,19 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_BOOLEAN_CELL_ACCESSIBLE_H__ #ifndef __GTK_BOOLEAN_CELL_ACCESSIBLE_H__
#define __GTK_BOOLEAN_CELL_ACCESSIBLE_H__ #define __GTK_BOOLEAN_CELL_ACCESSIBLE_H__
#include <atk/atk.h> #include <atk/atk.h>
#include "gtkrenderercellaccessible.h" #include <gtk/a11y/gtkrenderercellaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE (_gtk_boolean_cell_accessible_get_type ()) #define GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE (gtk_boolean_cell_accessible_get_type ())
#define GTK_BOOLEAN_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE, GtkBooleanCellAccessible)) #define GTK_BOOLEAN_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE, GtkBooleanCellAccessible))
#define GTK_BOOLEAN_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_BOOLEAN_CELL, GtkBooleanCellAccessibleClass)) #define GTK_BOOLEAN_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_BOOLEAN_CELL, GtkBooleanCellAccessibleClass))
#define GTK_IS_BOOLEAN_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE)) #define GTK_IS_BOOLEAN_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE))
@@ -46,7 +50,7 @@ struct _GtkBooleanCellAccessibleClass
GtkRendererCellAccessibleClass parent_class; GtkRendererCellAccessibleClass parent_class;
}; };
GType _gtk_boolean_cell_accessible_get_type (void); GType gtk_boolean_cell_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2004 Sun Microsystems Inc. * Copyright 2004 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -21,18 +21,18 @@
#include "gtkboxaccessible.h" #include "gtkboxaccessible.h"
G_DEFINE_TYPE (GtkBoxAccessible, _gtk_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) G_DEFINE_TYPE (GtkBoxAccessible, gtk_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE)
static void static void
gtk_box_accessible_initialize (AtkObject *accessible, gtk_box_accessible_initialize (AtkObject *accessible,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_box_accessible_parent_class)->initialize (accessible, data); ATK_OBJECT_CLASS (gtk_box_accessible_parent_class)->initialize (accessible, data);
accessible->role = ATK_ROLE_FILLER; accessible->role = ATK_ROLE_FILLER;
} }
static void static void
_gtk_box_accessible_class_init (GtkBoxAccessibleClass *klass) gtk_box_accessible_class_init (GtkBoxAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -40,6 +40,6 @@ _gtk_box_accessible_class_init (GtkBoxAccessibleClass *klass)
} }
static void static void
_gtk_box_accessible_init (GtkBoxAccessible *scale) gtk_box_accessible_init (GtkBoxAccessible *scale)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2004 Sun Microsystems Inc. * Copyright 2004 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_BOX_ACCESSIBLE_H__ #ifndef __GTK_BOX_ACCESSIBLE_H__
#define __GTK_BOX_ACCESSIBLE_H__ #define __GTK_BOX_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h" #include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_BOX_ACCESSIBLE (_gtk_box_accessible_get_type ()) #define GTK_TYPE_BOX_ACCESSIBLE (gtk_box_accessible_get_type ())
#define GTK_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BOX_ACCESSIBLE, GtkBoxAccessible)) #define GTK_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BOX_ACCESSIBLE, GtkBoxAccessible))
#define GTK_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BOX_ACCESSIBLE, GtkBoxAccessibleClass)) #define GTK_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BOX_ACCESSIBLE, GtkBoxAccessibleClass))
#define GTK_IS_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BOX_ACCESSIBLE)) #define GTK_IS_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BOX_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkBoxAccessibleClass
GtkContainerAccessibleClass parent_class; GtkContainerAccessibleClass parent_class;
}; };
GType _gtk_box_accessible_get_type (void); GType gtk_box_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
static void atk_action_interface_init (AtkActionIface *iface); static void atk_action_interface_init (AtkActionIface *iface);
static void atk_image_interface_init (AtkImageIface *iface); static void atk_image_interface_init (AtkImageIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkButtonAccessible, _gtk_button_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkButtonAccessible, gtk_button_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init))
@@ -55,7 +55,7 @@ gtk_button_accessible_initialize (AtkObject *obj,
{ {
GtkWidget *parent; GtkWidget *parent;
ATK_OBJECT_CLASS (_gtk_button_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_button_accessible_parent_class)->initialize (obj, data);
g_signal_connect (data, "state-flags-changed", G_CALLBACK (state_changed_cb), NULL); g_signal_connect (data, "state-flags-changed", G_CALLBACK (state_changed_cb), NULL);
@@ -143,7 +143,7 @@ gtk_button_accessible_get_name (AtkObject *obj)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
name = ATK_OBJECT_CLASS (_gtk_button_accessible_parent_class)->get_name (obj); name = ATK_OBJECT_CLASS (gtk_button_accessible_parent_class)->get_name (obj);
if (name != NULL) if (name != NULL)
return name; return name;
@@ -190,7 +190,7 @@ gtk_button_accessible_ref_state_set (AtkObject *obj)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
state_set = ATK_OBJECT_CLASS (_gtk_button_accessible_parent_class)->ref_state_set (obj); state_set = ATK_OBJECT_CLASS (gtk_button_accessible_parent_class)->ref_state_set (obj);
if ((gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_ACTIVE) != 0) if ((gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_ACTIVE) != 0)
atk_state_set_add_state (state_set, ATK_STATE_ARMED); atk_state_set_add_state (state_set, ATK_STATE_ARMED);
@@ -216,11 +216,11 @@ gtk_button_accessible_notify_gtk (GObject *obj,
g_signal_emit_by_name (atk_obj, "visible-data-changed"); g_signal_emit_by_name (atk_obj, "visible-data-changed");
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_button_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_button_accessible_parent_class)->notify_gtk (obj, pspec);
} }
static void static void
_gtk_button_accessible_class_init (GtkButtonAccessibleClass *klass) gtk_button_accessible_class_init (GtkButtonAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GtkContainerAccessibleClass *container_class = (GtkContainerAccessibleClass*)klass; GtkContainerAccessibleClass *container_class = (GtkContainerAccessibleClass*)klass;
@@ -239,7 +239,7 @@ _gtk_button_accessible_class_init (GtkButtonAccessibleClass *klass)
} }
static void static void
_gtk_button_accessible_init (GtkButtonAccessible *button) gtk_button_accessible_init (GtkButtonAccessible *button)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_BUTTON_ACCESSIBLE_H__ #ifndef __GTK_BUTTON_ACCESSIBLE_H__
#define __GTK_BUTTON_ACCESSIBLE_H__ #define __GTK_BUTTON_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h" #include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_BUTTON_ACCESSIBLE (_gtk_button_accessible_get_type ()) #define GTK_TYPE_BUTTON_ACCESSIBLE (gtk_button_accessible_get_type ())
#define GTK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON_ACCESSIBLE, GtkButtonAccessible)) #define GTK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON_ACCESSIBLE, GtkButtonAccessible))
#define GTK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON_ACCESSIBLE, GtkButtonAccessibleClass)) #define GTK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON_ACCESSIBLE, GtkButtonAccessibleClass))
#define GTK_IS_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUTTON_ACCESSIBLE)) #define GTK_IS_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUTTON_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkButtonAccessibleClass
GtkContainerAccessibleClass parent_class; GtkContainerAccessibleClass parent_class;
}; };
GType _gtk_button_accessible_get_type (void); GType gtk_button_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtkcontainercellaccessible.h" #include "gtkcontainercellaccessible.h"
#include "gtkcellaccessible.h" #include "gtkcellaccessibleprivate.h"
#include "gtkcellaccessibleparent.h" #include "gtkcellaccessibleparent.h"
static const struct { static const struct {
@@ -37,10 +37,11 @@ static const struct {
{ ATK_STATE_EXPANDED, GTK_CELL_RENDERER_EXPANDED, FALSE }, { ATK_STATE_EXPANDED, GTK_CELL_RENDERER_EXPANDED, FALSE },
}; };
static GtkCellRendererState gtk_cell_accessible_get_state (GtkCellAccessible *cell);
static void atk_action_interface_init (AtkActionIface *iface); static void atk_action_interface_init (AtkActionIface *iface);
static void atk_component_interface_init (AtkComponentIface *iface); static void atk_component_interface_init (AtkComponentIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkCellAccessible, _gtk_cell_accessible, GTK_TYPE_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkCellAccessible, gtk_cell_accessible, GTK_TYPE_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
@@ -70,7 +71,7 @@ gtk_cell_accessible_object_finalize (GObject *obj)
} }
g_object_unref (relation_set); g_object_unref (relation_set);
} }
G_OBJECT_CLASS (_gtk_cell_accessible_parent_class)->finalize (obj); G_OBJECT_CLASS (gtk_cell_accessible_parent_class)->finalize (obj);
} }
static gint static gint
@@ -83,13 +84,13 @@ gtk_cell_accessible_get_index_in_parent (AtkObject *obj)
parent = atk_object_get_parent (obj); parent = atk_object_get_parent (obj);
if (GTK_IS_CONTAINER_CELL_ACCESSIBLE (parent)) if (GTK_IS_CONTAINER_CELL_ACCESSIBLE (parent))
return g_list_index (_gtk_container_cell_accessible_get_children (GTK_CONTAINER_CELL_ACCESSIBLE (parent)), obj); return g_list_index (gtk_container_cell_accessible_get_children (GTK_CONTAINER_CELL_ACCESSIBLE (parent)), obj);
parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell))); parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)));
if (parent == NULL) if (parent == NULL)
return -1; return -1;
return _gtk_cell_accessible_parent_get_child_index (GTK_CELL_ACCESSIBLE_PARENT (parent), cell); return gtk_cell_accessible_parent_get_child_index (GTK_CELL_ACCESSIBLE_PARENT (parent), cell);
} }
static AtkStateSet * static AtkStateSet *
@@ -110,7 +111,7 @@ gtk_cell_accessible_ref_state_set (AtkObject *accessible)
return state_set; return state_set;
} }
flags = _gtk_cell_accessible_get_state (cell_accessible); flags = gtk_cell_accessible_get_state (cell_accessible);
atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE); atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE);
atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE); atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);
@@ -139,7 +140,7 @@ gtk_cell_accessible_ref_state_set (AtkObject *accessible)
static void static void
_gtk_cell_accessible_class_init (GtkCellAccessibleClass *klass) gtk_cell_accessible_class_init (GtkCellAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GObjectClass *g_object_class = G_OBJECT_CLASS (klass); GObjectClass *g_object_class = G_OBJECT_CLASS (klass);
@@ -151,12 +152,12 @@ _gtk_cell_accessible_class_init (GtkCellAccessibleClass *klass)
} }
static void static void
_gtk_cell_accessible_init (GtkCellAccessible *cell) gtk_cell_accessible_init (GtkCellAccessible *cell)
{ {
} }
void void
_gtk_cell_accessible_initialise (GtkCellAccessible *cell, _gtk_cell_accessible_initialize (GtkCellAccessible *cell,
GtkWidget *widget, GtkWidget *widget,
AtkObject *parent) AtkObject *parent)
{ {
@@ -286,11 +287,11 @@ gtk_cell_accessible_action_do_action (AtkAction *action,
switch (index) switch (index)
{ {
case 0: case 0:
_gtk_cell_accessible_parent_expand_collapse (parent, cell); gtk_cell_accessible_parent_expand_collapse (parent, cell);
case 1: case 1:
_gtk_cell_accessible_parent_edit (parent, cell); gtk_cell_accessible_parent_edit (parent, cell);
case 2: case 2:
_gtk_cell_accessible_parent_activate (parent, cell); gtk_cell_accessible_parent_activate (parent, cell);
default: default:
return FALSE; return FALSE;
} }
@@ -322,7 +323,7 @@ gtk_cell_accessible_get_extents (AtkComponent *component,
cell = GTK_CELL_ACCESSIBLE (component); cell = GTK_CELL_ACCESSIBLE (component);
parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell))); parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)));
_gtk_cell_accessible_parent_get_cell_extents (GTK_CELL_ACCESSIBLE_PARENT (parent), gtk_cell_accessible_parent_get_cell_extents (GTK_CELL_ACCESSIBLE_PARENT (parent),
cell, cell,
x, y, width, height, coord_type); x, y, width, height, coord_type);
} }
@@ -336,7 +337,7 @@ gtk_cell_accessible_grab_focus (AtkComponent *component)
cell = GTK_CELL_ACCESSIBLE (component); cell = GTK_CELL_ACCESSIBLE (component);
parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell))); parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)));
return _gtk_cell_accessible_parent_grab_focus (GTK_CELL_ACCESSIBLE_PARENT (parent), cell); return gtk_cell_accessible_parent_grab_focus (GTK_CELL_ACCESSIBLE_PARENT (parent), cell);
} }
static void static void
@@ -346,16 +347,8 @@ atk_component_interface_init (AtkComponentIface *iface)
iface->grab_focus = gtk_cell_accessible_grab_focus; iface->grab_focus = gtk_cell_accessible_grab_focus;
} }
/** static GtkCellRendererState
* _gtk_cell_accessible_get_state: gtk_cell_accessible_get_state (GtkCellAccessible *cell)
* @cell: a #GtkCellAccessible
*
* Gets the state that would be used to render the area referenced by @cell.
*
* Returns: the #GtkCellRendererState for cell
**/
GtkCellRendererState
_gtk_cell_accessible_get_state (GtkCellAccessible *cell)
{ {
AtkObject *parent; AtkObject *parent;
@@ -365,11 +358,11 @@ _gtk_cell_accessible_get_state (GtkCellAccessible *cell)
if (parent == NULL) if (parent == NULL)
return 0; return 0;
return _gtk_cell_accessible_parent_get_renderer_state (GTK_CELL_ACCESSIBLE_PARENT (parent), cell); return gtk_cell_accessible_parent_get_renderer_state (GTK_CELL_ACCESSIBLE_PARENT (parent), cell);
} }
/** /*
* _gtk_cell_accessible_state_changed: * gtk_cell_accessible_state_changed:
* @cell: a #GtkCellAccessible * @cell: a #GtkCellAccessible
* @added: the flags that were added from @cell * @added: the flags that were added from @cell
* @removed: the flags that were removed from @cell * @removed: the flags that were removed from @cell
@@ -394,18 +387,18 @@ _gtk_cell_accessible_state_changed (GtkCellAccessible *cell,
for (i = 0; i < G_N_ELEMENTS (state_map); i++) for (i = 0; i < G_N_ELEMENTS (state_map); i++)
{ {
if (added & state_map[i].renderer_state) if (added & state_map[i].renderer_state)
atk_object_notify_state_change (object, atk_object_notify_state_change (object,
state_map[i].atk_state, state_map[i].atk_state,
!state_map[i].invert); !state_map[i].invert);
if (added & state_map[i].renderer_state) if (added & state_map[i].renderer_state)
atk_object_notify_state_change (object, atk_object_notify_state_change (object,
state_map[i].atk_state, state_map[i].atk_state,
state_map[i].invert); state_map[i].invert);
} }
} }
/** /*
* _gtk_cell_accessible_update_cache: * gtk_cell_accessible_update_cache:
* @cell: the cell that is changed * @cell: the cell that is changed
* *
* Notifies the cell that the values in the data in the row that * Notifies the cell that the values in the data in the row that
@@ -413,7 +406,7 @@ _gtk_cell_accessible_state_changed (GtkCellAccessible *cell,
* cell_changed function of @cell is called to send update * cell_changed function of @cell is called to send update
* notifications for the properties it takes from its cell * notifications for the properties it takes from its cell
* renderer. * renderer.
* *
* Note that there is no higher granularity available about which * Note that there is no higher granularity available about which
* properties changed, so you will need to make do with this * properties changed, so you will need to make do with this
* function. * function.
@@ -422,7 +415,7 @@ void
_gtk_cell_accessible_update_cache (GtkCellAccessible *cell) _gtk_cell_accessible_update_cache (GtkCellAccessible *cell)
{ {
GtkCellAccessibleClass *klass; GtkCellAccessibleClass *klass;
g_return_if_fail (GTK_CELL_ACCESSIBLE (cell)); g_return_if_fail (GTK_CELL_ACCESSIBLE (cell));
klass = GTK_CELL_ACCESSIBLE_GET_CLASS (cell); klass = GTK_CELL_ACCESSIBLE_GET_CLASS (cell);
@@ -430,4 +423,3 @@ _gtk_cell_accessible_update_cache (GtkCellAccessible *cell)
if (klass->update_cache) if (klass->update_cache)
klass->update_cache (cell); klass->update_cache (cell);
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,15 +15,19 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_CELL_ACCESSIBLE_H__ #ifndef __GTK_CELL_ACCESSIBLE_H__
#define __GTK_CELL_ACCESSIBLE_H__ #define __GTK_CELL_ACCESSIBLE_H__
#include <atk/atk.h> #include <atk/atk.h>
#include "gtk/gtkaccessible.h" #include <gtk/gtkaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_CELL_ACCESSIBLE (_gtk_cell_accessible_get_type ()) #define GTK_TYPE_CELL_ACCESSIBLE (gtk_cell_accessible_get_type ())
#define GTK_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_ACCESSIBLE, GtkCellAccessible)) #define GTK_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_ACCESSIBLE, GtkCellAccessible))
#define GTK_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_ACCESSIBLE, GtkCellAccessibleClass)) #define GTK_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_ACCESSIBLE, GtkCellAccessibleClass))
#define GTK_IS_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_ACCESSIBLE)) #define GTK_IS_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_ACCESSIBLE))
@@ -47,24 +51,7 @@ struct _GtkCellAccessibleClass
void (*update_cache) (GtkCellAccessible *cell); void (*update_cache) (GtkCellAccessible *cell);
}; };
GType _gtk_cell_accessible_get_type (void); GType gtk_cell_accessible_get_type (void);
GtkCellRendererState
_gtk_cell_accessible_get_state (GtkCellAccessible *cell);
void _gtk_cell_accessible_state_changed (GtkCellAccessible *cell,
GtkCellRendererState added,
GtkCellRendererState removed);
void _gtk_cell_accessible_update_cache (GtkCellAccessible *cell);
void _gtk_cell_accessible_initialise (GtkCellAccessible *cell,
GtkWidget *widget,
AtkObject *parent);
gboolean _gtk_cell_accessible_add_state (GtkCellAccessible *cell,
AtkStateType state_type,
gboolean emit_signal);
gboolean _gtk_cell_accessible_remove_state (GtkCellAccessible *cell,
AtkStateType state_type,
gboolean emit_signal);
G_END_DECLS G_END_DECLS

View File

@@ -1,5 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -22,7 +21,7 @@
#include "gtkcellaccessibleparent.h" #include "gtkcellaccessibleparent.h"
GType GType
_gtk_cell_accessible_parent_get_type (void) gtk_cell_accessible_parent_get_type (void)
{ {
static volatile gsize g_define_type_id__volatile = 0; static volatile gsize g_define_type_id__volatile = 0;
@@ -44,13 +43,13 @@ _gtk_cell_accessible_parent_get_type (void)
} }
void void
_gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent, gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell, GtkCellAccessible *cell,
gint *x, gint *x,
gint *y, gint *y,
gint *width, gint *width,
gint *height, gint *height,
AtkCoordType coord_type) AtkCoordType coord_type)
{ {
GtkCellAccessibleParentIface *iface; GtkCellAccessibleParentIface *iface;
@@ -63,9 +62,9 @@ _gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent,
} }
void void
_gtk_cell_accessible_parent_get_cell_area (GtkCellAccessibleParent *parent, gtk_cell_accessible_parent_get_cell_area (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell, GtkCellAccessible *cell,
GdkRectangle *cell_rect) GdkRectangle *cell_rect)
{ {
GtkCellAccessibleParentIface *iface; GtkCellAccessibleParentIface *iface;
@@ -79,8 +78,8 @@ _gtk_cell_accessible_parent_get_cell_area (GtkCellAccessibleParent *parent,
} }
gboolean gboolean
_gtk_cell_accessible_parent_grab_focus (GtkCellAccessibleParent *parent, gtk_cell_accessible_parent_grab_focus (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell) GtkCellAccessible *cell)
{ {
GtkCellAccessibleParentIface *iface; GtkCellAccessibleParentIface *iface;
@@ -95,8 +94,8 @@ _gtk_cell_accessible_parent_grab_focus (GtkCellAccessibleParent *parent,
} }
int int
_gtk_cell_accessible_parent_get_child_index (GtkCellAccessibleParent *parent, gtk_cell_accessible_parent_get_child_index (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell) GtkCellAccessible *cell)
{ {
GtkCellAccessibleParentIface *iface; GtkCellAccessibleParentIface *iface;
@@ -111,8 +110,8 @@ _gtk_cell_accessible_parent_get_child_index (GtkCellAccessibleParent *parent,
} }
GtkCellRendererState GtkCellRendererState
_gtk_cell_accessible_parent_get_renderer_state (GtkCellAccessibleParent *parent, gtk_cell_accessible_parent_get_renderer_state (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell) GtkCellAccessible *cell)
{ {
GtkCellAccessibleParentIface *iface; GtkCellAccessibleParentIface *iface;
@@ -128,8 +127,8 @@ _gtk_cell_accessible_parent_get_renderer_state (GtkCellAccessibleParent *parent,
} }
void void
_gtk_cell_accessible_parent_expand_collapse (GtkCellAccessibleParent *parent, gtk_cell_accessible_parent_expand_collapse (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell) GtkCellAccessible *cell)
{ {
GtkCellAccessibleParentIface *iface; GtkCellAccessibleParentIface *iface;
@@ -143,8 +142,8 @@ _gtk_cell_accessible_parent_expand_collapse (GtkCellAccessibleParent *parent,
} }
void void
_gtk_cell_accessible_parent_activate (GtkCellAccessibleParent *parent, gtk_cell_accessible_parent_activate (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell) GtkCellAccessible *cell)
{ {
GtkCellAccessibleParentIface *iface; GtkCellAccessibleParentIface *iface;
@@ -158,8 +157,8 @@ _gtk_cell_accessible_parent_activate (GtkCellAccessibleParent *parent,
} }
void void
_gtk_cell_accessible_parent_edit (GtkCellAccessibleParent *parent, gtk_cell_accessible_parent_edit (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell) GtkCellAccessible *cell)
{ {
GtkCellAccessibleParentIface *iface; GtkCellAccessibleParentIface *iface;

View File

@@ -1,5 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
*
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -16,11 +15,15 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_CELL_ACCESSIBLE_PARENT_H__ #ifndef __GTK_CELL_ACCESSIBLE_PARENT_H__
#define __GTK_CELL_ACCESSIBLE_PARENT_H__ #define __GTK_CELL_ACCESSIBLE_PARENT_H__
#include <atk/atk.h> #include <atk/atk.h>
#include "gtkcellaccessible.h" #include <gtk/a11y/gtkcellaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@@ -33,7 +36,7 @@ G_BEGIN_DECLS
* implement atk_component_get_extents(). * implement atk_component_get_extents().
*/ */
#define GTK_TYPE_CELL_ACCESSIBLE_PARENT (_gtk_cell_accessible_parent_get_type ()) #define GTK_TYPE_CELL_ACCESSIBLE_PARENT (gtk_cell_accessible_parent_get_type ())
#define GTK_IS_CELL_ACCESSIBLE_PARENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_ACCESSIBLE_PARENT) #define GTK_IS_CELL_ACCESSIBLE_PARENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_ACCESSIBLE_PARENT)
#define GTK_CELL_ACCESSIBLE_PARENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_ACCESSIBLE_PARENT, GtkCellAccessibleParent) #define GTK_CELL_ACCESSIBLE_PARENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_ACCESSIBLE_PARENT, GtkCellAccessibleParent)
#define GTK_CELL_ACCESSIBLE_PARENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_CELL_ACCESSIBLE_PARENT, GtkCellAccessibleParentIface)) #define GTK_CELL_ACCESSIBLE_PARENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_CELL_ACCESSIBLE_PARENT, GtkCellAccessibleParentIface))
@@ -70,31 +73,31 @@ struct _GtkCellAccessibleParentIface
GtkCellAccessible *cell); GtkCellAccessible *cell);
}; };
GType _gtk_cell_accessible_parent_get_type (void); GType gtk_cell_accessible_parent_get_type (void);
void _gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent, void gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell, GtkCellAccessible *cell,
gint *x, gint *x,
gint *y, gint *y,
gint *width, gint *width,
gint *height, gint *height,
AtkCoordType coord_type); AtkCoordType coord_type);
void _gtk_cell_accessible_parent_get_cell_area (GtkCellAccessibleParent *parent, void gtk_cell_accessible_parent_get_cell_area (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell, GtkCellAccessible *cell,
GdkRectangle *cell_rect); GdkRectangle *cell_rect);
gboolean _gtk_cell_accessible_parent_grab_focus (GtkCellAccessibleParent *parent, gboolean gtk_cell_accessible_parent_grab_focus (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell); GtkCellAccessible *cell);
int _gtk_cell_accessible_parent_get_child_index (GtkCellAccessibleParent *parent, int gtk_cell_accessible_parent_get_child_index (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell); GtkCellAccessible *cell);
GtkCellRendererState GtkCellRendererState
_gtk_cell_accessible_parent_get_renderer_state(GtkCellAccessibleParent *parent, gtk_cell_accessible_parent_get_renderer_state(GtkCellAccessibleParent *parent,
GtkCellAccessible *cell);
void _gtk_cell_accessible_parent_expand_collapse (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell);
void _gtk_cell_accessible_parent_activate (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell);
void _gtk_cell_accessible_parent_edit (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell); GtkCellAccessible *cell);
void gtk_cell_accessible_parent_expand_collapse (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell);
void gtk_cell_accessible_parent_activate (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell);
void gtk_cell_accessible_parent_edit (GtkCellAccessibleParent *parent,
GtkCellAccessible *cell);
G_END_DECLS G_END_DECLS

View File

@@ -0,0 +1,41 @@
/* GTK+ - accessibility implementations
* 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, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GTK_CELL_ACCESSIBLE_PRIVATE_H__
#define __GTK_CELL_ACCESSIBLE_PRIVATE_H__
#include <gtk/a11y/gtkcellaccessible.h>
G_BEGIN_DECLS
void _gtk_cell_accessible_state_changed (GtkCellAccessible *cell,
GtkCellRendererState added,
GtkCellRendererState removed);
void _gtk_cell_accessible_update_cache (GtkCellAccessible *cell);
void _gtk_cell_accessible_initialize (GtkCellAccessible *cell,
GtkWidget *widget,
AtkObject *parent);
gboolean _gtk_cell_accessible_add_state (GtkCellAccessible *cell,
AtkStateType state_type,
gboolean emit_signal);
gboolean _gtk_cell_accessible_remove_state (GtkCellAccessible *cell,
AtkStateType state_type,
gboolean emit_signal);
G_END_DECLS
#endif /* __GTK_CELL_ACCESSIBLE_PRIVATE_H__ */

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2002 Sun Microsystems Inc. * Copyright 2002 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#include "gtkcheckmenuitemaccessible.h" #include "gtkcheckmenuitemaccessible.h"
G_DEFINE_TYPE (GtkCheckMenuItemAccessible, _gtk_check_menu_item_accessible, GTK_TYPE_MENU_ITEM_ACCESSIBLE) G_DEFINE_TYPE (GtkCheckMenuItemAccessible, gtk_check_menu_item_accessible, GTK_TYPE_MENU_ITEM_ACCESSIBLE)
static void static void
toggled_cb (GtkWidget *widget) toggled_cb (GtkWidget *widget)
@@ -42,7 +42,7 @@ static void
gtk_check_menu_item_accessible_initialize (AtkObject *obj, gtk_check_menu_item_accessible_initialize (AtkObject *obj,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_check_menu_item_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_check_menu_item_accessible_parent_class)->initialize (obj, data);
g_signal_connect (data, "toggled", G_CALLBACK (toggled_cb), NULL); g_signal_connect (data, "toggled", G_CALLBACK (toggled_cb), NULL);
@@ -60,7 +60,7 @@ gtk_check_menu_item_accessible_ref_state_set (AtkObject *accessible)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
state_set = ATK_OBJECT_CLASS (_gtk_check_menu_item_accessible_parent_class)->ref_state_set (accessible); state_set = ATK_OBJECT_CLASS (gtk_check_menu_item_accessible_parent_class)->ref_state_set (accessible);
check_menu_item = GTK_CHECK_MENU_ITEM (widget); check_menu_item = GTK_CHECK_MENU_ITEM (widget);
@@ -78,7 +78,7 @@ gtk_check_menu_item_accessible_ref_state_set (AtkObject *accessible)
static void static void
gtk_check_menu_item_accessible_notify_gtk (GObject *obj, gtk_check_menu_item_accessible_notify_gtk (GObject *obj,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (obj); GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (obj);
AtkObject *atk_obj; AtkObject *atk_obj;
@@ -101,11 +101,11 @@ gtk_check_menu_item_accessible_notify_gtk (GObject *obj,
atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent));
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_check_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_check_menu_item_accessible_parent_class)->notify_gtk (obj, pspec);
} }
static void static void
_gtk_check_menu_item_accessible_class_init (GtkCheckMenuItemAccessibleClass *klass) gtk_check_menu_item_accessible_class_init (GtkCheckMenuItemAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;
@@ -117,6 +117,6 @@ _gtk_check_menu_item_accessible_class_init (GtkCheckMenuItemAccessibleClass *kla
} }
static void static void
_gtk_check_menu_item_accessible_init (GtkCheckMenuItemAccessible *item) gtk_check_menu_item_accessible_init (GtkCheckMenuItemAccessible *item)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2002 Sun Microsystems Inc. * Copyright 2002 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__ #ifndef __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__
#define __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__ #define __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__
#include "gtkmenuitemaccessible.h" #include <gtk/a11y/gtkmenuitemaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE (_gtk_check_menu_item_accessible_get_type ()) #define GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE (gtk_check_menu_item_accessible_get_type ())
#define GTK_CHECK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE, GtkCheckMenuItemAccessible)) #define GTK_CHECK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE, GtkCheckMenuItemAccessible))
#define GTK_CHECK_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE, GtkCheckMenuItemAccessibleClass)) #define GTK_CHECK_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE, GtkCheckMenuItemAccessibleClass))
#define GTK_IS_CHECK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE)) #define GTK_IS_CHECK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkCheckMenuItemAccessibleClass
GtkMenuItemAccessibleClass parent_class; GtkMenuItemAccessibleClass parent_class;
}; };
GType _gtk_check_menu_item_accessible_get_type (void); GType gtk_check_menu_item_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* /* GTK+ - accessibility implementations
* Copyright 2012 Red Hat, Inc * Copyright 2012 Red Hat, Inc
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

View File

@@ -1,4 +1,4 @@
/* /* GTK+ - accessibility implementations
* Copyright 2012, Red Hat, Inc * Copyright 2012, Red Hat, Inc
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -18,7 +18,7 @@
#ifndef __GTK_COLOR_SWATCH_ACCESSIBLE_H__ #ifndef __GTK_COLOR_SWATCH_ACCESSIBLE_H__
#define __GTK_COLOR_SWATCH_ACCESSIBLE_H__ #define __GTK_COLOR_SWATCH_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h" #include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2004 Sun Microsystems Inc. * Copyright 2004 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ struct _GtkComboBoxAccessiblePrivate
static void atk_action_interface_init (AtkActionIface *iface); static void atk_action_interface_init (AtkActionIface *iface);
static void atk_selection_interface_init (AtkSelectionIface *iface); static void atk_selection_interface_init (AtkSelectionIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkComboBoxAccessible, _gtk_combo_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkComboBoxAccessible, gtk_combo_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
@@ -63,7 +63,7 @@ gtk_combo_box_accessible_initialize (AtkObject *obj,
GtkComboBoxAccessible *accessible; GtkComboBoxAccessible *accessible;
AtkObject *popup; AtkObject *popup;
ATK_OBJECT_CLASS (_gtk_combo_box_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->initialize (obj, data);
combo_box = GTK_COMBO_BOX (data); combo_box = GTK_COMBO_BOX (data);
accessible = GTK_COMBO_BOX_ACCESSIBLE (obj); accessible = GTK_COMBO_BOX_ACCESSIBLE (obj);
@@ -90,7 +90,7 @@ gtk_combo_box_accessible_finalize (GObject *object)
g_free (combo_box->priv->name); g_free (combo_box->priv->name);
G_OBJECT_CLASS (_gtk_combo_box_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->finalize (object);
} }
static const gchar * static const gchar *
@@ -105,7 +105,7 @@ gtk_combo_box_accessible_get_name (AtkObject *obj)
gint n_columns; gint n_columns;
gint i; gint i;
name = ATK_OBJECT_CLASS (_gtk_combo_box_accessible_parent_class)->get_name (obj); name = ATK_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->get_name (obj);
if (name) if (name)
return name; return name;
@@ -190,7 +190,7 @@ gtk_combo_box_accessible_ref_child (AtkObject *obj,
} }
static void static void
_gtk_combo_box_accessible_class_init (GtkComboBoxAccessibleClass *klass) gtk_combo_box_accessible_class_init (GtkComboBoxAccessibleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -206,7 +206,7 @@ _gtk_combo_box_accessible_class_init (GtkComboBoxAccessibleClass *klass)
} }
static void static void
_gtk_combo_box_accessible_init (GtkComboBoxAccessible *combo_box) gtk_combo_box_accessible_init (GtkComboBoxAccessible *combo_box)
{ {
combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box,
GTK_TYPE_COMBO_BOX_ACCESSIBLE, GTK_TYPE_COMBO_BOX_ACCESSIBLE,

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2004 Sun Microsystems Inc. * Copyright 2004 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_COMBO_BOX_ACCESSIBLE_H__ #ifndef __GTK_COMBO_BOX_ACCESSIBLE_H__
#define __GTK_COMBO_BOX_ACCESSIBLE_H__ #define __GTK_COMBO_BOX_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h" #include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_COMBO_BOX_ACCESSIBLE (_gtk_combo_box_accessible_get_type ()) #define GTK_TYPE_COMBO_BOX_ACCESSIBLE (gtk_combo_box_accessible_get_type ())
#define GTK_COMBO_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX_ACCESSIBLE, GtkComboBoxAccessible)) #define GTK_COMBO_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX_ACCESSIBLE, GtkComboBoxAccessible))
#define GTK_COMBO_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COMBO_BOX_ACCESSIBLE, GtkComboBoxAccessibleClass)) #define GTK_COMBO_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COMBO_BOX_ACCESSIBLE, GtkComboBoxAccessibleClass))
#define GTK_IS_COMBO_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX_ACCESSIBLE)) #define GTK_IS_COMBO_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkComboBoxAccessibleClass
GtkContainerAccessibleClass parent_class; GtkContainerAccessibleClass parent_class;
}; };
GType _gtk_combo_box_accessible_get_type (void); GType gtk_combo_box_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@ struct _GtkContainerAccessiblePrivate
GList *children; GList *children;
}; };
G_DEFINE_TYPE (GtkContainerAccessible, _gtk_container_accessible, GTK_TYPE_WIDGET_ACCESSIBLE) G_DEFINE_TYPE (GtkContainerAccessible, gtk_container_accessible, GTK_TYPE_WIDGET_ACCESSIBLE)
static gint static gint
gtk_container_accessible_get_n_children (AtkObject* obj) gtk_container_accessible_get_n_children (AtkObject* obj)
@@ -159,7 +159,7 @@ gtk_container_accessible_real_initialize (AtkObject *obj,
{ {
GtkContainerAccessible *accessible = GTK_CONTAINER_ACCESSIBLE (obj); GtkContainerAccessible *accessible = GTK_CONTAINER_ACCESSIBLE (obj);
ATK_OBJECT_CLASS (_gtk_container_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_container_accessible_parent_class)->initialize (obj, data);
accessible->priv->children = gtk_container_get_children (GTK_CONTAINER (data)); accessible->priv->children = gtk_container_get_children (GTK_CONTAINER (data));
@@ -176,11 +176,11 @@ gtk_container_accessible_finalize (GObject *object)
g_list_free (accessible->priv->children); g_list_free (accessible->priv->children);
G_OBJECT_CLASS (_gtk_container_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_container_accessible_parent_class)->finalize (object);
} }
static void static void
_gtk_container_accessible_class_init (GtkContainerAccessibleClass *klass) gtk_container_accessible_class_init (GtkContainerAccessibleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -198,7 +198,7 @@ _gtk_container_accessible_class_init (GtkContainerAccessibleClass *klass)
} }
static void static void
_gtk_container_accessible_init (GtkContainerAccessible *container) gtk_container_accessible_init (GtkContainerAccessible *container)
{ {
container->priv = G_TYPE_INSTANCE_GET_PRIVATE (container, container->priv = G_TYPE_INSTANCE_GET_PRIVATE (container,
GTK_TYPE_CONTAINER_ACCESSIBLE, GTK_TYPE_CONTAINER_ACCESSIBLE,

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,15 +15,19 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_CONTAINER_ACCESSIBLE_H__ #ifndef __GTK_CONTAINER_ACCESSIBLE_H__
#define __GTK_CONTAINER_ACCESSIBLE_H__ #define __GTK_CONTAINER_ACCESSIBLE_H__
#include "gtkcontainer.h" #include <gtk/gtkcontainer.h>
#include "gtkwidgetaccessible.h" #include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_CONTAINER_ACCESSIBLE (_gtk_container_accessible_get_type ()) #define GTK_TYPE_CONTAINER_ACCESSIBLE (gtk_container_accessible_get_type ())
#define GTK_CONTAINER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER_ACCESSIBLE, GtkContainerAccessible)) #define GTK_CONTAINER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER_ACCESSIBLE, GtkContainerAccessible))
#define GTK_CONTAINER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER_ACCESSIBLE, GtkContainerAccessibleClass)) #define GTK_CONTAINER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER_ACCESSIBLE, GtkContainerAccessibleClass))
#define GTK_IS_CONTAINER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CONTAINER_ACCESSIBLE)) #define GTK_IS_CONTAINER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CONTAINER_ACCESSIBLE))
@@ -53,7 +57,7 @@ struct _GtkContainerAccessibleClass
gpointer data); gpointer data);
}; };
GType _gtk_container_accessible_get_type (void); GType gtk_container_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -19,6 +19,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtkcontainercellaccessible.h" #include "gtkcontainercellaccessible.h"
#include "gtkcellaccessibleprivate.h"
struct _GtkContainerCellAccessiblePrivate struct _GtkContainerCellAccessiblePrivate
{ {
@@ -26,7 +27,7 @@ struct _GtkContainerCellAccessiblePrivate
gint n_children; gint n_children;
}; };
G_DEFINE_TYPE (GtkContainerCellAccessible, _gtk_container_cell_accessible, GTK_TYPE_CELL_ACCESSIBLE) G_DEFINE_TYPE (GtkContainerCellAccessible, gtk_container_cell_accessible, GTK_TYPE_CELL_ACCESSIBLE)
static void static void
@@ -36,7 +37,7 @@ gtk_container_cell_accessible_finalize (GObject *obj)
g_list_free_full (container->priv->children, g_object_unref); g_list_free_full (container->priv->children, g_object_unref);
G_OBJECT_CLASS (_gtk_container_cell_accessible_parent_class)->finalize (obj); G_OBJECT_CLASS (gtk_container_cell_accessible_parent_class)->finalize (obj);
} }
@@ -69,9 +70,7 @@ gtk_container_cell_accessible_update_cache (GtkCellAccessible *cell)
GList *l; GList *l;
for (l = container->priv->children; l; l = l->next) for (l = container->priv->children; l; l = l->next)
{ _gtk_cell_accessible_update_cache (l->data);
_gtk_cell_accessible_update_cache (l->data);
}
} }
static void static void
@@ -81,11 +80,9 @@ gtk_container_cell_widget_set (GtkAccessible *accessible)
GList *l; GList *l;
for (l = container->priv->children; l; l = l->next) for (l = container->priv->children; l; l = l->next)
{ gtk_accessible_set_widget (l->data, gtk_accessible_get_widget (accessible));
gtk_accessible_set_widget (l->data, gtk_accessible_get_widget (accessible));
}
GTK_ACCESSIBLE_CLASS (_gtk_container_cell_accessible_parent_class)->widget_unset (accessible); GTK_ACCESSIBLE_CLASS (gtk_container_cell_accessible_parent_class)->widget_unset (accessible);
} }
static void static void
@@ -95,15 +92,13 @@ gtk_container_cell_widget_unset (GtkAccessible *accessible)
GList *l; GList *l;
for (l = container->priv->children; l; l = l->next) for (l = container->priv->children; l; l = l->next)
{ gtk_accessible_set_widget (l->data, NULL);
gtk_accessible_set_widget (l->data, NULL);
}
GTK_ACCESSIBLE_CLASS (_gtk_container_cell_accessible_parent_class)->widget_unset (accessible); GTK_ACCESSIBLE_CLASS (gtk_container_cell_accessible_parent_class)->widget_unset (accessible);
} }
static void static void
_gtk_container_cell_accessible_class_init (GtkContainerCellAccessibleClass *klass) gtk_container_cell_accessible_class_init (GtkContainerCellAccessibleClass *klass)
{ {
GtkCellAccessibleClass *cell_class = GTK_CELL_ACCESSIBLE_CLASS (klass); GtkCellAccessibleClass *cell_class = GTK_CELL_ACCESSIBLE_CLASS (klass);
GtkAccessibleClass *accessible_class = GTK_ACCESSIBLE_CLASS (klass); GtkAccessibleClass *accessible_class = GTK_ACCESSIBLE_CLASS (klass);
@@ -124,7 +119,7 @@ _gtk_container_cell_accessible_class_init (GtkContainerCellAccessibleClass *klas
} }
static void static void
_gtk_container_cell_accessible_init (GtkContainerCellAccessible *cell) gtk_container_cell_accessible_init (GtkContainerCellAccessible *cell)
{ {
cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (cell, cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (cell,
GTK_TYPE_CONTAINER_CELL_ACCESSIBLE, GTK_TYPE_CONTAINER_CELL_ACCESSIBLE,
@@ -132,7 +127,7 @@ _gtk_container_cell_accessible_init (GtkContainerCellAccessible *cell)
} }
GtkContainerCellAccessible * GtkContainerCellAccessible *
_gtk_container_cell_accessible_new (void) gtk_container_cell_accessible_new (void)
{ {
GObject *object; GObject *object;
@@ -144,7 +139,7 @@ _gtk_container_cell_accessible_new (void)
} }
void void
_gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container, gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container,
GtkCellAccessible *child) GtkCellAccessible *child)
{ {
g_return_if_fail (GTK_IS_CONTAINER_CELL_ACCESSIBLE (container)); g_return_if_fail (GTK_IS_CONTAINER_CELL_ACCESSIBLE (container));
@@ -156,7 +151,7 @@ _gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container,
} }
void void
_gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *container, gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *container,
GtkCellAccessible *child) GtkCellAccessible *child)
{ {
g_return_if_fail (GTK_IS_CONTAINER_CELL_ACCESSIBLE (container)); g_return_if_fail (GTK_IS_CONTAINER_CELL_ACCESSIBLE (container));
@@ -168,7 +163,7 @@ _gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *contain
} }
GList * GList *
_gtk_container_cell_accessible_get_children (GtkContainerCellAccessible *container) gtk_container_cell_accessible_get_children (GtkContainerCellAccessible *container)
{ {
g_return_val_if_fail (GTK_IS_CONTAINER_CELL_ACCESSIBLE (container), NULL); g_return_val_if_fail (GTK_IS_CONTAINER_CELL_ACCESSIBLE (container), NULL);

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,15 +15,19 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_CONTAINER_CELL_ACCESSIBLE_H__ #ifndef __GTK_CONTAINER_CELL_ACCESSIBLE_H__
#define __GTK_CONTAINER_CELL_ACCESSIBLE_H__ #define __GTK_CONTAINER_CELL_ACCESSIBLE_H__
#include <atk/atk.h> #include <atk/atk.h>
#include "gtkcellaccessible.h" #include <gtk/a11y/gtkcellaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_CONTAINER_CELL_ACCESSIBLE (_gtk_container_cell_accessible_get_type ()) #define GTK_TYPE_CONTAINER_CELL_ACCESSIBLE (gtk_container_cell_accessible_get_type ())
#define GTK_CONTAINER_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER_CELL_ACCESSIBLE, GtkContainerCellAccessible)) #define GTK_CONTAINER_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER_CELL_ACCESSIBLE, GtkContainerCellAccessible))
#define GTK_CONTAINER_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER_CELL_ACCESSIBLE, GtkContainerCellAccessibleClass)) #define GTK_CONTAINER_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER_CELL_ACCESSIBLE, GtkContainerCellAccessibleClass))
#define GTK_IS_CONTAINER_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CONTAINER_CELL_ACCESSIBLE)) #define GTK_IS_CONTAINER_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CONTAINER_CELL_ACCESSIBLE))
@@ -46,14 +50,14 @@ struct _GtkContainerCellAccessibleClass
GtkCellAccessibleClass parent_class; GtkCellAccessibleClass parent_class;
}; };
GType _gtk_container_cell_accessible_get_type (void); GType gtk_container_cell_accessible_get_type (void);
GtkContainerCellAccessible *_gtk_container_cell_accessible_new (void); GtkContainerCellAccessible *gtk_container_cell_accessible_new (void);
void _gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container, void gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container,
GtkCellAccessible *child); GtkCellAccessible *child);
void _gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *container, void gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *container,
GtkCellAccessible *child); GtkCellAccessible *child);
GList *_gtk_container_cell_accessible_get_children (GtkContainerCellAccessible *container); GList *gtk_container_cell_accessible_get_children (GtkContainerCellAccessible *container);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@ static void atk_text_interface_init (AtkTextIface *iface);
static void atk_action_interface_init (AtkActionIface *iface); static void atk_action_interface_init (AtkActionIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkEntryAccessible, _gtk_entry_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkEntryAccessible, gtk_entry_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init))
@@ -65,7 +65,7 @@ gtk_entry_accessible_ref_state_set (AtkObject *accessible)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
state_set = ATK_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->ref_state_set (accessible); state_set = ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->ref_state_set (accessible);
g_object_get (G_OBJECT (widget), "editable", &value, NULL); g_object_get (G_OBJECT (widget), "editable", &value, NULL);
if (value) if (value)
@@ -83,7 +83,7 @@ gtk_entry_accessible_get_attributes (AtkObject *accessible)
AtkAttribute *placeholder_text; AtkAttribute *placeholder_text;
const gchar *text; const gchar *text;
attributes = ATK_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->get_attributes (accessible); attributes = ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->get_attributes (accessible);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
if (widget == NULL) if (widget == NULL)
@@ -110,7 +110,7 @@ gtk_entry_accessible_initialize (AtkObject *obj,
GtkEntryAccessible *gtk_entry_accessible; GtkEntryAccessible *gtk_entry_accessible;
gint start_pos, end_pos; gint start_pos, end_pos;
ATK_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->initialize (obj, data);
gtk_entry_accessible = GTK_ENTRY_ACCESSIBLE (obj); gtk_entry_accessible = GTK_ENTRY_ACCESSIBLE (obj);
@@ -175,7 +175,7 @@ gtk_entry_accessible_notify_gtk (GObject *obj,
atk_object_set_role (atk_obj, new_role); atk_object_set_role (atk_obj, new_role);
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_entry_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_entry_accessible_parent_class)->notify_gtk (obj, pspec);
} }
static gint static gint
@@ -189,11 +189,11 @@ gtk_entry_accessible_get_index_in_parent (AtkObject *accessible)
if (GTK_IS_COMBO_BOX_ACCESSIBLE (accessible->accessible_parent)) if (GTK_IS_COMBO_BOX_ACCESSIBLE (accessible->accessible_parent))
return 1; return 1;
return ATK_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->get_index_in_parent (accessible); return ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->get_index_in_parent (accessible);
} }
static void static void
_gtk_entry_accessible_class_init (GtkEntryAccessibleClass *klass) gtk_entry_accessible_class_init (GtkEntryAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;
@@ -209,7 +209,7 @@ _gtk_entry_accessible_class_init (GtkEntryAccessibleClass *klass)
} }
static void static void
_gtk_entry_accessible_init (GtkEntryAccessible *entry) gtk_entry_accessible_init (GtkEntryAccessible *entry)
{ {
entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (entry, entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (entry,
GTK_TYPE_ENTRY_ACCESSIBLE, GTK_TYPE_ENTRY_ACCESSIBLE,

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_ENTRY_ACCESSIBLE_H__ #ifndef __GTK_ENTRY_ACCESSIBLE_H__
#define __GTK_ENTRY_ACCESSIBLE_H__ #define __GTK_ENTRY_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h" #include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_ENTRY_ACCESSIBLE (_gtk_entry_accessible_get_type ()) #define GTK_TYPE_ENTRY_ACCESSIBLE (gtk_entry_accessible_get_type ())
#define GTK_ENTRY_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY_ACCESSIBLE, GtkEntryAccessible)) #define GTK_ENTRY_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY_ACCESSIBLE, GtkEntryAccessible))
#define GTK_ENTRY_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ENTRY_ACCESSIBLE, GtkEntryAccessibleClass)) #define GTK_ENTRY_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ENTRY_ACCESSIBLE, GtkEntryAccessibleClass))
#define GTK_IS_ENTRY_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ENTRY_ACCESSIBLE)) #define GTK_IS_ENTRY_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ENTRY_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkEntryAccessibleClass
GtkWidgetAccessibleClass parent_class; GtkWidgetAccessibleClass parent_class;
}; };
GType _gtk_entry_accessible_get_type (void); GType gtk_entry_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2003 Sun Microsystems Inc. * Copyright 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
static void atk_action_interface_init (AtkActionIface *iface); static void atk_action_interface_init (AtkActionIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkExpanderAccessible, _gtk_expander_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkExpanderAccessible, gtk_expander_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init))
static const gchar * static const gchar *
@@ -48,7 +48,7 @@ gtk_expander_accessible_get_name (AtkObject *obj)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
name = ATK_OBJECT_CLASS (_gtk_expander_accessible_parent_class)->get_name (obj); name = ATK_OBJECT_CLASS (gtk_expander_accessible_parent_class)->get_name (obj);
if (name != NULL) if (name != NULL)
return name; return name;
@@ -129,7 +129,7 @@ static void
gtk_expander_accessible_initialize (AtkObject *obj, gtk_expander_accessible_initialize (AtkObject *obj,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_expander_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_expander_accessible_parent_class)->initialize (obj, data);
obj->role = ATK_ROLE_TOGGLE_BUTTON; obj->role = ATK_ROLE_TOGGLE_BUTTON;
} }
@@ -159,7 +159,7 @@ gtk_expander_accessible_notify_gtk (GObject *obj,
g_signal_emit_by_name (atk_obj, "visible-data-changed"); g_signal_emit_by_name (atk_obj, "visible-data-changed");
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_expander_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_expander_accessible_parent_class)->notify_gtk (obj, pspec);
} }
static AtkStateSet * static AtkStateSet *
@@ -173,7 +173,7 @@ gtk_expander_accessible_ref_state_set (AtkObject *obj)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
state_set = ATK_OBJECT_CLASS (_gtk_expander_accessible_parent_class)->ref_state_set (obj); state_set = ATK_OBJECT_CLASS (gtk_expander_accessible_parent_class)->ref_state_set (obj);
expander = GTK_EXPANDER (widget); expander = GTK_EXPANDER (widget);
@@ -189,7 +189,7 @@ gtk_expander_accessible_ref_state_set (AtkObject *obj)
} }
static void static void
_gtk_expander_accessible_class_init (GtkExpanderAccessibleClass *klass) gtk_expander_accessible_class_init (GtkExpanderAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;
@@ -205,7 +205,7 @@ _gtk_expander_accessible_class_init (GtkExpanderAccessibleClass *klass)
} }
static void static void
_gtk_expander_accessible_init (GtkExpanderAccessible *expander) gtk_expander_accessible_init (GtkExpanderAccessible *expander)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2003 Sun Microsystems Inc. * Copyright 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_EXPANDER_ACCESSIBLE_H__ #ifndef __GTK_EXPANDER_ACCESSIBLE_H__
#define __GTK_EXPANDER_ACCESSIBLE_H__ #define __GTK_EXPANDER_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h" #include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_EXPANDER_ACCESSIBLE (_gtk_expander_accessible_get_type ()) #define GTK_TYPE_EXPANDER_ACCESSIBLE (gtk_expander_accessible_get_type ())
#define GTK_EXPANDER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EXPANDER_ACCESSIBLE, GtkExpanderAccessible)) #define GTK_EXPANDER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EXPANDER_ACCESSIBLE, GtkExpanderAccessible))
#define GTK_EXPANDER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_EXPANDER_ACCESSIBLE, GtkExpanderAccessibleClass)) #define GTK_EXPANDER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_EXPANDER_ACCESSIBLE, GtkExpanderAccessibleClass))
#define GTK_IS_EXPANDER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EXPANDER_ACCESSIBLE)) #define GTK_IS_EXPANDER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EXPANDER_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkExpanderAccessibleClass
GtkContainerAccessibleClass parent_class; GtkContainerAccessibleClass parent_class;
}; };
GType _gtk_expander_accessible_get_type (void); GType gtk_expander_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -22,13 +22,13 @@
#include "gtkframeaccessible.h" #include "gtkframeaccessible.h"
G_DEFINE_TYPE (GtkFrameAccessible, _gtk_frame_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) G_DEFINE_TYPE (GtkFrameAccessible, gtk_frame_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE)
static void static void
gtk_frame_accessible_initialize (AtkObject *accessible, gtk_frame_accessible_initialize (AtkObject *accessible,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_frame_accessible_parent_class)->initialize (accessible, data); ATK_OBJECT_CLASS (gtk_frame_accessible_parent_class)->initialize (accessible, data);
accessible->role = ATK_ROLE_PANEL; accessible->role = ATK_ROLE_PANEL;
} }
@@ -43,7 +43,7 @@ gtk_frame_accessible_get_name (AtkObject *obj)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
name = ATK_OBJECT_CLASS (_gtk_frame_accessible_parent_class)->get_name (obj); name = ATK_OBJECT_CLASS (gtk_frame_accessible_parent_class)->get_name (obj);
if (name != NULL) if (name != NULL)
return name; return name;
@@ -51,7 +51,7 @@ gtk_frame_accessible_get_name (AtkObject *obj)
} }
static void static void
_gtk_frame_accessible_class_init (GtkFrameAccessibleClass *klass) gtk_frame_accessible_class_init (GtkFrameAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -60,6 +60,6 @@ _gtk_frame_accessible_class_init (GtkFrameAccessibleClass *klass)
} }
static void static void
_gtk_frame_accessible_init (GtkFrameAccessible *frame) gtk_frame_accessible_init (GtkFrameAccessible *frame)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_FRAME_ACCESSIBLE_H__ #ifndef __GTK_FRAME_ACCESSIBLE_H__
#define __GTK_FRAME_ACCESSIBLE_H__ #define __GTK_FRAME_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h" #include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_FRAME_ACCESSIBLE (_gtk_frame_accessible_get_type ()) #define GTK_TYPE_FRAME_ACCESSIBLE (gtk_frame_accessible_get_type ())
#define GTK_FRAME_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FRAME_ACCESSIBLE, GtkFrameAccessible)) #define GTK_FRAME_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FRAME_ACCESSIBLE, GtkFrameAccessible))
#define GTK_FRAME_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FRAME_ACCESSIBLE, GtkFrameAccessibleClass)) #define GTK_FRAME_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FRAME_ACCESSIBLE, GtkFrameAccessibleClass))
#define GTK_IS_FRAME_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FRAME_ACCESSIBLE)) #define GTK_IS_FRAME_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FRAME_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkFrameAccessibleClass
GtkContainerAccessibleClass parent_class; GtkContainerAccessibleClass parent_class;
}; };
GType _gtk_frame_accessible_get_type (void); GType gtk_frame_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* gtkiconview.c /* GTK+ - accessibility implementations
* Copyright (C) 2002, 2004 Anders Carlsson <andersca@gnu.org> * Copyright (C) 2002, 2004 Anders Carlsson <andersca@gnu.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -17,7 +17,7 @@
#include "config.h" #include "config.h"
#include "gtkiconviewaccessible.h" #include "gtkiconviewaccessibleprivate.h"
#include <string.h> #include <string.h>
@@ -754,7 +754,7 @@ _gtk_icon_view_item_accessible_init (GtkIconViewItemAccessible *item)
} }
static void static void
gtk_icon_view_item_accessible_finalize (GObject *object) _gtk_icon_view_item_accessible_finalize (GObject *object)
{ {
GtkIconViewItemAccessible *item; GtkIconViewItemAccessible *item;
@@ -781,7 +781,7 @@ gtk_icon_view_item_accessible_finalize (GObject *object)
} }
static AtkObject* static AtkObject*
gtk_icon_view_item_accessible_get_parent (AtkObject *obj) _gtk_icon_view_item_accessible_get_parent (AtkObject *obj)
{ {
GtkIconViewItemAccessible *item; GtkIconViewItemAccessible *item;
@@ -795,7 +795,7 @@ gtk_icon_view_item_accessible_get_parent (AtkObject *obj)
} }
static gint static gint
gtk_icon_view_item_accessible_get_index_in_parent (AtkObject *obj) _gtk_icon_view_item_accessible_get_index_in_parent (AtkObject *obj)
{ {
GtkIconViewItemAccessible *item; GtkIconViewItemAccessible *item;
@@ -806,7 +806,7 @@ gtk_icon_view_item_accessible_get_index_in_parent (AtkObject *obj)
} }
static AtkStateSet * static AtkStateSet *
gtk_icon_view_item_accessible_ref_state_set (AtkObject *obj) _gtk_icon_view_item_accessible_ref_state_set (AtkObject *obj)
{ {
GtkIconViewItemAccessible *item; GtkIconViewItemAccessible *item;
GtkIconView *icon_view; GtkIconView *icon_view;
@@ -839,17 +839,17 @@ _gtk_icon_view_item_accessible_class_init (GtkIconViewItemAccessibleClass *klass
gobject_class = (GObjectClass *)klass; gobject_class = (GObjectClass *)klass;
atk_class = (AtkObjectClass *)klass; atk_class = (AtkObjectClass *)klass;
gobject_class->finalize = gtk_icon_view_item_accessible_finalize; gobject_class->finalize = _gtk_icon_view_item_accessible_finalize;
atk_class->get_index_in_parent = gtk_icon_view_item_accessible_get_index_in_parent; atk_class->get_index_in_parent = _gtk_icon_view_item_accessible_get_index_in_parent;
atk_class->get_parent = gtk_icon_view_item_accessible_get_parent; atk_class->get_parent = _gtk_icon_view_item_accessible_get_parent;
atk_class->ref_state_set = gtk_icon_view_item_accessible_ref_state_set; atk_class->ref_state_set = _gtk_icon_view_item_accessible_ref_state_set;
} }
static void atk_component_interface_init (AtkComponentIface *iface); static void atk_component_interface_init (AtkComponentIface *iface);
static void atk_selection_interface_init (AtkSelectionIface *iface); static void atk_selection_interface_init (AtkSelectionIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkIconViewAccessible, _gtk_icon_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkIconViewAccessible, gtk_icon_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
@@ -1291,8 +1291,8 @@ gtk_icon_view_accessible_initialize (AtkObject *accessible,
GtkIconViewAccessible *view; GtkIconViewAccessible *view;
GtkIconView *icon_view; GtkIconView *icon_view;
if (ATK_OBJECT_CLASS (_gtk_icon_view_accessible_parent_class)->initialize) if (ATK_OBJECT_CLASS (gtk_icon_view_accessible_parent_class)->initialize)
ATK_OBJECT_CLASS (_gtk_icon_view_accessible_parent_class)->initialize (accessible, data); ATK_OBJECT_CLASS (gtk_icon_view_accessible_parent_class)->initialize (accessible, data);
icon_view = (GtkIconView*)data; icon_view = (GtkIconView*)data;
view = (GtkIconViewAccessible*)accessible; view = (GtkIconViewAccessible*)accessible;
@@ -1317,11 +1317,11 @@ gtk_icon_view_accessible_finalize (GObject *object)
gtk_icon_view_accessible_clear_cache (view); gtk_icon_view_accessible_clear_cache (view);
G_OBJECT_CLASS (_gtk_icon_view_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_icon_view_accessible_parent_class)->finalize (object);
} }
static void static void
_gtk_icon_view_accessible_class_init (GtkIconViewAccessibleClass *klass) gtk_icon_view_accessible_class_init (GtkIconViewAccessibleClass *klass)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class;
AtkObjectClass *atk_class; AtkObjectClass *atk_class;
@@ -1339,7 +1339,7 @@ _gtk_icon_view_accessible_class_init (GtkIconViewAccessibleClass *klass)
} }
static void static void
_gtk_icon_view_accessible_init (GtkIconViewAccessible *accessible) gtk_icon_view_accessible_init (GtkIconViewAccessible *accessible)
{ {
accessible->priv = G_TYPE_INSTANCE_GET_PRIVATE (accessible, accessible->priv = G_TYPE_INSTANCE_GET_PRIVATE (accessible,
GTK_TYPE_ICON_VIEW_ACCESSIBLE, GTK_TYPE_ICON_VIEW_ACCESSIBLE,

View File

@@ -1,4 +1,4 @@
/* gtkiconview.c /* GTK+ - accessibility implementations
* Copyright (C) 2002, 2004 Anders Carlsson <andersca@gnu.org> * Copyright (C) 2002, 2004 Anders Carlsson <andersca@gnu.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,15 +15,19 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_ICON_VIEW_ACCESSIBLE_H__ #ifndef __GTK_ICON_VIEW_ACCESSIBLE_H__
#define __GTK_ICON_VIEW_ACCESSIBLE_H__ #define __GTK_ICON_VIEW_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h" #include <gtk/gtkiconview.h>
#include "gtk/gtkiconview.h" #include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_ICON_VIEW_ACCESSIBLE (_gtk_icon_view_accessible_get_type ()) #define GTK_TYPE_ICON_VIEW_ACCESSIBLE (gtk_icon_view_accessible_get_type ())
#define GTK_ICON_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ICON_VIEW_ACCESSIBLE, GtkIconViewAccessible)) #define GTK_ICON_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ICON_VIEW_ACCESSIBLE, GtkIconViewAccessible))
#define GTK_ICON_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ICON_VIEW_ACCESSIBLE, GtkIconViewAccessibleClass)) #define GTK_ICON_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ICON_VIEW_ACCESSIBLE, GtkIconViewAccessibleClass))
#define GTK_IS_ICON_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ICON_VIEW_ACCESSIBLE)) #define GTK_IS_ICON_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ICON_VIEW_ACCESSIBLE))
@@ -46,9 +50,7 @@ struct _GtkIconViewAccessibleClass
GtkContainerAccessibleClass parent_class; GtkContainerAccessibleClass parent_class;
}; };
GType _gtk_icon_view_accessible_get_type (void); GType gtk_icon_view_accessible_get_type (void);
void _gtk_icon_view_accessible_adjustment_changed (GtkIconView *icon_view);
G_END_DECLS G_END_DECLS

View File

@@ -0,0 +1,29 @@
/* GTK+ - accessibility implementations
* Copyright (C) 2002, 2004 Anders Carlsson <andersca@gnu.org>
*
* 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, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GTK_ICON_VIEW_ACCESSIBLE_PRIVATE_H__
#define __GTK_ICON_VIEW_ACCESSIBLE_PRIVATE_H__
#include <gtk/a11y/gtkiconviewaccessible.h>
G_BEGIN_DECLS
void _gtk_icon_view_accessible_adjustment_changed (GtkIconView *icon_view);
G_END_DECLS
#endif /* __GTK_ICON_VIEW_ACCESSIBLE_PRIVATE_H__ */

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -29,14 +29,14 @@ struct _GtkImageAccessiblePrivate
static void atk_image_interface_init (AtkImageIface *iface); static void atk_image_interface_init (AtkImageIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkImageAccessible, _gtk_image_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkImageAccessible, gtk_image_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init))
static void static void
gtk_image_accessible_initialize (AtkObject *accessible, gtk_image_accessible_initialize (AtkObject *accessible,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_image_accessible_parent_class)->initialize (accessible, data); ATK_OBJECT_CLASS (gtk_image_accessible_parent_class)->initialize (accessible, data);
accessible->role = ATK_ROLE_ICON; accessible->role = ATK_ROLE_ICON;
} }
@@ -49,7 +49,7 @@ gtk_image_accessible_finalize (GObject *object)
g_free (aimage->priv->image_description); g_free (aimage->priv->image_description);
g_free (aimage->priv->stock_name); g_free (aimage->priv->stock_name);
G_OBJECT_CLASS (_gtk_image_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_image_accessible_parent_class)->finalize (object);
} }
static const gchar * static const gchar *
@@ -66,7 +66,7 @@ gtk_image_accessible_get_name (AtkObject *accessible)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
name = ATK_OBJECT_CLASS (_gtk_image_accessible_parent_class)->get_name (accessible); name = ATK_OBJECT_CLASS (gtk_image_accessible_parent_class)->get_name (accessible);
if (name) if (name)
return name; return name;
@@ -91,7 +91,7 @@ gtk_image_accessible_get_name (AtkObject *accessible)
} }
static void static void
_gtk_image_accessible_class_init (GtkImageAccessibleClass *klass) gtk_image_accessible_class_init (GtkImageAccessibleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -104,7 +104,7 @@ _gtk_image_accessible_class_init (GtkImageAccessibleClass *klass)
} }
static void static void
_gtk_image_accessible_init (GtkImageAccessible *image) gtk_image_accessible_init (GtkImageAccessible *image)
{ {
image->priv = G_TYPE_INSTANCE_GET_PRIVATE (image, image->priv = G_TYPE_INSTANCE_GET_PRIVATE (image,
GTK_TYPE_IMAGE_ACCESSIBLE, GTK_TYPE_IMAGE_ACCESSIBLE,

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_IMAGE_ACCESSIBLE_H__ #ifndef __GTK_IMAGE_ACCESSIBLE_H__
#define __GTK_IMAGE_ACCESSIBLE_H__ #define __GTK_IMAGE_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h" #include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_IMAGE_ACCESSIBLE (_gtk_image_accessible_get_type ()) #define GTK_TYPE_IMAGE_ACCESSIBLE (gtk_image_accessible_get_type ())
#define GTK_IMAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_ACCESSIBLE, GtkImageAccessible)) #define GTK_IMAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_ACCESSIBLE, GtkImageAccessible))
#define GTK_IMAGE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE_ACCESSIBLE, GtkImageAccessibleClass)) #define GTK_IMAGE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE_ACCESSIBLE, GtkImageAccessibleClass))
#define GTK_IS_IMAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE_ACCESSIBLE)) #define GTK_IS_IMAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkImageAccessibleClass
GtkWidgetAccessibleClass parent_class; GtkWidgetAccessibleClass parent_class;
}; };
GType _gtk_image_accessible_get_type (void); GType gtk_image_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@ struct _GtkImageCellAccessiblePrivate
static void atk_image_interface_init (AtkImageIface *iface); static void atk_image_interface_init (AtkImageIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkImageCellAccessible, _gtk_image_cell_accessible, GTK_TYPE_RENDERER_CELL_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkImageCellAccessible, gtk_image_cell_accessible, GTK_TYPE_RENDERER_CELL_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init))
static void static void
@@ -36,11 +36,11 @@ gtk_image_cell_accessible_finalize (GObject *object)
GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (object); GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (object);
g_free (image_cell->priv->image_description); g_free (image_cell->priv->image_description);
G_OBJECT_CLASS (_gtk_image_cell_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_image_cell_accessible_parent_class)->finalize (object);
} }
static void static void
_gtk_image_cell_accessible_class_init (GtkImageCellAccessibleClass *klass) gtk_image_cell_accessible_class_init (GtkImageCellAccessibleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
@@ -50,7 +50,7 @@ _gtk_image_cell_accessible_class_init (GtkImageCellAccessibleClass *klass)
} }
static void static void
_gtk_image_cell_accessible_init (GtkImageCellAccessible *image_cell) gtk_image_cell_accessible_init (GtkImageCellAccessible *image_cell)
{ {
image_cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (image_cell, image_cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (image_cell,
GTK_TYPE_IMAGE_CELL_ACCESSIBLE, GTK_TYPE_IMAGE_CELL_ACCESSIBLE,

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,15 +15,19 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_IMAGE_CELL_ACCESSIBLE_H__ #ifndef __GTK_IMAGE_CELL_ACCESSIBLE_H__
#define __GTK_IMAGE_CELL_ACCESSIBLE_H__ #define __GTK_IMAGE_CELL_ACCESSIBLE_H__
#include <atk/atk.h> #include <atk/atk.h>
#include "gtkrenderercellaccessible.h" #include <gtk/a11y/gtkrenderercellaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_IMAGE_CELL_ACCESSIBLE (_gtk_image_cell_accessible_get_type ()) #define GTK_TYPE_IMAGE_CELL_ACCESSIBLE (gtk_image_cell_accessible_get_type ())
#define GTK_IMAGE_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_CELL_ACCESSIBLE, GtkImageCellAccessible)) #define GTK_IMAGE_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_CELL_ACCESSIBLE, GtkImageCellAccessible))
#define GTK_IMAGE_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_IMAGE_CELL_ACCESSIBLE, GtkImageCellAccessibleClass)) #define GTK_IMAGE_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_IMAGE_CELL_ACCESSIBLE, GtkImageCellAccessibleClass))
#define GTK_IS_IMAGE_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE_CELL_ACCESSIBLE)) #define GTK_IS_IMAGE_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE_CELL_ACCESSIBLE))
@@ -46,7 +50,7 @@ struct _GtkImageCellAccessibleClass
GtkRendererCellAccessibleClass parent_class; GtkRendererCellAccessibleClass parent_class;
}; };
GType _gtk_image_cell_accessible_get_type (void); GType gtk_image_cell_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -30,11 +30,11 @@ struct _GtkLabelAccessiblePrivate
static void atk_text_interface_init (AtkTextIface *iface); static void atk_text_interface_init (AtkTextIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkLabelAccessible, _gtk_label_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkLabelAccessible, gtk_label_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init))
static void static void
_gtk_label_accessible_init (GtkLabelAccessible *label) gtk_label_accessible_init (GtkLabelAccessible *label)
{ {
label->priv = G_TYPE_INSTANCE_GET_PRIVATE (label, label->priv = G_TYPE_INSTANCE_GET_PRIVATE (label,
GTK_TYPE_LABEL_ACCESSIBLE, GTK_TYPE_LABEL_ACCESSIBLE,
@@ -48,7 +48,7 @@ gtk_label_accessible_initialize (AtkObject *obj,
GtkWidget *widget; GtkWidget *widget;
GtkLabelAccessible *accessible; GtkLabelAccessible *accessible;
ATK_OBJECT_CLASS (_gtk_label_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->initialize (obj, data);
accessible = GTK_LABEL_ACCESSIBLE (obj); accessible = GTK_LABEL_ACCESSIBLE (obj);
@@ -148,7 +148,7 @@ gtk_label_accessible_notify_gtk (GObject *obj,
g_signal_emit_by_name (atk_obj, "text-selection-changed"); g_signal_emit_by_name (atk_obj, "text-selection-changed");
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_label_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_label_accessible_parent_class)->notify_gtk (obj, pspec);
} }
static void static void
@@ -158,7 +158,7 @@ gtk_label_accessible_finalize (GObject *object)
g_free (accessible->priv->text); g_free (accessible->priv->text);
G_OBJECT_CLASS (_gtk_label_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_label_accessible_parent_class)->finalize (object);
} }
@@ -174,7 +174,7 @@ gtk_label_accessible_ref_state_set (AtkObject *accessible)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
state_set = ATK_OBJECT_CLASS (_gtk_label_accessible_parent_class)->ref_state_set (accessible); state_set = ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->ref_state_set (accessible);
atk_state_set_add_state (state_set, ATK_STATE_MULTI_LINE); atk_state_set_add_state (state_set, ATK_STATE_MULTI_LINE);
return state_set; return state_set;
@@ -192,7 +192,7 @@ gtk_label_accessible_ref_relation_set (AtkObject *obj)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
relation_set = ATK_OBJECT_CLASS (_gtk_label_accessible_parent_class)->ref_relation_set (obj); relation_set = ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->ref_relation_set (obj);
if (!atk_relation_set_contains (relation_set, ATK_RELATION_LABEL_FOR)) if (!atk_relation_set_contains (relation_set, ATK_RELATION_LABEL_FOR))
{ {
@@ -251,7 +251,7 @@ gtk_label_accessible_get_name (AtkObject *accessible)
g_return_val_if_fail (GTK_IS_LABEL_ACCESSIBLE (accessible), NULL); g_return_val_if_fail (GTK_IS_LABEL_ACCESSIBLE (accessible), NULL);
name = ATK_OBJECT_CLASS (_gtk_label_accessible_parent_class)->get_name (accessible); name = ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->get_name (accessible);
if (name != NULL) if (name != NULL)
return name; return name;
else else
@@ -272,7 +272,7 @@ gtk_label_accessible_get_name (AtkObject *accessible)
} }
static void static void
_gtk_label_accessible_class_init (GtkLabelAccessibleClass *klass) gtk_label_accessible_class_init (GtkLabelAccessibleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_LABEL_ACCESSIBLE_H__ #ifndef __GTK_LABEL_ACCESSIBLE_H__
#define __GTK_LABEL_ACCESSIBLE_H__ #define __GTK_LABEL_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h" #include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_LABEL_ACCESSIBLE (_gtk_label_accessible_get_type ()) #define GTK_TYPE_LABEL_ACCESSIBLE (gtk_label_accessible_get_type ())
#define GTK_LABEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LABEL_ACCESSIBLE, GtkLabelAccessible)) #define GTK_LABEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LABEL_ACCESSIBLE, GtkLabelAccessible))
#define GTK_LABEL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LABEL_ACCESSIBLE, GtkLabelAccessibleClass)) #define GTK_LABEL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LABEL_ACCESSIBLE, GtkLabelAccessibleClass))
#define GTK_IS_LABEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LABEL_ACCESSIBLE)) #define GTK_IS_LABEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LABEL_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkLabelAccessibleClass
GtkWidgetAccessibleClass parent_class; GtkWidgetAccessibleClass parent_class;
}; };
GType _gtk_label_accessible_get_type (void); GType gtk_label_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2011 Red Hat, Inc. * Copyright 2011 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -197,11 +197,11 @@ gtk_link_button_accessible_get_hyperlink (AtkHyperlinkImpl *impl)
static void atk_hypertext_impl_interface_init (AtkHyperlinkImplIface *iface); static void atk_hypertext_impl_interface_init (AtkHyperlinkImplIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkLinkButtonAccessible, _gtk_link_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkLinkButtonAccessible, gtk_link_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_HYPERLINK_IMPL, atk_hypertext_impl_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_HYPERLINK_IMPL, atk_hypertext_impl_interface_init))
static void static void
_gtk_link_button_accessible_init (GtkLinkButtonAccessible *button) gtk_link_button_accessible_init (GtkLinkButtonAccessible *button)
{ {
button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button, button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button,
GTK_TYPE_LINK_BUTTON_ACCESSIBLE, GTK_TYPE_LINK_BUTTON_ACCESSIBLE,
@@ -216,11 +216,11 @@ gtk_link_button_accessible_finalize (GObject *object)
if (button->priv->link) if (button->priv->link)
g_object_unref (button->priv->link); g_object_unref (button->priv->link);
G_OBJECT_CLASS (_gtk_link_button_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_link_button_accessible_parent_class)->finalize (object);
} }
static void static void
_gtk_link_button_accessible_class_init (GtkLinkButtonAccessibleClass *klass) gtk_link_button_accessible_class_init (GtkLinkButtonAccessibleClass *klass)
{ {
G_OBJECT_CLASS (klass)->finalize = gtk_link_button_accessible_finalize; G_OBJECT_CLASS (klass)->finalize = gtk_link_button_accessible_finalize;

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2011 Red Hat, Inc. * Copyright 2011 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_LINK_BUTTON_ACCESSIBLE_H__ #ifndef __GTK_LINK_BUTTON_ACCESSIBLE_H__
#define __GTK_LINK_BUTTON_ACCESSIBLE_H__ #define __GTK_LINK_BUTTON_ACCESSIBLE_H__
#include "gtkbuttonaccessible.h" #include <gtk/a11y/gtkbuttonaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_LINK_BUTTON_ACCESSIBLE (_gtk_link_button_accessible_get_type ()) #define GTK_TYPE_LINK_BUTTON_ACCESSIBLE (gtk_link_button_accessible_get_type ())
#define GTK_LINK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LINK_BUTTON_ACCESSIBLE, GtkLinkButtonAccessible)) #define GTK_LINK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LINK_BUTTON_ACCESSIBLE, GtkLinkButtonAccessible))
#define GTK_LINK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LINK_BUTTON_ACCESSIBLE, GtkLinkButtonAccessibleClass)) #define GTK_LINK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LINK_BUTTON_ACCESSIBLE, GtkLinkButtonAccessibleClass))
#define GTK_IS_LINK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LINK_BUTTON_ACCESSIBLE)) #define GTK_IS_LINK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LINK_BUTTON_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkLinkButtonAccessibleClass
GtkButtonAccessibleClass parent_class; GtkButtonAccessibleClass parent_class;
}; };
GType _gtk_link_button_accessible_get_type (void); GType gtk_link_button_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -17,12 +17,12 @@
#include "config.h" #include "config.h"
#include "gtklockbuttonaccessible.h" #include "gtklockbuttonaccessibleprivate.h"
#include "gtk/gtklockbuttonprivate.h" #include "gtk/gtklockbuttonprivate.h"
#include "gtk/gtkwidgetprivate.h" #include "gtk/gtkwidgetprivate.h"
G_DEFINE_TYPE (GtkLockButtonAccessible, _gtk_lock_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE) G_DEFINE_TYPE (GtkLockButtonAccessible, gtk_lock_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE)
static const gchar * static const gchar *
gtk_lock_button_accessible_get_name (AtkObject *obj) gtk_lock_button_accessible_get_name (AtkObject *obj)
@@ -37,7 +37,7 @@ gtk_lock_button_accessible_get_name (AtkObject *obj)
} }
static void static void
_gtk_lock_button_accessible_class_init (GtkLockButtonAccessibleClass *klass) gtk_lock_button_accessible_class_init (GtkLockButtonAccessibleClass *klass)
{ {
AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
@@ -45,7 +45,7 @@ _gtk_lock_button_accessible_class_init (GtkLockButtonAccessibleClass *klass)
} }
static void static void
_gtk_lock_button_accessible_init (GtkLockButtonAccessible *lockbutton) gtk_lock_button_accessible_init (GtkLockButtonAccessible *lockbutton)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,15 +15,19 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_LOCK_BUTTON_ACCESSIBLE_H__ #ifndef __GTK_LOCK_BUTTON_ACCESSIBLE_H__
#define __GTK_LOCK_BUTTON_ACCESSIBLE_H__ #define __GTK_LOCK_BUTTON_ACCESSIBLE_H__
#include "gtkbuttonaccessible.h" #include <gtk/gtklockbutton.h>
#include "gtk/gtklockbutton.h" #include <gtk/a11y/gtkbuttonaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_LOCK_BUTTON_ACCESSIBLE (_gtk_lock_button_accessible_get_type ()) #define GTK_TYPE_LOCK_BUTTON_ACCESSIBLE (gtk_lock_button_accessible_get_type ())
#define GTK_LOCK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LOCK_BUTTON_ACCESSIBLE, GtkLockButtonAccessible)) #define GTK_LOCK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LOCK_BUTTON_ACCESSIBLE, GtkLockButtonAccessible))
#define GTK_LOCK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LOCK_BUTTON_ACCESSIBLE, GtkLockButtonAccessibleClass)) #define GTK_LOCK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LOCK_BUTTON_ACCESSIBLE, GtkLockButtonAccessibleClass))
#define GTK_IS_LOCK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LOCK_BUTTON_ACCESSIBLE)) #define GTK_IS_LOCK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LOCK_BUTTON_ACCESSIBLE))
@@ -46,10 +50,7 @@ struct _GtkLockButtonAccessibleClass
GtkButtonAccessibleClass parent_class; GtkButtonAccessibleClass parent_class;
}; };
GType _gtk_lock_button_accessible_get_type (void); GType gtk_lock_button_accessible_get_type (void);
void _gtk_lock_button_accessible_name_changed (GtkLockButton *lockbutton);
G_END_DECLS G_END_DECLS

View File

@@ -0,0 +1,29 @@
/* GTK+ - accessibility implementations
* 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, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GTK_LOCK_BUTTON_ACCESSIBLE_PRIVATE_H__
#define __GTK_LOCK_BUTTON_ACCESSIBLE_PRIVATE_H__
#include <gtk/a11y/gtklockbuttonaccessible.h>
G_BEGIN_DECLS
void _gtk_lock_button_accessible_name_changed (GtkLockButton *lockbutton);
G_END_DECLS
#endif /* __GTK_LOCK_BUTTON_ACCESSIBLE_PRIVATE_H__ */

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -18,16 +18,17 @@
#include "config.h" #include "config.h"
#include "gtkmenuaccessible.h" #include "gtkmenuaccessible.h"
#include "gtkwidgetaccessibleprivate.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
G_DEFINE_TYPE (GtkMenuAccessible, _gtk_menu_accessible, GTK_TYPE_MENU_SHELL_ACCESSIBLE) G_DEFINE_TYPE (GtkMenuAccessible, gtk_menu_accessible, GTK_TYPE_MENU_SHELL_ACCESSIBLE)
static void static void
gtk_menu_accessible_initialize (AtkObject *obj, gtk_menu_accessible_initialize (AtkObject *obj,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_menu_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_menu_accessible_parent_class)->initialize (obj, data);
obj->role = ATK_ROLE_MENU; obj->role = ATK_ROLE_MENU;
@@ -79,11 +80,11 @@ gtk_menu_accessible_get_index_in_parent (AtkObject *accessible)
if (gtk_menu_get_attach_widget (GTK_MENU (widget))) if (gtk_menu_get_attach_widget (GTK_MENU (widget)))
return 0; return 0;
return ATK_OBJECT_CLASS (_gtk_menu_accessible_parent_class)->get_index_in_parent (accessible); return ATK_OBJECT_CLASS (gtk_menu_accessible_parent_class)->get_index_in_parent (accessible);
} }
static void static void
_gtk_menu_accessible_class_init (GtkMenuAccessibleClass *klass) gtk_menu_accessible_class_init (GtkMenuAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -93,6 +94,6 @@ _gtk_menu_accessible_class_init (GtkMenuAccessibleClass *klass)
} }
static void static void
_gtk_menu_accessible_init (GtkMenuAccessible *accessible) gtk_menu_accessible_init (GtkMenuAccessible *accessible)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,15 +15,19 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_MENU_ACCESSIBLE_H__ #ifndef __GTK_MENU_ACCESSIBLE_H__
#define __GTK_MENU_ACCESSIBLE_H__ #define __GTK_MENU_ACCESSIBLE_H__
#include "gtkmenu.h" #include <gtk/gtkmenu.h>
#include "gtkmenushellaccessible.h" #include <gtk/a11y/gtkmenushellaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_MENU_ACCESSIBLE (_gtk_menu_accessible_get_type ()) #define GTK_TYPE_MENU_ACCESSIBLE (gtk_menu_accessible_get_type ())
#define GTK_MENU_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ACCESSIBLE, GtkMenuAccessible)) #define GTK_MENU_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ACCESSIBLE, GtkMenuAccessible))
#define GTK_MENU_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ACCESSIBLE, GtkMenuAccessibleClass)) #define GTK_MENU_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ACCESSIBLE, GtkMenuAccessibleClass))
#define GTK_IS_MENU_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_ACCESSIBLE)) #define GTK_IS_MENU_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_ACCESSIBLE))
@@ -46,7 +50,7 @@ struct _GtkMenuAccessibleClass
GtkMenuShellAccessibleClass parent_class; GtkMenuShellAccessibleClass parent_class;
}; };
GType _gtk_menu_accessible_get_type (void); GType gtk_menu_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -18,6 +18,7 @@
#include <string.h> #include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtkmenuitemaccessible.h" #include "gtkmenuitemaccessible.h"
#include "gtkwidgetaccessibleprivate.h"
#include "gtk/gtkmenuitemprivate.h" #include "gtk/gtkmenuitemprivate.h"
struct _GtkMenuItemAccessiblePrivate struct _GtkMenuItemAccessiblePrivate
@@ -41,7 +42,7 @@ static gint menu_item_remove_gtk (GtkContainer *container,
static void atk_action_interface_init (AtkActionIface *iface); static void atk_action_interface_init (AtkActionIface *iface);
static void atk_selection_interface_init (AtkSelectionIface *iface); static void atk_selection_interface_init (AtkSelectionIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkMenuItemAccessible, _gtk_menu_item_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkMenuItemAccessible, gtk_menu_item_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init); G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init);
G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
@@ -53,7 +54,7 @@ gtk_menu_item_accessible_initialize (AtkObject *obj,
GtkWidget *parent; GtkWidget *parent;
GtkWidget *menu; GtkWidget *menu;
ATK_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->initialize (obj, data);
g_signal_connect (data, "select", G_CALLBACK (menu_item_select), NULL); g_signal_connect (data, "select", G_CALLBACK (menu_item_select), NULL);
g_signal_connect (data, "deselect", G_CALLBACK (menu_item_deselect), NULL); g_signal_connect (data, "deselect", G_CALLBACK (menu_item_deselect), NULL);
@@ -145,7 +146,7 @@ gtk_menu_item_accessible_ref_state_set (AtkObject *obj)
AtkObject *menu_item; AtkObject *menu_item;
AtkStateSet *state_set, *parent_state_set; AtkStateSet *state_set, *parent_state_set;
state_set = ATK_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->ref_state_set (obj); state_set = ATK_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->ref_state_set (obj);
menu_item = atk_object_get_parent (obj); menu_item = atk_object_get_parent (obj);
@@ -176,7 +177,7 @@ gtk_menu_item_accessible_get_role (AtkObject *obj)
gtk_menu_item_get_submenu (GTK_MENU_ITEM (widget))) gtk_menu_item_get_submenu (GTK_MENU_ITEM (widget)))
return ATK_ROLE_MENU; return ATK_ROLE_MENU;
return ATK_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->get_role (obj); return ATK_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->get_role (obj);
} }
static const gchar * static const gchar *
@@ -191,7 +192,7 @@ gtk_menu_item_accessible_get_name (AtkObject *obj)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
name = ATK_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->get_name (obj); name = ATK_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->get_name (obj);
if (name) if (name)
return name; return name;
@@ -211,7 +212,7 @@ gtk_menu_item_accessible_finalize (GObject *object)
g_free (accessible->priv->text); g_free (accessible->priv->text);
G_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->finalize (object);
} }
static void static void
@@ -229,11 +230,11 @@ gtk_menu_item_accessible_notify_gtk (GObject *obj,
g_signal_emit_by_name (atk_obj, "visible-data-changed"); g_signal_emit_by_name (atk_obj, "visible-data-changed");
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_menu_item_accessible_parent_class)->notify_gtk (obj, pspec);
} }
static void static void
_gtk_menu_item_accessible_class_init (GtkMenuItemAccessibleClass *klass) gtk_menu_item_accessible_class_init (GtkMenuItemAccessibleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -254,7 +255,7 @@ _gtk_menu_item_accessible_class_init (GtkMenuItemAccessibleClass *klass)
} }
static void static void
_gtk_menu_item_accessible_init (GtkMenuItemAccessible *menu_item) gtk_menu_item_accessible_init (GtkMenuItemAccessible *menu_item)
{ {
menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (menu_item, menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (menu_item,
GTK_TYPE_MENU_ITEM_ACCESSIBLE, GTK_TYPE_MENU_ITEM_ACCESSIBLE,
@@ -827,7 +828,7 @@ menu_item_add_gtk (GtkContainer *container,
parent_widget = gtk_menu_get_attach_widget (GTK_MENU (container)); parent_widget = gtk_menu_get_attach_widget (GTK_MENU (container));
if (GTK_IS_MENU_ITEM (parent_widget)) if (GTK_IS_MENU_ITEM (parent_widget))
{ {
GTK_CONTAINER_ACCESSIBLE_CLASS (_gtk_menu_item_accessible_parent_class)->add_gtk (container, widget, gtk_widget_get_accessible (parent_widget)); GTK_CONTAINER_ACCESSIBLE_CLASS (gtk_menu_item_accessible_parent_class)->add_gtk (container, widget, gtk_widget_get_accessible (parent_widget));
} }
return 1; return 1;
@@ -844,7 +845,7 @@ menu_item_remove_gtk (GtkContainer *container,
parent_widget = gtk_menu_get_attach_widget (GTK_MENU (container)); parent_widget = gtk_menu_get_attach_widget (GTK_MENU (container));
if (GTK_IS_MENU_ITEM (parent_widget)) if (GTK_IS_MENU_ITEM (parent_widget))
{ {
GTK_CONTAINER_ACCESSIBLE_CLASS (_gtk_menu_item_accessible_parent_class)->remove_gtk (container, widget, gtk_widget_get_accessible (parent_widget)); GTK_CONTAINER_ACCESSIBLE_CLASS (gtk_menu_item_accessible_parent_class)->remove_gtk (container, widget, gtk_widget_get_accessible (parent_widget));
} }
return 1; return 1;
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_MENU_ITEM_ACCESSIBLE_H__ #ifndef __GTK_MENU_ITEM_ACCESSIBLE_H__
#define __GTK_MENU_ITEM_ACCESSIBLE_H__ #define __GTK_MENU_ITEM_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h" #include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_MENU_ITEM_ACCESSIBLE (_gtk_menu_item_accessible_get_type ()) #define GTK_TYPE_MENU_ITEM_ACCESSIBLE (gtk_menu_item_accessible_get_type ())
#define GTK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ITEM_ACCESSIBLE, GtkMenuItemAccessible)) #define GTK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ITEM_ACCESSIBLE, GtkMenuItemAccessible))
#define GTK_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ITEM_ACCESSIBLE, GtkMenuItemAccessibleClass)) #define GTK_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ITEM_ACCESSIBLE, GtkMenuItemAccessibleClass))
#define GTK_IS_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_ITEM_ACCESSIBLE)) #define GTK_IS_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_ITEM_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkMenuItemAccessibleClass
GtkContainerAccessibleClass parent_class; GtkContainerAccessibleClass parent_class;
}; };
GType _gtk_menu_item_accessible_get_type (void); GType gtk_menu_item_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -23,20 +23,20 @@
static void atk_selection_interface_init (AtkSelectionIface *iface); static void atk_selection_interface_init (AtkSelectionIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkMenuShellAccessible, _gtk_menu_shell_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkMenuShellAccessible, gtk_menu_shell_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
static void static void
gtk_menu_shell_accessible_initialize (AtkObject *accessible, gtk_menu_shell_accessible_initialize (AtkObject *accessible,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_menu_shell_accessible_parent_class)->initialize (accessible, data); ATK_OBJECT_CLASS (gtk_menu_shell_accessible_parent_class)->initialize (accessible, data);
accessible->role = ATK_ROLE_UNKNOWN; accessible->role = ATK_ROLE_UNKNOWN;
} }
static void static void
_gtk_menu_shell_accessible_class_init (GtkMenuShellAccessibleClass *klass) gtk_menu_shell_accessible_class_init (GtkMenuShellAccessibleClass *klass)
{ {
AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
@@ -44,7 +44,7 @@ _gtk_menu_shell_accessible_class_init (GtkMenuShellAccessibleClass *klass)
} }
static void static void
_gtk_menu_shell_accessible_init (GtkMenuShellAccessible *menu_shell) gtk_menu_shell_accessible_init (GtkMenuShellAccessible *menu_shell)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_MENU_SHELL_ACCESSIBLE_H__ #ifndef __GTK_MENU_SHELL_ACCESSIBLE_H__
#define __GTK_MENU_SHELL_ACCESSIBLE_H__ #define __GTK_MENU_SHELL_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h" #include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_MENU_SHELL_ACCESSIBLE (_gtk_menu_shell_accessible_get_type ()) #define GTK_TYPE_MENU_SHELL_ACCESSIBLE (gtk_menu_shell_accessible_get_type ())
#define GTK_MENU_SHELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_SHELL_ACCESSIBLE, GtkMenuShellAccessible)) #define GTK_MENU_SHELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_SHELL_ACCESSIBLE, GtkMenuShellAccessible))
#define GTK_MENU_SHELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_SHELL_ACCESSIBLE, GtkMenuShellAccessibleClass)) #define GTK_MENU_SHELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_SHELL_ACCESSIBLE, GtkMenuShellAccessibleClass))
#define GTK_IS_MENU_SHELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_SHELL_ACCESSIBLE)) #define GTK_IS_MENU_SHELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_SHELL_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkMenuShellAccessibleClass
GtkContainerAccessibleClass parent_class; GtkContainerAccessibleClass parent_class;
}; };
GType _gtk_menu_shell_accessible_get_type (void); GType gtk_menu_shell_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@ struct _GtkNotebookAccessiblePrivate
static void atk_selection_interface_init (AtkSelectionIface *iface); static void atk_selection_interface_init (AtkSelectionIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkNotebookAccessible, _gtk_notebook_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkNotebookAccessible, gtk_notebook_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
static gboolean static gboolean
@@ -105,7 +105,7 @@ create_notebook_page_accessible (GtkNotebookAccessible *accessible,
{ {
AtkObject *obj; AtkObject *obj;
obj = _gtk_notebook_page_accessible_new (accessible, child); obj = gtk_notebook_page_accessible_new (accessible, child);
g_hash_table_insert (accessible->priv->pages, child, obj); g_hash_table_insert (accessible->priv->pages, child, obj);
atk_object_set_parent (obj, ATK_OBJECT (accessible)); atk_object_set_parent (obj, ATK_OBJECT (accessible));
g_signal_emit_by_name (accessible, "children-changed::add", page_num, obj, NULL); g_signal_emit_by_name (accessible, "children-changed::add", page_num, obj, NULL);
@@ -140,7 +140,7 @@ page_removed_cb (GtkNotebook *notebook,
g_return_if_fail (obj); g_return_if_fail (obj);
g_signal_emit_by_name (accessible, "children-changed::remove", g_signal_emit_by_name (accessible, "children-changed::remove",
page_num, obj, NULL); page_num, obj, NULL);
_gtk_notebook_page_accessible_invalidate (GTK_NOTEBOOK_PAGE_ACCESSIBLE (obj)); gtk_notebook_page_accessible_invalidate (GTK_NOTEBOOK_PAGE_ACCESSIBLE (obj));
g_hash_table_remove (accessible->priv->pages, widget); g_hash_table_remove (accessible->priv->pages, widget);
} }
@@ -153,7 +153,7 @@ gtk_notebook_accessible_initialize (AtkObject *obj,
GtkNotebook *notebook; GtkNotebook *notebook;
gint i; gint i;
ATK_OBJECT_CLASS (_gtk_notebook_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_notebook_accessible_parent_class)->initialize (obj, data);
accessible = GTK_NOTEBOOK_ACCESSIBLE (obj); accessible = GTK_NOTEBOOK_ACCESSIBLE (obj);
notebook = GTK_NOTEBOOK (data); notebook = GTK_NOTEBOOK (data);
@@ -186,7 +186,7 @@ gtk_notebook_accessible_finalize (GObject *object)
if (accessible->priv->idle_focus_id) if (accessible->priv->idle_focus_id)
g_source_remove (accessible->priv->idle_focus_id); g_source_remove (accessible->priv->idle_focus_id);
G_OBJECT_CLASS (_gtk_notebook_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_notebook_accessible_parent_class)->finalize (object);
} }
static AtkObject * static AtkObject *
@@ -280,7 +280,7 @@ gtk_notebook_accessible_notify_gtk (GObject *obj,
} }
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_notebook_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_notebook_accessible_parent_class)->notify_gtk (obj, pspec);
} }
/* /*
@@ -305,7 +305,7 @@ gtk_notebook_accessible_add_selection (AtkSelection *selection,
} }
static void static void
_gtk_notebook_accessible_class_init (GtkNotebookAccessibleClass *klass) gtk_notebook_accessible_class_init (GtkNotebookAccessibleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -327,7 +327,7 @@ _gtk_notebook_accessible_class_init (GtkNotebookAccessibleClass *klass)
} }
static void static void
_gtk_notebook_accessible_init (GtkNotebookAccessible *notebook) gtk_notebook_accessible_init (GtkNotebookAccessible *notebook)
{ {
notebook->priv = G_TYPE_INSTANCE_GET_PRIVATE (notebook, notebook->priv = G_TYPE_INSTANCE_GET_PRIVATE (notebook,
GTK_TYPE_NOTEBOOK_ACCESSIBLE, GTK_TYPE_NOTEBOOK_ACCESSIBLE,

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_NOTEBOOK_ACCESSIBLE_H__ #ifndef __GTK_NOTEBOOK_ACCESSIBLE_H__
#define __GTK_NOTEBOOK_ACCESSIBLE_H__ #define __GTK_NOTEBOOK_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h" #include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_NOTEBOOK_ACCESSIBLE (_gtk_notebook_accessible_get_type ()) #define GTK_TYPE_NOTEBOOK_ACCESSIBLE (gtk_notebook_accessible_get_type ())
#define GTK_NOTEBOOK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_NOTEBOOK_ACCESSIBLE, GtkNotebookAccessible)) #define GTK_NOTEBOOK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_NOTEBOOK_ACCESSIBLE, GtkNotebookAccessible))
#define GTK_NOTEBOOK_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_NOTEBOOK_ACCESSIBLE, GtkNotebookAccessibleClass)) #define GTK_NOTEBOOK_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_NOTEBOOK_ACCESSIBLE, GtkNotebookAccessibleClass))
#define GTK_IS_NOTEBOOK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_NOTEBOOK_ACCESSIBLE)) #define GTK_IS_NOTEBOOK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_NOTEBOOK_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkNotebookAccessibleClass
GtkContainerAccessibleClass parent_class; GtkContainerAccessibleClass parent_class;
}; };
GType _gtk_notebook_accessible_get_type (void); GType gtk_notebook_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ struct _GtkNotebookPageAccessiblePrivate
static void atk_component_interface_init (AtkComponentIface *iface); static void atk_component_interface_init (AtkComponentIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkNotebookPageAccessible, _gtk_notebook_page_accessible, ATK_TYPE_OBJECT, G_DEFINE_TYPE_WITH_CODE (GtkNotebookPageAccessible, gtk_notebook_page_accessible, ATK_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
@@ -144,7 +144,7 @@ gtk_notebook_page_accessible_ref_state_set (AtkObject *accessible)
AtkObject *atk_label; AtkObject *atk_label;
GtkWidget *label; GtkWidget *label;
state_set = ATK_OBJECT_CLASS (_gtk_notebook_page_accessible_parent_class)->ref_state_set (accessible); state_set = ATK_OBJECT_CLASS (gtk_notebook_page_accessible_parent_class)->ref_state_set (accessible);
label = get_label_from_notebook_page (GTK_NOTEBOOK_PAGE_ACCESSIBLE (accessible)); label = get_label_from_notebook_page (GTK_NOTEBOOK_PAGE_ACCESSIBLE (accessible));
if (label) if (label)
@@ -194,7 +194,7 @@ gtk_notebook_page_accessible_get_index_in_parent (AtkObject *accessible)
} }
static void static void
_gtk_notebook_page_accessible_class_init (GtkNotebookPageAccessibleClass *klass) gtk_notebook_page_accessible_class_init (GtkNotebookPageAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -209,7 +209,7 @@ _gtk_notebook_page_accessible_class_init (GtkNotebookPageAccessibleClass *klass)
} }
static void static void
_gtk_notebook_page_accessible_init (GtkNotebookPageAccessible *page) gtk_notebook_page_accessible_init (GtkNotebookPageAccessible *page)
{ {
page->priv = G_TYPE_INSTANCE_GET_PRIVATE (page, page->priv = G_TYPE_INSTANCE_GET_PRIVATE (page,
GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE, GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE,
@@ -227,8 +227,8 @@ notify_tab_label (GObject *object,
} }
AtkObject * AtkObject *
_gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook, gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook,
GtkWidget *child) GtkWidget *child)
{ {
GObject *object; GObject *object;
AtkObject *atk_object; AtkObject *atk_object;
@@ -257,7 +257,7 @@ _gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook,
} }
void void
_gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page) gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page)
{ {
AtkObject *obj = ATK_OBJECT (page); AtkObject *obj = ATK_OBJECT (page);
GtkWidget *notebook; GtkWidget *notebook;

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_NOTEBOOK_PAGE_ACCESSIBLE_H__ #ifndef __GTK_NOTEBOOK_PAGE_ACCESSIBLE_H__
#define __GTK_NOTEBOOK_PAGE_ACCESSIBLE_H__ #define __GTK_NOTEBOOK_PAGE_ACCESSIBLE_H__
#include "gtknotebookaccessible.h" #include <gtk/a11y/gtknotebookaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE (_gtk_notebook_page_accessible_get_type ()) #define GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE (gtk_notebook_page_accessible_get_type ())
#define GTK_NOTEBOOK_PAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE, GtkNotebookPageAccessible)) #define GTK_NOTEBOOK_PAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE, GtkNotebookPageAccessible))
#define GTK_NOTEBOOK_PAGE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE, GtkNotebookPageAccessibleClass)) #define GTK_NOTEBOOK_PAGE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE, GtkNotebookPageAccessibleClass))
#define GTK_IS_NOTEBOOK_PAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE)) #define GTK_IS_NOTEBOOK_PAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE))
@@ -45,12 +49,12 @@ struct _GtkNotebookPageAccessibleClass
AtkObjectClass parent_class; AtkObjectClass parent_class;
}; };
GType _gtk_notebook_page_accessible_get_type (void); GType gtk_notebook_page_accessible_get_type (void);
AtkObject *_gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook, AtkObject *gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook,
GtkWidget *child); GtkWidget *child);
void _gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page); void gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
static void atk_value_interface_init (AtkValueIface *iface); static void atk_value_interface_init (AtkValueIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkPanedAccessible, _gtk_paned_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkPanedAccessible, gtk_paned_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
static void static void
@@ -39,7 +39,7 @@ static void
gtk_paned_accessible_initialize (AtkObject *obj, gtk_paned_accessible_initialize (AtkObject *obj,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_paned_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_paned_accessible_parent_class)->initialize (obj, data);
g_signal_connect (data, "size-allocate", g_signal_connect (data, "size-allocate",
G_CALLBACK (gtk_paned_accessible_size_allocate_gtk), NULL); G_CALLBACK (gtk_paned_accessible_size_allocate_gtk), NULL);
@@ -48,7 +48,7 @@ gtk_paned_accessible_initialize (AtkObject *obj,
} }
static void static void
_gtk_paned_accessible_class_init (GtkPanedAccessibleClass *klass) gtk_paned_accessible_class_init (GtkPanedAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -56,7 +56,7 @@ _gtk_paned_accessible_class_init (GtkPanedAccessibleClass *klass)
} }
static void static void
_gtk_paned_accessible_init (GtkPanedAccessible *paned) gtk_paned_accessible_init (GtkPanedAccessible *paned)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_PANED_ACCESSIBLE_H__ #ifndef __GTK_PANED_ACCESSIBLE_H__
#define __GTK_PANED_ACCESSIBLE_H__ #define __GTK_PANED_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h" #include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_PANED_ACCESSIBLE (_gtk_paned_accessible_get_type ()) #define GTK_TYPE_PANED_ACCESSIBLE (gtk_paned_accessible_get_type ())
#define GTK_PANED_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PANED_ACCESSIBLE, GtkPanedAccessible)) #define GTK_PANED_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PANED_ACCESSIBLE, GtkPanedAccessible))
#define GTK_PANED_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PANED_ACCESSIBLE, GtkPanedAccessibleClass)) #define GTK_PANED_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PANED_ACCESSIBLE, GtkPanedAccessibleClass))
#define GTK_IS_PANED_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PANED_ACCESSIBLE)) #define GTK_IS_PANED_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PANED_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkPanedAccessibleClass
GtkContainerAccessibleClass parent_class; GtkContainerAccessibleClass parent_class;
}; };
GType _gtk_paned_accessible_get_type (void); GType gtk_paned_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -26,14 +26,14 @@
static void atk_value_interface_init (AtkValueIface *iface); static void atk_value_interface_init (AtkValueIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkProgressBarAccessible, _gtk_progress_bar_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkProgressBarAccessible, gtk_progress_bar_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
static void static void
gtk_progress_bar_accessible_initialize (AtkObject *obj, gtk_progress_bar_accessible_initialize (AtkObject *obj,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_progress_bar_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_progress_bar_accessible_parent_class)->initialize (obj, data);
obj->role = ATK_ROLE_PROGRESS_BAR; obj->role = ATK_ROLE_PROGRESS_BAR;
} }
@@ -50,11 +50,11 @@ gtk_progress_bar_accessible_notify_gtk (GObject *obj,
if (strcmp (pspec->name, "fraction") == 0) if (strcmp (pspec->name, "fraction") == 0)
g_object_notify (G_OBJECT (accessible), "accessible-value"); g_object_notify (G_OBJECT (accessible), "accessible-value");
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_progress_bar_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_progress_bar_accessible_parent_class)->notify_gtk (obj, pspec);
} }
static void static void
_gtk_progress_bar_accessible_class_init (GtkProgressBarAccessibleClass *klass) gtk_progress_bar_accessible_class_init (GtkProgressBarAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;
@@ -65,7 +65,7 @@ _gtk_progress_bar_accessible_class_init (GtkProgressBarAccessibleClass *klass)
} }
static void static void
_gtk_progress_bar_accessible_init (GtkProgressBarAccessible *bar) gtk_progress_bar_accessible_init (GtkProgressBarAccessible *bar)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_PROGRESS_BAR_ACCESSIBLE_H__ #ifndef __GTK_PROGRESS_BAR_ACCESSIBLE_H__
#define __GTK_PROGRESS_BAR_ACCESSIBLE_H__ #define __GTK_PROGRESS_BAR_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h" #include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_PROGRESS_BAR_ACCESSIBLE (_gtk_progress_bar_accessible_get_type ()) #define GTK_TYPE_PROGRESS_BAR_ACCESSIBLE (gtk_progress_bar_accessible_get_type ())
#define GTK_PROGRESS_BAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS_BAR_ACCESSIBLE, GtkProgressBarAccessible)) #define GTK_PROGRESS_BAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS_BAR_ACCESSIBLE, GtkProgressBarAccessible))
#define GTK_PROGRESS_BAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS_BAR_ACCESSIBLE, GtkProgressBarAccessibleClass)) #define GTK_PROGRESS_BAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS_BAR_ACCESSIBLE, GtkProgressBarAccessibleClass))
#define GTK_IS_PROGRESS_BAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PROGRESS_BAR_ACCESSIBLE)) #define GTK_IS_PROGRESS_BAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PROGRESS_BAR_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkProgressBarAccessibleClass
GtkWidgetAccessibleClass parent_class; GtkWidgetAccessibleClass parent_class;
}; };
GType _gtk_progress_bar_accessible_get_type (void); GType gtk_progress_bar_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -26,13 +26,13 @@ struct _GtkRadioButtonAccessiblePrivate
}; };
G_DEFINE_TYPE (GtkRadioButtonAccessible, _gtk_radio_button_accessible, GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE) G_DEFINE_TYPE (GtkRadioButtonAccessible, gtk_radio_button_accessible, GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE)
static void static void
gtk_radio_button_accessible_initialize (AtkObject *accessible, gtk_radio_button_accessible_initialize (AtkObject *accessible,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_radio_button_accessible_parent_class)->initialize (accessible, data); ATK_OBJECT_CLASS (gtk_radio_button_accessible_parent_class)->initialize (accessible, data);
accessible->role = ATK_ROLE_RADIO_BUTTON; accessible->role = ATK_ROLE_RADIO_BUTTON;
} }
@@ -51,7 +51,7 @@ gtk_radio_button_accessible_ref_relation_set (AtkObject *obj)
radio_button = GTK_RADIO_BUTTON_ACCESSIBLE (obj); radio_button = GTK_RADIO_BUTTON_ACCESSIBLE (obj);
relation_set = ATK_OBJECT_CLASS (_gtk_radio_button_accessible_parent_class)->ref_relation_set (obj); relation_set = ATK_OBJECT_CLASS (gtk_radio_button_accessible_parent_class)->ref_relation_set (obj);
/* If the radio button'group has changed remove the relation */ /* If the radio button'group has changed remove the relation */
list = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget)); list = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget));
@@ -103,7 +103,7 @@ gtk_radio_button_accessible_ref_relation_set (AtkObject *obj)
} }
static void static void
_gtk_radio_button_accessible_class_init (GtkRadioButtonAccessibleClass *klass) gtk_radio_button_accessible_class_init (GtkRadioButtonAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -114,7 +114,7 @@ _gtk_radio_button_accessible_class_init (GtkRadioButtonAccessibleClass *klass)
} }
static void static void
_gtk_radio_button_accessible_init (GtkRadioButtonAccessible *radio_button) gtk_radio_button_accessible_init (GtkRadioButtonAccessible *radio_button)
{ {
radio_button->priv = G_TYPE_INSTANCE_GET_PRIVATE (radio_button, radio_button->priv = G_TYPE_INSTANCE_GET_PRIVATE (radio_button,
GTK_TYPE_RADIO_BUTTON_ACCESSIBLE, GTK_TYPE_RADIO_BUTTON_ACCESSIBLE,

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_RADIO_BUTTON_ACCESSIBLE_H__ #ifndef __GTK_RADIO_BUTTON_ACCESSIBLE_H__
#define __GTK_RADIO_BUTTON_ACCESSIBLE_H__ #define __GTK_RADIO_BUTTON_ACCESSIBLE_H__
#include "gtktogglebuttonaccessible.h" #include <gtk/a11y/gtktogglebuttonaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_RADIO_BUTTON_ACCESSIBLE (_gtk_radio_button_accessible_get_type ()) #define GTK_TYPE_RADIO_BUTTON_ACCESSIBLE (gtk_radio_button_accessible_get_type ())
#define GTK_RADIO_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_BUTTON_ACCESSIBLE, GtkRadioButtonAccessible)) #define GTK_RADIO_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_BUTTON_ACCESSIBLE, GtkRadioButtonAccessible))
#define GTK_RADIO_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_BUTTON_ACCESSIBLE, GtkRadioButtonAccessibleClass)) #define GTK_RADIO_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_BUTTON_ACCESSIBLE, GtkRadioButtonAccessibleClass))
#define GTK_IS_RADIO_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_BUTTON_ACCESSIBLE)) #define GTK_IS_RADIO_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_BUTTON_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkRadioButtonAccessibleClass
GtkToggleButtonAccessibleClass parent_class; GtkToggleButtonAccessibleClass parent_class;
}; };
GType _gtk_radio_button_accessible_get_type (void); GType gtk_radio_button_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2002 Sun Microsystems Inc. * Copyright 2002 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@ struct _GtkRadioMenuItemAccessiblePrivate
GSList *old_group; GSList *old_group;
}; };
G_DEFINE_TYPE (GtkRadioMenuItemAccessible, _gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE) G_DEFINE_TYPE (GtkRadioMenuItemAccessible, gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE)
static AtkRelationSet * static AtkRelationSet *
@@ -42,7 +42,7 @@ gtk_radio_menu_item_accessible_ref_relation_set (AtkObject *obj)
radio_menu_item = GTK_RADIO_MENU_ITEM_ACCESSIBLE (obj); radio_menu_item = GTK_RADIO_MENU_ITEM_ACCESSIBLE (obj);
relation_set = ATK_OBJECT_CLASS (_gtk_radio_menu_item_accessible_parent_class)->ref_relation_set (obj); relation_set = ATK_OBJECT_CLASS (gtk_radio_menu_item_accessible_parent_class)->ref_relation_set (obj);
/* If the radio menu_item's group has changed remove the relation */ /* If the radio menu_item's group has changed remove the relation */
list = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (widget)); list = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (widget));
@@ -94,13 +94,13 @@ static void
gtk_radio_menu_item_accessible_initialize (AtkObject *obj, gtk_radio_menu_item_accessible_initialize (AtkObject *obj,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_radio_menu_item_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_radio_menu_item_accessible_parent_class)->initialize (obj, data);
obj->role = ATK_ROLE_RADIO_MENU_ITEM; obj->role = ATK_ROLE_RADIO_MENU_ITEM;
} }
static void static void
_gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *klass) gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -111,7 +111,7 @@ _gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *kla
} }
static void static void
_gtk_radio_menu_item_accessible_init (GtkRadioMenuItemAccessible *radio_menu_item) gtk_radio_menu_item_accessible_init (GtkRadioMenuItemAccessible *radio_menu_item)
{ {
radio_menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (radio_menu_item, radio_menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (radio_menu_item,
GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE,

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2002 Sun Microsystems Inc. * Copyright 2002 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__ #ifndef __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__
#define __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__ #define __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__
#include "gtkcheckmenuitemaccessible.h" #include <gtk/a11y/gtkcheckmenuitemaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE (_gtk_radio_menu_item_accessible_get_type ()) #define GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE (gtk_radio_menu_item_accessible_get_type ())
#define GTK_RADIO_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessible)) #define GTK_RADIO_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessible))
#define GTK_RADIO_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessibleClass)) #define GTK_RADIO_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessibleClass))
#define GTK_IS_RADIO_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE)) #define GTK_IS_RADIO_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkRadioMenuItemAccessibleClass
GtkCheckMenuItemAccessibleClass parent_class; GtkCheckMenuItemAccessibleClass parent_class;
}; };
GType _gtk_radio_menu_item_accessible_get_type (void); GType gtk_radio_menu_item_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
static void atk_action_interface_init (AtkActionIface *iface); static void atk_action_interface_init (AtkActionIface *iface);
static void atk_value_interface_init (AtkValueIface *iface); static void atk_value_interface_init (AtkValueIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkRangeAccessible, _gtk_range_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkRangeAccessible, gtk_range_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
@@ -44,7 +44,7 @@ gtk_range_accessible_initialize (AtkObject *obj,
GtkAdjustment *adj; GtkAdjustment *adj;
GtkRange *gtk_range; GtkRange *gtk_range;
ATK_OBJECT_CLASS (_gtk_range_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_range_accessible_parent_class)->initialize (obj, data);
gtk_range = GTK_RANGE (data); gtk_range = GTK_RANGE (data);
/* /*
@@ -77,7 +77,7 @@ gtk_range_accessible_finalize (GObject *object)
range); range);
} }
G_OBJECT_CLASS (_gtk_range_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_range_accessible_parent_class)->finalize (object);
} }
static void static void
@@ -97,12 +97,12 @@ gtk_range_accessible_notify_gtk (GObject *obj,
range); range);
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_range_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_range_accessible_parent_class)->notify_gtk (obj, pspec);
} }
static void static void
_gtk_range_accessible_class_init (GtkRangeAccessibleClass *klass) gtk_range_accessible_class_init (GtkRangeAccessibleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -116,7 +116,7 @@ _gtk_range_accessible_class_init (GtkRangeAccessibleClass *klass)
} }
static void static void
_gtk_range_accessible_init (GtkRangeAccessible *range) gtk_range_accessible_init (GtkRangeAccessible *range)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_RANGE_ACCESSIBLE_H__ #ifndef __GTK_RANGE_ACCESSIBLE_H__
#define __GTK_RANGE_ACCESSIBLE_H__ #define __GTK_RANGE_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h" #include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_RANGE_ACCESSIBLE (_gtk_range_accessible_get_type ()) #define GTK_TYPE_RANGE_ACCESSIBLE (gtk_range_accessible_get_type ())
#define GTK_RANGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RANGE_ACCESSIBLE, GtkRangeAccessible)) #define GTK_RANGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RANGE_ACCESSIBLE, GtkRangeAccessible))
#define GTK_RANGE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RANGE_ACCESSIBLE, GtkRangeAccessibleClass)) #define GTK_RANGE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RANGE_ACCESSIBLE, GtkRangeAccessibleClass))
#define GTK_IS_RANGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RANGE_ACCESSIBLE)) #define GTK_IS_RANGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RANGE_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkRangeAccessibleClass
GtkWidgetAccessibleClass parent_class; GtkWidgetAccessibleClass parent_class;
}; };
GType _gtk_range_accessible_get_type (void); GType gtk_range_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ enum {
PROP_RENDERER PROP_RENDERER
}; };
G_DEFINE_TYPE (GtkRendererCellAccessible, _gtk_renderer_cell_accessible, GTK_TYPE_CELL_ACCESSIBLE) G_DEFINE_TYPE (GtkRendererCellAccessible, gtk_renderer_cell_accessible, GTK_TYPE_CELL_ACCESSIBLE)
static void static void
gtk_renderer_cell_accessible_set_property (GObject *object, gtk_renderer_cell_accessible_set_property (GObject *object,
@@ -79,11 +79,11 @@ gtk_renderer_cell_accessible_finalize (GObject *object)
if (renderer_cell->priv->renderer) if (renderer_cell->priv->renderer)
g_object_unref (renderer_cell->priv->renderer); g_object_unref (renderer_cell->priv->renderer);
G_OBJECT_CLASS (_gtk_renderer_cell_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_renderer_cell_accessible_parent_class)->finalize (object);
} }
static void static void
_gtk_renderer_cell_accessible_class_init (GtkRendererCellAccessibleClass *klass) gtk_renderer_cell_accessible_class_init (GtkRendererCellAccessibleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
@@ -103,7 +103,7 @@ _gtk_renderer_cell_accessible_class_init (GtkRendererCellAccessibleClass *klass)
} }
static void static void
_gtk_renderer_cell_accessible_init (GtkRendererCellAccessible *renderer_cell) gtk_renderer_cell_accessible_init (GtkRendererCellAccessible *renderer_cell)
{ {
renderer_cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (renderer_cell, renderer_cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (renderer_cell,
GTK_TYPE_RENDERER_CELL_ACCESSIBLE, GTK_TYPE_RENDERER_CELL_ACCESSIBLE,
@@ -111,7 +111,7 @@ _gtk_renderer_cell_accessible_init (GtkRendererCellAccessible *renderer_cell)
} }
AtkObject * AtkObject *
_gtk_renderer_cell_accessible_new (GtkCellRenderer *renderer) gtk_renderer_cell_accessible_new (GtkCellRenderer *renderer)
{ {
AtkObject *object; AtkObject *object;

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,15 +15,19 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_RENDERER_CELL_ACCESSIBLE_H__ #ifndef __GTK_RENDERER_CELL_ACCESSIBLE_H__
#define __GTK_RENDERER_CELL_ACCESSIBLE_H__ #define __GTK_RENDERER_CELL_ACCESSIBLE_H__
#include <atk/atk.h> #include <atk/atk.h>
#include "gtkcellaccessible.h" #include <gtk/a11y/gtkcellaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_RENDERER_CELL_ACCESSIBLE (_gtk_renderer_cell_accessible_get_type ()) #define GTK_TYPE_RENDERER_CELL_ACCESSIBLE (gtk_renderer_cell_accessible_get_type ())
#define GTK_RENDERER_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RENDERER_CELL_ACCESSIBLE, GtkRendererCellAccessible)) #define GTK_RENDERER_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RENDERER_CELL_ACCESSIBLE, GtkRendererCellAccessible))
#define GTK_RENDERER_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RENDERER_CELL_ACCESSIBLE, GtkRendererCellAccessibleClass)) #define GTK_RENDERER_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RENDERER_CELL_ACCESSIBLE, GtkRendererCellAccessibleClass))
#define GTK_IS_RENDERER_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RENDERER_CELL_ACCESSIBLE)) #define GTK_IS_RENDERER_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RENDERER_CELL_ACCESSIBLE))
@@ -46,9 +50,9 @@ struct _GtkRendererCellAccessibleClass
GtkCellAccessibleClass parent_class; GtkCellAccessibleClass parent_class;
}; };
GType _gtk_renderer_cell_accessible_get_type (void); GType gtk_renderer_cell_accessible_get_type (void);
AtkObject *_gtk_renderer_cell_accessible_new (GtkCellRenderer * renderer); AtkObject *gtk_renderer_cell_accessible_new (GtkCellRenderer * renderer);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2004 Sun Microsystems Inc. * Copyright 2004 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtkscaleaccessible.h" #include "gtkscaleaccessible.h"
G_DEFINE_TYPE (GtkScaleAccessible, _gtk_scale_accessible, GTK_TYPE_RANGE_ACCESSIBLE) G_DEFINE_TYPE (GtkScaleAccessible, gtk_scale_accessible, GTK_TYPE_RANGE_ACCESSIBLE)
static const gchar * static const gchar *
gtk_scale_accessible_get_description (AtkObject *object) gtk_scale_accessible_get_description (AtkObject *object)
@@ -36,11 +36,11 @@ gtk_scale_accessible_get_description (AtkObject *object)
if (layout) if (layout)
return pango_layout_get_text (layout); return pango_layout_get_text (layout);
return ATK_OBJECT_CLASS (_gtk_scale_accessible_parent_class)->get_description (object); return ATK_OBJECT_CLASS (gtk_scale_accessible_parent_class)->get_description (object);
} }
static void static void
_gtk_scale_accessible_class_init (GtkScaleAccessibleClass *klass) gtk_scale_accessible_class_init (GtkScaleAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -48,6 +48,6 @@ _gtk_scale_accessible_class_init (GtkScaleAccessibleClass *klass)
} }
static void static void
_gtk_scale_accessible_init (GtkScaleAccessible *scale) gtk_scale_accessible_init (GtkScaleAccessible *scale)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2004 Sun Microsystems Inc. * Copyright 2004 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_SCALE_ACCESSIBLE_H__ #ifndef __GTK_SCALE_ACCESSIBLE_H__
#define __GTK_SCALE_ACCESSIBLE_H__ #define __GTK_SCALE_ACCESSIBLE_H__
#include "gtkrangeaccessible.h" #include <gtk/a11y/gtkrangeaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_SCALE_ACCESSIBLE (_gtk_scale_accessible_get_type ()) #define GTK_TYPE_SCALE_ACCESSIBLE (gtk_scale_accessible_get_type ())
#define GTK_SCALE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_ACCESSIBLE, GtkScaleAccessible)) #define GTK_SCALE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_ACCESSIBLE, GtkScaleAccessible))
#define GTK_SCALE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_ACCESSIBLE, GtkScaleAccessibleClass)) #define GTK_SCALE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_ACCESSIBLE, GtkScaleAccessibleClass))
#define GTK_IS_SCALE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_ACCESSIBLE)) #define GTK_IS_SCALE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkScaleAccessibleClass
GtkRangeAccessibleClass parent_class; GtkRangeAccessibleClass parent_class;
}; };
GType _gtk_scale_accessible_get_type (void); GType gtk_scale_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2008 Jan Arne Petersen * Copyright 2008 Jan Arne Petersen
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
static void atk_action_interface_init (AtkActionIface *iface); static void atk_action_interface_init (AtkActionIface *iface);
static void atk_value_interface_init (AtkValueIface *iface); static void atk_value_interface_init (AtkValueIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkScaleButtonAccessible, _gtk_scale_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkScaleButtonAccessible, gtk_scale_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)); G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init));
@@ -43,7 +43,7 @@ gtk_scale_button_accessible_initialize (AtkObject *obj,
{ {
GtkAdjustment *adjustment; GtkAdjustment *adjustment;
ATK_OBJECT_CLASS (_gtk_scale_button_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_scale_button_accessible_parent_class)->initialize (obj, data);
adjustment = gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (data)); adjustment = gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (data));
if (adjustment) if (adjustment)
@@ -77,12 +77,12 @@ gtk_scale_button_accessible_notify_gtk (GObject *obj,
} }
else else
{ {
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_scale_button_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_scale_button_accessible_parent_class)->notify_gtk (obj, pspec);
} }
} }
static void static void
_gtk_scale_button_accessible_class_init (GtkScaleButtonAccessibleClass *klass) gtk_scale_button_accessible_class_init (GtkScaleButtonAccessibleClass *klass)
{ {
AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
GtkWidgetAccessibleClass *widget_class = GTK_WIDGET_ACCESSIBLE_CLASS (klass); GtkWidgetAccessibleClass *widget_class = GTK_WIDGET_ACCESSIBLE_CLASS (klass);
@@ -93,7 +93,7 @@ _gtk_scale_button_accessible_class_init (GtkScaleButtonAccessibleClass *klass)
} }
static void static void
_gtk_scale_button_accessible_init (GtkScaleButtonAccessible *button) gtk_scale_button_accessible_init (GtkScaleButtonAccessible *button)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2008 Jan Arne Petersen <jap@gnome.org> * Copyright 2008 Jan Arne Petersen <jap@gnome.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_SCALE_BUTTON_ACCESSIBLE_H__ #ifndef __GTK_SCALE_BUTTON_ACCESSIBLE_H__
#define __GTK_SCALE_BUTTON_ACCESSIBLE_H__ #define __GTK_SCALE_BUTTON_ACCESSIBLE_H__
#include "gtkbuttonaccessible.h" #include <gtk/a11y/gtkbuttonaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_SCALE_BUTTON_ACCESSIBLE (_gtk_scale_button_accessible_get_type ()) #define GTK_TYPE_SCALE_BUTTON_ACCESSIBLE (gtk_scale_button_accessible_get_type ())
#define GTK_SCALE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_BUTTON_ACCESSIBLE, GtkScaleButtonAccessible)) #define GTK_SCALE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_BUTTON_ACCESSIBLE, GtkScaleButtonAccessible))
#define GTK_SCALE_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_BUTTON_ACCESSIBLE, GtkScaleButtonAccessibleClass)) #define GTK_SCALE_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_BUTTON_ACCESSIBLE, GtkScaleButtonAccessibleClass))
#define GTK_IS_SCALE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_BUTTON_ACCESSIBLE)) #define GTK_IS_SCALE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_BUTTON_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkScaleButtonAccessibleClass
GtkButtonAccessibleClass parent_class; GtkButtonAccessibleClass parent_class;
}; };
GType _gtk_scale_button_accessible_get_type (void); GType gtk_scale_button_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -21,10 +21,10 @@
#include "gtkscrollbaraccessible.h" #include "gtkscrollbaraccessible.h"
G_DEFINE_TYPE (GtkScrollbarAccessible, _gtk_scrollbar_accessible, GTK_TYPE_RANGE_ACCESSIBLE) G_DEFINE_TYPE (GtkScrollbarAccessible, gtk_scrollbar_accessible, GTK_TYPE_RANGE_ACCESSIBLE)
static void static void
_gtk_scrollbar_accessible_init (GtkScrollbarAccessible *accessible) gtk_scrollbar_accessible_init (GtkScrollbarAccessible *accessible)
{ {
} }
@@ -32,7 +32,7 @@ static void
gtk_scrollbar_accessible_initialize (AtkObject *accessible, gtk_scrollbar_accessible_initialize (AtkObject *accessible,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_scrollbar_accessible_parent_class)->initialize (accessible, data); ATK_OBJECT_CLASS (gtk_scrollbar_accessible_parent_class)->initialize (accessible, data);
accessible->role = ATK_ROLE_SCROLL_BAR; accessible->role = ATK_ROLE_SCROLL_BAR;
} }
@@ -52,7 +52,7 @@ gtk_scrollbar_accessible_get_index_in_parent (AtkObject *accessible)
parent = gtk_widget_get_parent (widget); parent = gtk_widget_get_parent (widget);
if (!GTK_IS_SCROLLED_WINDOW (parent)) if (!GTK_IS_SCROLLED_WINDOW (parent))
return ATK_OBJECT_CLASS (_gtk_scrollbar_accessible_parent_class)->get_index_in_parent (accessible); return ATK_OBJECT_CLASS (gtk_scrollbar_accessible_parent_class)->get_index_in_parent (accessible);
scrolled_window = GTK_SCROLLED_WINDOW (parent); scrolled_window = GTK_SCROLLED_WINDOW (parent);
id = 0; id = 0;
@@ -82,7 +82,7 @@ gtk_scrollbar_accessible_get_index_in_parent (AtkObject *accessible)
} }
static void static void
_gtk_scrollbar_accessible_class_init (GtkScrollbarAccessibleClass *klass) gtk_scrollbar_accessible_class_init (GtkScrollbarAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_SCROLLBAR_ACCESSIBLE_H__ #ifndef __GTK_SCROLLBAR_ACCESSIBLE_H__
#define __GTK_SCROLLBAR_ACCESSIBLE_H__ #define __GTK_SCROLLBAR_ACCESSIBLE_H__
#include "gtkrangeaccessible.h" #include <gtk/a11y/gtkrangeaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_SCROLLBAR_ACCESSIBLE (_gtk_scrollbar_accessible_get_type ()) #define GTK_TYPE_SCROLLBAR_ACCESSIBLE (gtk_scrollbar_accessible_get_type ())
#define GTK_SCROLLBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLBAR_ACCESSIBLE, GtkScrollbarAccessible)) #define GTK_SCROLLBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLBAR_ACCESSIBLE, GtkScrollbarAccessible))
#define GTK_SCROLLBAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLBAR_ACCESSIBLE, GtkScrollbarAccessibleClass)) #define GTK_SCROLLBAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLBAR_ACCESSIBLE, GtkScrollbarAccessibleClass))
#define GTK_IS_SCROLLBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLBAR_ACCESSIBLE)) #define GTK_IS_SCROLLBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLBAR_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkScrollbarAccessibleClass
GtkRangeAccessibleClass parent_class; GtkRangeAccessibleClass parent_class;
}; };
GType _gtk_scrollbar_accessible_get_type (void); GType gtk_scrollbar_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
#include "gtkscrolledwindowaccessible.h" #include "gtkscrolledwindowaccessible.h"
G_DEFINE_TYPE (GtkScrolledWindowAccessible, _gtk_scrolled_window_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) G_DEFINE_TYPE (GtkScrolledWindowAccessible, gtk_scrolled_window_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE)
static void static void
visibility_changed (GObject *object, visibility_changed (GObject *object,
@@ -88,7 +88,7 @@ gtk_scrolled_window_accessible_initialize (AtkObject *obj,
{ {
GtkScrolledWindow *window; GtkScrolledWindow *window;
ATK_OBJECT_CLASS (_gtk_scrolled_window_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_scrolled_window_accessible_parent_class)->initialize (obj, data);
window = GTK_SCROLLED_WINDOW (data); window = GTK_SCROLLED_WINDOW (data);
@@ -178,7 +178,7 @@ gtk_scrolled_window_accessible_ref_child (AtkObject *obj,
} }
static void static void
_gtk_scrolled_window_accessible_class_init (GtkScrolledWindowAccessibleClass *klass) gtk_scrolled_window_accessible_class_init (GtkScrolledWindowAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -188,6 +188,6 @@ _gtk_scrolled_window_accessible_class_init (GtkScrolledWindowAccessibleClass *kl
} }
static void static void
_gtk_scrolled_window_accessible_init (GtkScrolledWindowAccessible *window) gtk_scrolled_window_accessible_init (GtkScrolledWindowAccessible *window)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_SCROLLED_WINDOW_ACCESSIBLE_H__ #ifndef __GTK_SCROLLED_WINDOW_ACCESSIBLE_H__
#define __GTK_SCROLLED_WINDOW_ACCESSIBLE_H__ #define __GTK_SCROLLED_WINDOW_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h" #include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE (_gtk_scrolled_window_accessible_get_type ()) #define GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE (gtk_scrolled_window_accessible_get_type ())
#define GTK_SCROLLED_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE, GtkScrolledWindowAccessible)) #define GTK_SCROLLED_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE, GtkScrolledWindowAccessible))
#define GTK_SCROLLED_WINDOW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE, GtkScrolledWindowAccessibleClass)) #define GTK_SCROLLED_WINDOW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE, GtkScrolledWindowAccessibleClass))
#define GTK_IS_SCROLLED_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE)) #define GTK_IS_SCROLLED_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkScrolledWindowAccessibleClass
GtkContainerAccessibleClass parent_class; GtkContainerAccessibleClass parent_class;
}; };
GType _gtk_scrolled_window_accessible_get_type (void); GType gtk_scrolled_window_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
static void atk_value_interface_init (AtkValueIface *iface); static void atk_value_interface_init (AtkValueIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkSpinButtonAccessible, _gtk_spin_button_accessible, GTK_TYPE_ENTRY_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkSpinButtonAccessible, gtk_spin_button_accessible, GTK_TYPE_ENTRY_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
static void static void
@@ -47,7 +47,7 @@ gtk_spin_button_accessible_initialize (AtkObject *obj,
{ {
GtkAdjustment *adjustment; GtkAdjustment *adjustment;
ATK_OBJECT_CLASS (_gtk_spin_button_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_spin_button_accessible_parent_class)->initialize (obj, data);
adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (data)); adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (data));
if (adjustment) if (adjustment)
@@ -76,13 +76,13 @@ gtk_spin_button_accessible_notify_gtk (GObject *obj,
spin_button); spin_button);
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_spin_button_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_spin_button_accessible_parent_class)->notify_gtk (obj, pspec);
} }
static void static void
_gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass) gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;
@@ -93,7 +93,7 @@ _gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass)
} }
static void static void
_gtk_spin_button_accessible_init (GtkSpinButtonAccessible *button) gtk_spin_button_accessible_init (GtkSpinButtonAccessible *button)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_SPIN_BUTTON_ACCESSIBLE_H__ #ifndef __GTK_SPIN_BUTTON_ACCESSIBLE_H__
#define __GTK_SPIN_BUTTON_ACCESSIBLE_H__ #define __GTK_SPIN_BUTTON_ACCESSIBLE_H__
#include "gtkentryaccessible.h" #include <gtk/a11y/gtkentryaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_SPIN_BUTTON_ACCESSIBLE (_gtk_spin_button_accessible_get_type ()) #define GTK_TYPE_SPIN_BUTTON_ACCESSIBLE (gtk_spin_button_accessible_get_type ())
#define GTK_SPIN_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE, GtkSpinButtonAccessible)) #define GTK_SPIN_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE, GtkSpinButtonAccessible))
#define GTK_SPIN_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE, GtkSpinButtonAccessibleClass)) #define GTK_SPIN_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE, GtkSpinButtonAccessibleClass))
#define GTK_IS_SPIN_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE)) #define GTK_IS_SPIN_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkSpinButtonAccessibleClass
GtkEntryAccessibleClass parent_class; GtkEntryAccessibleClass parent_class;
}; };
GType _gtk_spin_button_accessible_get_type (void); GType gtk_spin_button_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,5 +1,4 @@
/* GTK - The GIMP Toolkit /* GTK+ - accessibility implementations
*
* Copyright (C) 2007 John Stowers, Neil Jagdish Patel. * Copyright (C) 2007 John Stowers, Neil Jagdish Patel.
* Copyright (C) 2009 Bastien Nocera, David Zeuthen * Copyright (C) 2009 Bastien Nocera, David Zeuthen
* *
@@ -28,14 +27,14 @@
static void atk_image_interface_init (AtkImageIface *iface); static void atk_image_interface_init (AtkImageIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkSpinnerAccessible, _gtk_spinner_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkSpinnerAccessible, gtk_spinner_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)); G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init));
static void static void
gtk_spinner_accessible_initialize (AtkObject *accessible, gtk_spinner_accessible_initialize (AtkObject *accessible,
gpointer widget) gpointer widget)
{ {
ATK_OBJECT_CLASS (_gtk_spinner_accessible_parent_class)->initialize (accessible, widget); ATK_OBJECT_CLASS (gtk_spinner_accessible_parent_class)->initialize (accessible, widget);
atk_object_set_name (accessible, C_("throbbing progress animation widget", "Spinner")); atk_object_set_name (accessible, C_("throbbing progress animation widget", "Spinner"));
atk_object_set_description (accessible, _("Provides visual indication of progress")); atk_object_set_description (accessible, _("Provides visual indication of progress"));
@@ -43,7 +42,7 @@ gtk_spinner_accessible_initialize (AtkObject *accessible,
} }
static void static void
_gtk_spinner_accessible_class_init (GtkSpinnerAccessibleClass *klass) gtk_spinner_accessible_class_init (GtkSpinnerAccessibleClass *klass)
{ {
AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass); AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
@@ -51,7 +50,7 @@ _gtk_spinner_accessible_class_init (GtkSpinnerAccessibleClass *klass)
} }
static void static void
_gtk_spinner_accessible_init (GtkSpinnerAccessible *self) gtk_spinner_accessible_init (GtkSpinnerAccessible *self)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2011 Red Hat, Inc. * Copyright 2011 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_SPINNER_ACCESSIBLE_H__ #ifndef __GTK_SPINNER_ACCESSIBLE_H__
#define __GTK_SPINNER_ACCESSIBLE_H__ #define __GTK_SPINNER_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h" #include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_SPINNER_ACCESSIBLE (_gtk_spinner_accessible_get_type ()) #define GTK_TYPE_SPINNER_ACCESSIBLE (gtk_spinner_accessible_get_type ())
#define GTK_SPINNER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPINNER_ACCESSIBLE, GtkSpinnerAccessible)) #define GTK_SPINNER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPINNER_ACCESSIBLE, GtkSpinnerAccessible))
#define GTK_SPINNER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SPINNER_ACCESSIBLE, GtkSpinnerAccessibleClass)) #define GTK_SPINNER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SPINNER_ACCESSIBLE, GtkSpinnerAccessibleClass))
#define GTK_IS_SPINNER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SPINNER_ACCESSIBLE)) #define GTK_IS_SPINNER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SPINNER_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkSpinnerAccessibleClass
GtkWidgetAccessibleClass parent_class; GtkWidgetAccessibleClass parent_class;
}; };
GType _gtk_spinner_accessible_get_type (void); GType gtk_spinner_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#include "gtkstatusbaraccessible.h" #include "gtkstatusbaraccessible.h"
G_DEFINE_TYPE (GtkStatusbarAccessible, _gtk_statusbar_accessible, GTK_TYPE_BOX_ACCESSIBLE) G_DEFINE_TYPE (GtkStatusbarAccessible, gtk_statusbar_accessible, GTK_TYPE_BOX_ACCESSIBLE)
static void static void
text_changed (GtkStatusbar *statusbar, text_changed (GtkStatusbar *statusbar,
@@ -41,7 +41,7 @@ gtk_statusbar_accessible_initialize (AtkObject *obj,
{ {
GtkWidget *statusbar = data; GtkWidget *statusbar = data;
ATK_OBJECT_CLASS (_gtk_statusbar_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_statusbar_accessible_parent_class)->initialize (obj, data);
g_signal_connect_after (statusbar, "text-pushed", g_signal_connect_after (statusbar, "text-pushed",
G_CALLBACK (text_changed), obj); G_CALLBACK (text_changed), obj);
@@ -100,7 +100,7 @@ gtk_statusbar_accessible_get_name (AtkObject *obj)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
name = ATK_OBJECT_CLASS (_gtk_statusbar_accessible_parent_class)->get_name (obj); name = ATK_OBJECT_CLASS (gtk_statusbar_accessible_parent_class)->get_name (obj);
if (name != NULL) if (name != NULL)
return name; return name;
@@ -125,7 +125,7 @@ gtk_statusbar_accessible_ref_child (AtkObject *obj,
} }
static void static void
_gtk_statusbar_accessible_class_init (GtkStatusbarAccessibleClass *klass) gtk_statusbar_accessible_class_init (GtkStatusbarAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GtkContainerAccessibleClass *container_class = (GtkContainerAccessibleClass*)klass; GtkContainerAccessibleClass *container_class = (GtkContainerAccessibleClass*)klass;
@@ -143,6 +143,6 @@ _gtk_statusbar_accessible_class_init (GtkStatusbarAccessibleClass *klass)
} }
static void static void
_gtk_statusbar_accessible_init (GtkStatusbarAccessible *bar) gtk_statusbar_accessible_init (GtkStatusbarAccessible *bar)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_STATUSBAR_ACCESSIBLE_H__ #ifndef __GTK_STATUSBAR_ACCESSIBLE_H__
#define __GTK_STATUSBAR_ACCESSIBLE_H__ #define __GTK_STATUSBAR_ACCESSIBLE_H__
#include "gtkboxaccessible.h" #include <gtk/a11y/gtkboxaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_STATUSBAR_ACCESSIBLE (_gtk_statusbar_accessible_get_type ()) #define GTK_TYPE_STATUSBAR_ACCESSIBLE (gtk_statusbar_accessible_get_type ())
#define GTK_STATUSBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STATUSBAR_ACCESSIBLE, GtkStatusbarAccessible)) #define GTK_STATUSBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STATUSBAR_ACCESSIBLE, GtkStatusbarAccessible))
#define GTK_STATUSBAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STATUSBAR_ACCESSIBLE, GtkStatusbarAccessibleClass)) #define GTK_STATUSBAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STATUSBAR_ACCESSIBLE, GtkStatusbarAccessibleClass))
#define GTK_IS_STATUSBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STATUSBAR_ACCESSIBLE)) #define GTK_IS_STATUSBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STATUSBAR_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkStatusbarAccessibleClass
GtkBoxAccessibleClass parent_class; GtkBoxAccessibleClass parent_class;
}; };
GType _gtk_statusbar_accessible_get_type (void); GType gtk_statusbar_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,5 +1,4 @@
/* GTK - The GIMP Toolkit /* GTK+ - accessibility implementations
*
* Copyright (C) 2010 Intel Corporation * Copyright (C) 2010 Intel Corporation
* Copyright (C) 2010 RedHat, Inc. * Copyright (C) 2010 RedHat, Inc.
* *
@@ -32,7 +31,7 @@
static void atk_action_interface_init (AtkActionIface *iface); static void atk_action_interface_init (AtkActionIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkSwitchAccessible, _gtk_switch_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkSwitchAccessible, gtk_switch_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init))
static AtkStateSet * static AtkStateSet *
@@ -41,7 +40,7 @@ gtk_switch_accessible_ref_state_set (AtkObject *accessible)
AtkStateSet *state_set; AtkStateSet *state_set;
GtkWidget *widget; GtkWidget *widget;
state_set = ATK_OBJECT_CLASS (_gtk_switch_accessible_parent_class)->ref_state_set (accessible); state_set = ATK_OBJECT_CLASS (gtk_switch_accessible_parent_class)->ref_state_set (accessible);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
if (widget == NULL) if (widget == NULL)
@@ -57,7 +56,7 @@ static void
gtk_switch_accessible_initialize (AtkObject *accessible, gtk_switch_accessible_initialize (AtkObject *accessible,
gpointer widget) gpointer widget)
{ {
ATK_OBJECT_CLASS (_gtk_switch_accessible_parent_class)->initialize (accessible, widget); ATK_OBJECT_CLASS (gtk_switch_accessible_parent_class)->initialize (accessible, widget);
atk_object_set_role (accessible, ATK_ROLE_TOGGLE_BUTTON); atk_object_set_role (accessible, ATK_ROLE_TOGGLE_BUTTON);
atk_object_set_name (accessible, C_("light switch widget", "Switch")); atk_object_set_name (accessible, C_("light switch widget", "Switch"));
@@ -65,7 +64,7 @@ gtk_switch_accessible_initialize (AtkObject *accessible,
} }
static void static void
_gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass) gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass)
{ {
AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass); AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
@@ -74,7 +73,7 @@ _gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass)
} }
static void static void
_gtk_switch_accessible_init (GtkSwitchAccessible *self) gtk_switch_accessible_init (GtkSwitchAccessible *self)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2011 Red Hat, Inc. * Copyright 2011 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_SWITCH_ACCESSIBLE_H__ #ifndef __GTK_SWITCH_ACCESSIBLE_H__
#define __GTK_SWITCH_ACCESSIBLE_H__ #define __GTK_SWITCH_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h" #include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_SWITCH_ACCESSIBLE (_gtk_switch_accessible_get_type ()) #define GTK_TYPE_SWITCH_ACCESSIBLE (gtk_switch_accessible_get_type ())
#define GTK_SWITCH_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SWITCH_ACCESSIBLE, GtkSwitchAccessible)) #define GTK_SWITCH_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SWITCH_ACCESSIBLE, GtkSwitchAccessible))
#define GTK_SWITCH_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SWITCH_ACCESSIBLE, GtkSwitchAccessibleClass)) #define GTK_SWITCH_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SWITCH_ACCESSIBLE, GtkSwitchAccessibleClass))
#define GTK_IS_SWITCH_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SWITCH_ACCESSIBLE)) #define GTK_IS_SWITCH_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SWITCH_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkSwitchAccessibleClass
GtkWidgetAccessibleClass parent_class; GtkWidgetAccessibleClass parent_class;
}; };
GType _gtk_switch_accessible_get_type (void); GType gtk_switch_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -89,7 +89,7 @@ static void gtk_text_cell_accessible_update_cache (GtkCellAccessible *cell
static void atk_text_interface_init (AtkTextIface *iface); static void atk_text_interface_init (AtkTextIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkTextCellAccessible, _gtk_text_cell_accessible, GTK_TYPE_RENDERER_CELL_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkTextCellAccessible, gtk_text_cell_accessible, GTK_TYPE_RENDERER_CELL_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init))
static AtkStateSet * static AtkStateSet *
@@ -97,7 +97,7 @@ gtk_text_cell_accessible_ref_state_set (AtkObject *accessible)
{ {
AtkStateSet *state_set; AtkStateSet *state_set;
state_set = ATK_OBJECT_CLASS (_gtk_text_cell_accessible_parent_class)->ref_state_set (accessible); state_set = ATK_OBJECT_CLASS (gtk_text_cell_accessible_parent_class)->ref_state_set (accessible);
atk_state_set_add_state (state_set, ATK_STATE_SINGLE_LINE); atk_state_set_add_state (state_set, ATK_STATE_SINGLE_LINE);
@@ -111,7 +111,7 @@ gtk_text_cell_accessible_finalize (GObject *object)
g_free (text_cell->priv->cell_text); g_free (text_cell->priv->cell_text);
G_OBJECT_CLASS (_gtk_text_cell_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_text_cell_accessible_parent_class)->finalize (object);
} }
static const gchar * static const gchar *
@@ -184,7 +184,7 @@ gtk_text_cell_accessible_update_cache (GtkCellAccessible *cell)
} }
static void static void
_gtk_text_cell_accessible_class_init (GtkTextCellAccessibleClass *klass) gtk_text_cell_accessible_class_init (GtkTextCellAccessibleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
@@ -201,7 +201,7 @@ _gtk_text_cell_accessible_class_init (GtkTextCellAccessibleClass *klass)
} }
static void static void
_gtk_text_cell_accessible_init (GtkTextCellAccessible *text_cell) gtk_text_cell_accessible_init (GtkTextCellAccessible *text_cell)
{ {
text_cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (text_cell, text_cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (text_cell,
GTK_TYPE_TEXT_CELL_ACCESSIBLE, GTK_TYPE_TEXT_CELL_ACCESSIBLE,
@@ -564,9 +564,9 @@ gtk_text_cell_accessible_get_character_extents (AtkText *text,
parent = atk_object_get_parent (parent); parent = atk_object_get_parent (parent);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent));
g_return_if_fail (GTK_IS_CELL_ACCESSIBLE_PARENT (parent)); g_return_if_fail (GTK_IS_CELL_ACCESSIBLE_PARENT (parent));
_gtk_cell_accessible_parent_get_cell_area (GTK_CELL_ACCESSIBLE_PARENT (parent), gtk_cell_accessible_parent_get_cell_area (GTK_CELL_ACCESSIBLE_PARENT (parent),
GTK_CELL_ACCESSIBLE (text), GTK_CELL_ACCESSIBLE (text),
&rendered_rect); &rendered_rect);
gtk_cell_renderer_get_preferred_size (GTK_CELL_RENDERER (gtk_renderer), gtk_cell_renderer_get_preferred_size (GTK_CELL_RENDERER (gtk_renderer),
widget, widget,
@@ -652,9 +652,9 @@ gtk_text_cell_accessible_get_offset_at_point (AtkText *text,
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent));
g_return_val_if_fail (GTK_IS_CELL_ACCESSIBLE_PARENT (parent), -1); g_return_val_if_fail (GTK_IS_CELL_ACCESSIBLE_PARENT (parent), -1);
_gtk_cell_accessible_parent_get_cell_area (GTK_CELL_ACCESSIBLE_PARENT (parent), gtk_cell_accessible_parent_get_cell_area (GTK_CELL_ACCESSIBLE_PARENT (parent),
GTK_CELL_ACCESSIBLE (text), GTK_CELL_ACCESSIBLE (text),
&rendered_rect); &rendered_rect);
gtk_cell_renderer_get_preferred_size (GTK_CELL_RENDERER (gtk_renderer), gtk_cell_renderer_get_preferred_size (GTK_CELL_RENDERER (gtk_renderer),
widget, widget,

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Enabling Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,15 +15,19 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_TEXT_CELL_ACCESSIBLE_H__ #ifndef __GTK_TEXT_CELL_ACCESSIBLE_H__
#define __GTK_TEXT_CELL_ACCESSIBLE_H__ #define __GTK_TEXT_CELL_ACCESSIBLE_H__
#include <atk/atk.h> #include <atk/atk.h>
#include "gtkrenderercellaccessible.h" #include <gtk/a11y/gtkrenderercellaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_TEXT_CELL_ACCESSIBLE (_gtk_text_cell_accessible_get_type ()) #define GTK_TYPE_TEXT_CELL_ACCESSIBLE (gtk_text_cell_accessible_get_type ())
#define GTK_TEXT_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_CELL_ACCESSIBLE, GtkTextCellAccessible)) #define GTK_TEXT_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_CELL_ACCESSIBLE, GtkTextCellAccessible))
#define GTK_TEXT_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TEXT_CELL_ACCESSIBLE, GtkTextCellAccessibleClass)) #define GTK_TEXT_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TEXT_CELL_ACCESSIBLE, GtkTextCellAccessibleClass))
#define GTK_IS_TEXT_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_CELL_ACCESSIBLE)) #define GTK_IS_TEXT_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_CELL_ACCESSIBLE))
@@ -46,7 +50,7 @@ struct _GtkTextCellAccessibleClass
GtkRendererCellAccessibleClass parent_class; GtkRendererCellAccessibleClass parent_class;
}; };
GType _gtk_text_cell_accessible_get_type (void); GType gtk_text_cell_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@
#include <glib-object.h> #include <glib-object.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtktextviewaccessible.h" #include "gtktextviewaccessibleprivate.h"
#include "gtk/gtkwidgetprivate.h" #include "gtk/gtkwidgetprivate.h"
struct _GtkTextViewAccessiblePrivate struct _GtkTextViewAccessiblePrivate
@@ -56,7 +56,7 @@ static void atk_editable_text_interface_init (AtkEditableTextIface *if
static void atk_text_interface_init (AtkTextIface *iface); static void atk_text_interface_init (AtkTextIface *iface);
static void atk_streamable_content_interface_init (AtkStreamableContentIface *iface); static void atk_streamable_content_interface_init (AtkStreamableContentIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkTextViewAccessible, _gtk_text_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkTextViewAccessible, gtk_text_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_STREAMABLE_CONTENT, atk_streamable_content_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_STREAMABLE_CONTENT, atk_streamable_content_interface_init))
@@ -66,7 +66,7 @@ static void
gtk_text_view_accessible_initialize (AtkObject *obj, gtk_text_view_accessible_initialize (AtkObject *obj,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_text_view_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_text_view_accessible_parent_class)->initialize (obj, data);
obj->role = ATK_ROLE_TEXT; obj->role = ATK_ROLE_TEXT;
} }
@@ -87,7 +87,7 @@ gtk_text_view_accessible_notify_gtk (GObject *obj,
atk_object_notify_state_change (atk_obj, ATK_STATE_EDITABLE, editable); atk_object_notify_state_change (atk_obj, ATK_STATE_EDITABLE, editable);
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_text_view_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_text_view_accessible_parent_class)->notify_gtk (obj, pspec);
} }
static AtkStateSet* static AtkStateSet*
@@ -100,7 +100,7 @@ gtk_text_view_accessible_ref_state_set (AtkObject *accessible)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
state_set = ATK_OBJECT_CLASS (_gtk_text_view_accessible_parent_class)->ref_state_set (accessible); state_set = ATK_OBJECT_CLASS (gtk_text_view_accessible_parent_class)->ref_state_set (accessible);
if (gtk_text_view_get_editable (GTK_TEXT_VIEW (widget))) if (gtk_text_view_get_editable (GTK_TEXT_VIEW (widget)))
atk_state_set_add_state (state_set, ATK_STATE_EDITABLE); atk_state_set_add_state (state_set, ATK_STATE_EDITABLE);
@@ -144,7 +144,7 @@ gtk_text_view_accessible_widget_unset (GtkAccessible *accessible)
} }
static void static void
_gtk_text_view_accessible_class_init (GtkTextViewAccessibleClass *klass) gtk_text_view_accessible_class_init (GtkTextViewAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GtkAccessibleClass *accessible_class = GTK_ACCESSIBLE_CLASS (klass); GtkAccessibleClass *accessible_class = GTK_ACCESSIBLE_CLASS (klass);
@@ -162,7 +162,7 @@ _gtk_text_view_accessible_class_init (GtkTextViewAccessibleClass *klass)
} }
static void static void
_gtk_text_view_accessible_init (GtkTextViewAccessible *accessible) gtk_text_view_accessible_init (GtkTextViewAccessible *accessible)
{ {
accessible->priv = G_TYPE_INSTANCE_GET_PRIVATE (accessible, accessible->priv = G_TYPE_INSTANCE_GET_PRIVATE (accessible,
GTK_TYPE_TEXT_VIEW_ACCESSIBLE, GTK_TYPE_TEXT_VIEW_ACCESSIBLE,

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_TEXT_VIEW_ACCESSIBLE_H__ #ifndef __GTK_TEXT_VIEW_ACCESSIBLE_H__
#define __GTK_TEXT_VIEW_ACCESSIBLE_H__ #define __GTK_TEXT_VIEW_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h" #include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_TEXT_VIEW_ACCESSIBLE (_gtk_text_view_accessible_get_type ()) #define GTK_TYPE_TEXT_VIEW_ACCESSIBLE (gtk_text_view_accessible_get_type ())
#define GTK_TEXT_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_VIEW_ACCESSIBLE, GtkTextViewAccessible)) #define GTK_TEXT_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_VIEW_ACCESSIBLE, GtkTextViewAccessible))
#define GTK_TEXT_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_VIEW_ACCESSIBLE, GtkTextViewAccessibleClass)) #define GTK_TEXT_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_VIEW_ACCESSIBLE, GtkTextViewAccessibleClass))
#define GTK_IS_TEXT_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_VIEW_ACCESSIBLE)) #define GTK_IS_TEXT_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_VIEW_ACCESSIBLE))
@@ -45,10 +49,7 @@ struct _GtkTextViewAccessibleClass
GtkContainerAccessibleClass parent_class; GtkContainerAccessibleClass parent_class;
}; };
GType _gtk_text_view_accessible_get_type (void); GType gtk_text_view_accessible_get_type (void);
void _gtk_text_view_accessible_set_buffer (GtkTextView *textview,
GtkTextBuffer *old_buffer);
G_END_DECLS G_END_DECLS

View File

@@ -0,0 +1,30 @@
/* GTK+ - accessibility implementations
* 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, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GTK_TEXT_VIEW_ACCESSIBLE_PRIVATE_H__
#define __GTK_TEXT_VIEW_ACCESSIBLE_PRIVATE_H__
#include <gtk/a11y/gtktextviewaccessible.h>
G_BEGIN_DECLS
void _gtk_text_view_accessible_set_buffer (GtkTextView *textview,
GtkTextBuffer *old_buffer);
G_END_DECLS
#endif /* __GTK_TEXT_VIEW_ACCESSIBLE_PRIVATE_H__ */

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#include "gtktogglebuttonaccessible.h" #include "gtktogglebuttonaccessible.h"
G_DEFINE_TYPE (GtkToggleButtonAccessible, _gtk_toggle_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE) G_DEFINE_TYPE (GtkToggleButtonAccessible, gtk_toggle_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE)
static void static void
gtk_toggle_button_accessible_toggled (GtkWidget *widget) gtk_toggle_button_accessible_toggled (GtkWidget *widget)
@@ -41,7 +41,7 @@ static void
gtk_toggle_button_accessible_initialize (AtkObject *obj, gtk_toggle_button_accessible_initialize (AtkObject *obj,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_toggle_button_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_toggle_button_accessible_parent_class)->initialize (obj, data);
g_signal_connect (data, "toggled", g_signal_connect (data, "toggled",
G_CALLBACK (gtk_toggle_button_accessible_toggled), NULL); G_CALLBACK (gtk_toggle_button_accessible_toggled), NULL);
@@ -74,7 +74,7 @@ gtk_toggle_button_accessible_notify_gtk (GObject *obj,
atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent));
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_toggle_button_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (gtk_toggle_button_accessible_parent_class)->notify_gtk (obj, pspec);
} }
static AtkStateSet* static AtkStateSet*
@@ -88,7 +88,7 @@ gtk_toggle_button_accessible_ref_state_set (AtkObject *accessible)
if (widget == NULL) if (widget == NULL)
return NULL; return NULL;
state_set = ATK_OBJECT_CLASS (_gtk_toggle_button_accessible_parent_class)->ref_state_set (accessible); state_set = ATK_OBJECT_CLASS (gtk_toggle_button_accessible_parent_class)->ref_state_set (accessible);
toggle_button = GTK_TOGGLE_BUTTON (widget); toggle_button = GTK_TOGGLE_BUTTON (widget);
if (gtk_toggle_button_get_active (toggle_button)) if (gtk_toggle_button_get_active (toggle_button))
@@ -104,7 +104,7 @@ gtk_toggle_button_accessible_ref_state_set (AtkObject *accessible)
} }
static void static void
_gtk_toggle_button_accessible_class_init (GtkToggleButtonAccessibleClass *klass) gtk_toggle_button_accessible_class_init (GtkToggleButtonAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;
@@ -116,6 +116,6 @@ _gtk_toggle_button_accessible_class_init (GtkToggleButtonAccessibleClass *klass)
} }
static void static void
_gtk_toggle_button_accessible_init (GtkToggleButtonAccessible *button) gtk_toggle_button_accessible_init (GtkToggleButtonAccessible *button)
{ {
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,14 +15,18 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_TOGGLE_BUTTON_ACCESSIBLE_H__ #ifndef __GTK_TOGGLE_BUTTON_ACCESSIBLE_H__
#define __GTK_TOGGLE_BUTTON_ACCESSIBLE_H__ #define __GTK_TOGGLE_BUTTON_ACCESSIBLE_H__
#include "gtkbuttonaccessible.h" #include <gtk/a11y/gtkbuttonaccessible.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE (_gtk_toggle_button_accessible_get_type ()) #define GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE (gtk_toggle_button_accessible_get_type ())
#define GTK_TOGGLE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE, GtkToggleButtonAccessible)) #define GTK_TOGGLE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE, GtkToggleButtonAccessible))
#define GTK_TOGGLE_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE, GtkToggleButtonAccessibleClass)) #define GTK_TOGGLE_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE, GtkToggleButtonAccessibleClass))
#define GTK_IS_TOGGLE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE)) #define GTK_IS_TOGGLE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE))
@@ -45,7 +49,7 @@ struct _GtkToggleButtonAccessibleClass
GtkButtonAccessibleClass parent_class; GtkButtonAccessibleClass parent_class;
}; };
GType _gtk_toggle_button_accessible_get_type (void); GType gtk_toggle_button_accessible_get_type (void);
G_END_DECLS G_END_DECLS

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc. * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -35,13 +35,13 @@ struct _GtkToplevelAccessiblePrivate
GList *window_list; GList *window_list;
}; };
G_DEFINE_TYPE (GtkToplevelAccessible, _gtk_toplevel_accessible, ATK_TYPE_OBJECT) G_DEFINE_TYPE (GtkToplevelAccessible, gtk_toplevel_accessible, ATK_TYPE_OBJECT)
static void static void
gtk_toplevel_accessible_initialize (AtkObject *accessible, gtk_toplevel_accessible_initialize (AtkObject *accessible,
gpointer data) gpointer data)
{ {
ATK_OBJECT_CLASS (_gtk_toplevel_accessible_parent_class)->initialize (accessible, data); ATK_OBJECT_CLASS (gtk_toplevel_accessible_parent_class)->initialize (accessible, data);
accessible->role = ATK_ROLE_APPLICATION; accessible->role = ATK_ROLE_APPLICATION;
accessible->name = g_get_prgname (); accessible->name = g_get_prgname ();
@@ -56,7 +56,7 @@ gtk_toplevel_accessible_object_finalize (GObject *obj)
if (toplevel->priv->window_list) if (toplevel->priv->window_list)
g_list_free (toplevel->priv->window_list); g_list_free (toplevel->priv->window_list);
G_OBJECT_CLASS (_gtk_toplevel_accessible_parent_class)->finalize (obj); G_OBJECT_CLASS (gtk_toplevel_accessible_parent_class)->finalize (obj);
} }
static gint static gint
@@ -134,7 +134,7 @@ is_attached_menu_window (GtkWidget *widget)
} }
static void static void
_gtk_toplevel_accessible_class_init (GtkToplevelAccessibleClass *klass) gtk_toplevel_accessible_class_init (GtkToplevelAccessibleClass *klass)
{ {
AtkObjectClass *class = ATK_OBJECT_CLASS(klass); AtkObjectClass *class = ATK_OBJECT_CLASS(klass);
GObjectClass *g_object_class = G_OBJECT_CLASS(klass); GObjectClass *g_object_class = G_OBJECT_CLASS(klass);
@@ -247,7 +247,7 @@ hide_event_watcher (GSignalInvocationHint *ihint,
} }
static void static void
_gtk_toplevel_accessible_init (GtkToplevelAccessible *toplevel) gtk_toplevel_accessible_init (GtkToplevelAccessible *toplevel)
{ {
GtkWindow *window; GtkWindow *window;
GtkWidget *widget; GtkWidget *widget;
@@ -297,7 +297,7 @@ _gtk_toplevel_accessible_init (GtkToplevelAccessible *toplevel)
} }
GList * GList *
_gtk_toplevel_accessible_get_children (GtkToplevelAccessible *accessible) gtk_toplevel_accessible_get_children (GtkToplevelAccessible *accessible)
{ {
return accessible->priv->window_list; return accessible->priv->window_list;
} }

View File

@@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library /* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc. * Copyright 2001 Sun Microsystems Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -15,6 +15,10 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_TOPLEVEL_ACCESSIBLE_H__ #ifndef __GTK_TOPLEVEL_ACCESSIBLE_H__
#define __GTK_TOPLEVEL_ACCESSIBLE_H__ #define __GTK_TOPLEVEL_ACCESSIBLE_H__
@@ -22,7 +26,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_TOPLEVEL_ACCESSIBLE (_gtk_toplevel_accessible_get_type ()) #define GTK_TYPE_TOPLEVEL_ACCESSIBLE (gtk_toplevel_accessible_get_type ())
#define GTK_TOPLEVEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOPLEVEL_ACCESSIBLE, GtkToplevelAccessible)) #define GTK_TOPLEVEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOPLEVEL_ACCESSIBLE, GtkToplevelAccessible))
#define GTK_TOPLEVEL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOPLEVEL_ACCESSIBLE, GtkToplevelAccessibleClass)) #define GTK_TOPLEVEL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOPLEVEL_ACCESSIBLE, GtkToplevelAccessibleClass))
#define GTK_IS_TOPLEVEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOPLEVEL_ACCESSIBLE)) #define GTK_IS_TOPLEVEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOPLEVEL_ACCESSIBLE))
@@ -45,8 +49,8 @@ struct _GtkToplevelAccessibleClass
AtkObjectClass parent_class; AtkObjectClass parent_class;
}; };
GType _gtk_toplevel_accessible_get_type (void); GType gtk_toplevel_accessible_get_type (void);
GList *_gtk_toplevel_accessible_get_children (GtkToplevelAccessible *accessible); GList *gtk_toplevel_accessible_get_children (GtkToplevelAccessible *accessible);
G_END_DECLS G_END_DECLS

Some files were not shown because too many files have changed in this diff Show More