diff options
author | Alejandro Piñeiro <apinheiro@igalia.com> | 2011-08-23 17:34:59 +0200 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2011-08-29 10:57:14 -0400 |
commit | 08bf2e0463256847752959a069d9ed1701cb3188 (patch) | |
tree | 7f3e596ebc39966cc3c3f97cd3784a87e82eab3f /gtk/a11y/gtkwindowaccessible.c | |
parent | 1090eba9a8b5c42bba5483f48fec4834b5b62a66 (diff) | |
download | gtk+-08bf2e0463256847752959a069d9ed1701cb3188.tar.gz |
a11y: Use AtkWindow on GtkWindowAccessible
GtkWindowAccessible doesn't require to define window related
signals. They are included on AtkWindow
Diffstat (limited to 'gtk/a11y/gtkwindowaccessible.c')
-rw-r--r-- | gtk/a11y/gtkwindowaccessible.c | 106 |
1 files changed, 15 insertions, 91 deletions
diff --git a/gtk/a11y/gtkwindowaccessible.c b/gtk/a11y/gtkwindowaccessible.c index b82af485f7..6c1a8cedcf 100644 --- a/gtk/a11y/gtkwindowaccessible.c +++ b/gtk/a11y/gtkwindowaccessible.c @@ -1,4 +1,5 @@ /* 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 @@ -24,20 +25,6 @@ #include "gtkwindowaccessible.h" #include "gtktoplevelaccessible.h" -enum { - ACTIVATE, - CREATE, - DEACTIVATE, - DESTROY, - MAXIMIZE, - MINIMIZE, - MOVE, - RESIZE, - RESTORE, - LAST_SIGNAL -}; - - /* atkcomponent.h */ static void gtk_window_accessible_get_extents (AtkComponent *component, @@ -50,12 +37,16 @@ static void gtk_window_accessible_get_size (AtkComponen gint *width, gint *height); -static guint gtk_window_accessible_signals [LAST_SIGNAL] = { 0, }; - static void atk_component_interface_init (AtkComponentIface *iface); +static void atk_window_interface_init (AtkWindowIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkWindowAccessible, _gtk_window_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, - G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) +G_DEFINE_TYPE_WITH_CODE (GtkWindowAccessible, + _gtk_window_accessible, + GTK_TYPE_CONTAINER_ACCESSIBLE, + G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, + atk_component_interface_init) + G_IMPLEMENT_INTERFACE (ATK_TYPE_WINDOW, + atk_window_interface_init)); static void @@ -306,79 +297,6 @@ _gtk_window_accessible_class_init (GtkWindowAccessibleClass *klass) class->ref_state_set = gtk_window_accessible_ref_state_set; class->initialize = gtk_window_accessible_initialize; class->focus_event = gtk_window_accessible_focus_event; - - gtk_window_accessible_signals [ACTIVATE] = - g_signal_new ("activate", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - gtk_window_accessible_signals [CREATE] = - g_signal_new ("create", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - gtk_window_accessible_signals [DEACTIVATE] = - g_signal_new ("deactivate", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - gtk_window_accessible_signals [DESTROY] = - g_signal_new ("destroy", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - gtk_window_accessible_signals [MAXIMIZE] = - g_signal_new ("maximize", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - gtk_window_accessible_signals [MINIMIZE] = - g_signal_new ("minimize", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - gtk_window_accessible_signals [MOVE] = - g_signal_new ("move", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - gtk_window_accessible_signals [RESIZE] = - g_signal_new ("resize", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - gtk_window_accessible_signals [RESTORE] = - g_signal_new ("restore", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); } static void @@ -466,3 +384,9 @@ atk_component_interface_init (AtkComponentIface *iface) iface->get_extents = gtk_window_accessible_get_extents; iface->get_size = gtk_window_accessible_get_size; } + +static void +atk_window_interface_init (AtkWindowIface *iface) +{ + /* At this moment AtkWindow is just about signals */ +} |