callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gail: use accessor functions to access GtkScrolledWindow

Browse Source
This commit is contained in:
Javier Jardón
2010-08-31 01:33:15 +02:00
parent d8a90be370
commit 8da741f955
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/other/gail/gailscrollbar.c
View File

@ -85,18 +85,18 @@ gail_scrollbar_get_index_in_parent (AtkObject *accessible)
if (GTK_IS_HSCROLLBAR (widget)) if (GTK_IS_HSCROLLBAR (widget))
{ {
if (!scrolled_window->hscrollbar_visible) if (!gtk_scrolled_window_get_hscrollbar (scrolled_window))
{ {
n_children = -1; n_children = -1;
} }
} }
else if (GTK_IS_VSCROLLBAR (widget)) else if (GTK_IS_VSCROLLBAR (widget))
{ {
if (!scrolled_window->vscrollbar_visible) if (!gtk_scrolled_window_get_vscrollbar (scrolled_window))
{ {
n_children = -1; n_children = -1;
} }
else if (scrolled_window->hscrollbar_visible) else if (gtk_scrolled_window_get_hscrollbar (scrolled_window))
{ {
n_children++; n_children++;
} }

18
modules/other/gail/gailscrolledwindow.c
View File

@ -98,9 +98,9 @@ gail_scrolled_window_get_n_children (AtkObject *object)
/* Add one to the count for each visible scrollbar */ /* Add one to the count for each visible scrollbar */
if (gtk_window->hscrollbar_visible) if (gtk_scrolled_window_get_hscrollbar (gtk_window))
n_children++; n_children++;
if (gtk_window->vscrollbar_visible) if (gtk_scrolled_window_get_vscrollbar (gtk_window))
n_children++; n_children++;
return n_children; return n_children;
} }
@ -132,14 +132,14 @@ gail_scrolled_window_ref_child (AtkObject *obj,
if (child == n_children) if (child == n_children)
{ {
if (gtk_window->hscrollbar_visible) if (gtk_scrolled_window_get_hscrollbar (gtk_window))
accessible = gtk_widget_get_accessible (hscrollbar); accessible = gtk_widget_get_accessible (hscrollbar);
else if (gtk_window->vscrollbar_visible) else if (gtk_scrolled_window_get_vscrollbar (gtk_window))
accessible = gtk_widget_get_accessible (vscrollbar); accessible = gtk_widget_get_accessible (vscrollbar);
} }
else if (child == n_children+1 && else if (child == n_children+1 &&
gtk_window->hscrollbar_visible && gtk_scrolled_window_get_hscrollbar (gtk_window) &&
gtk_window->vscrollbar_visible) gtk_scrolled_window_get_vscrollbar (gtk_window))
accessible = gtk_widget_get_accessible (vscrollbar); accessible = gtk_widget_get_accessible (vscrollbar);
else if (child < n_children) else if (child < n_children)
{ {
@ -184,18 +184,18 @@ gail_scrolled_window_scrollbar_visibility_changed (GObject *object,
if ((gpointer) object == (gpointer) (hscrollbar)) if ((gpointer) object == (gpointer) (hscrollbar))
{ {
if (gtk_window->hscrollbar_visible) if (gtk_scrolled_window_get_hscrollbar (gtk_window))
child_added = TRUE; child_added = TRUE;
child = gtk_widget_get_accessible (hscrollbar); child = gtk_widget_get_accessible (hscrollbar);
} }
else if ((gpointer) object == (gpointer) (vscrollbar)) else if ((gpointer) object == (gpointer) (vscrollbar))
{ {
if (gtk_window->vscrollbar_visible) if (gtk_scrolled_window_get_vscrollbar (gtk_window))
child_added = TRUE; child_added = TRUE;
child = gtk_widget_get_accessible (vscrollbar); child = gtk_widget_get_accessible (vscrollbar);
if (gtk_window->hscrollbar_visible) if (gtk_scrolled_window_get_hscrollbar (gtk_window))
index = n_children+1; index = n_children+1;
} }
else else