AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove remnants of GnomeCanvas

Browse Source 
There were some random places where gail was poking at types
to see if they were a GnomeCanvas. Just remove this.
This commit is contained in:
Matthias Clasen 2011-06-19 14:11:46 -04:00
parent bd6b799d26
commit 9860acfcbe
3 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/a11y/gail.c
View File

@ -157,9 +157,6 @@ gail_get_accessible_for_widget (GtkWidget *widget,
gboolean *transient)
{
AtkObject *obj = NULL;
GType gnome_canvas;
gnome_canvas = g_type_from_name ("GnomeCanvas");
*transient = FALSE;
if (!widget)
@ -181,25 +178,6 @@ gail_get_accessible_for_widget (GtkWidget *widget,
g_object_unref (obj);
}
}
else if (G_TYPE_CHECK_INSTANCE_TYPE ((widget), gnome_canvas))
{
GObject *focused_item;
GValue value = {0, };
g_value_init (&value, G_TYPE_OBJECT);
g_object_get_property (G_OBJECT (widget), "focused_item", &value);
focused_item = g_value_get_object (&value);
if (focused_item)
{
AtkObject *tmp;
obj = atk_gobject_accessible_for_object (G_OBJECT (focused_item));
tmp = g_object_get_qdata (G_OBJECT (obj), quark_focus_object);
if (tmp != NULL)
obj = tmp;
}
}
else if (GTK_IS_TOGGLE_BUTTON (widget))
{
GtkWidget *other_widget = gtk_widget_get_parent (widget);

2
gtk/a11y/gailtextutil.c
View File

@ -33,7 +33,7 @@
* #AtkText functions which get text for accessible objects which implement
* #AtkText.
*
* In GAIL it is used by the accsesible objects for #GnomeCanvasText, #GtkEntry,
* In GAIL it is used by the accessible objects for #GtkEntry,
* #GtkLabel, #GtkCellRendererText and #GtkTextView.
*/

5
gtk/a11y/gailwidget.c
View File

@ -536,9 +536,7 @@ gail_widget_get_index_in_parent (AtkObject *accessible)
GtkWidget *parent_widget;
gint index;
GList *children;
GType type;
type = g_type_from_name ("GailCanvasWidget");
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
if (widget == NULL)
@ -553,8 +551,7 @@ gail_widget_get_index_in_parent (AtkObject *accessible)
parent = accessible->accessible_parent;
if (GAIL_IS_NOTEBOOK_PAGE (parent) ||
G_TYPE_CHECK_INSTANCE_TYPE ((parent), type))
if (GAIL_IS_NOTEBOOK_PAGE (parent))
return 0;
else
{