Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dorota Czaplejewicz
gtk
Commits
87195bc3
Commit
87195bc3
authored
Jun 26, 2011
by
Matthias Clasen
Browse files
Convert GailScrollbar to GtkScrollbarAccessible
parent
eebf34dd
Changes
6
Hide whitespace changes
Inline
Side-by-side
gtk/a11y/Makefile.am
View file @
87195bc3
...
...
@@ -38,7 +38,7 @@ gail_c_sources = \
gailrenderercell.c
\
gtkscaleaccessible.c
\
gailscalebutton.c
\
g
ail
scrollbar.c
\
g
tk
scrollbar
accessible
.c
\
gailscrolledwindow.c
\
gtkspinbuttonaccessible.c
\
gailsubmenuitem.c
\
...
...
@@ -90,7 +90,7 @@ gail_private_h_sources = \
gailrenderercell.h
\
gtkscaleaccessible.h
\
gailscalebutton.h
\
g
ail
scrollbar.h
\
g
tk
scrollbar
accessible
.h
\
gailscrolledwindow.h
\
gtkspinbuttonaccessible.h
\
gailsubmenuitem.h
\
...
...
gtk/a11y/gail.c
View file @
87195bc3
...
...
@@ -46,7 +46,6 @@
#include
"gailrenderercell.h"
#include
"gailrange.h"
#include
"gailscalebutton.h"
#include
"gailscrollbar.h"
#include
"gailscrolledwindow.h"
#include
"gailstatusbar.h"
#include
"gailtextcell.h"
...
...
@@ -123,7 +122,6 @@ GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_TREE_VIEW, GailTreeView, gail_tree_view, GTK_T
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_RADIO_BUTTON
,
GailRadioButton
,
gail_radio_button
,
GTK_TYPE_RADIO_BUTTON
)
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_SCROLLED_WINDOW
,
GailScrolledWindow
,
gail_scrolled_window
,
GTK_TYPE_SCROLLED_WINDOW
)
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_PANED
,
GailPaned
,
gail_paned
,
GTK_TYPE_PANED
)
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_SCROLLBAR
,
GailScrollbar
,
gail_scrollbar
,
GTK_TYPE_SCROLLBAR
)
GAIL_IMPLEMENT_FACTORY_WITH_FUNC
(
GAIL_TYPE_CHECK_MENU_ITEM
,
GailCheckMenuItem
,
gail_check_menu_item
,
gail_check_menu_item_new
)
GAIL_IMPLEMENT_FACTORY_WITH_FUNC
(
GAIL_TYPE_RADIO_MENU_ITEM
,
GailRadioMenuItem
,
gail_radio_menu_item
,
gail_radio_menu_item_new
)
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_EXPANDER
,
GailExpander
,
gail_expander
,
GTK_TYPE_EXPANDER
)
...
...
@@ -895,7 +893,6 @@ gail_accessibility_module_init (void)
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_RADIO_BUTTON
,
gail_radio_button
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_SCROLLED_WINDOW
,
gail_scrolled_window
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_PANED
,
gail_paned
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_SCROLLBAR
,
gail_scrollbar
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_CHECK_MENU_ITEM
,
gail_check_menu_item
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_RADIO_MENU_ITEM
,
gail_radio_menu_item
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_EXPANDER
,
gail_expander
);
...
...
gtk/a11y/g
ail
scrollbar.c
→
gtk/a11y/g
tk
scrollbar
accessible
.c
View file @
87195bc3
...
...
@@ -20,42 +20,27 @@
#include
"config.h"
#include
<gtk/gtk.h>
#include
"g
ail
scrollbar.h"
#include
"g
tk
scrollbar
accessible
.h"
static
void
gail_scrollbar_class_init
(
GailScrollbarClass
*
klass
);
static
void
gail_scrollbar_init
(
GailScrollbar
*
accessible
);
static
void
gail_scrollbar_initialize
(
AtkObject
*
accessible
,
gpointer
data
);
static
gint
gail_scrollbar_get_index_in_parent
(
AtkObject
*
accessible
);
G_DEFINE_TYPE
(
GailScrollbar
,
gail_scrollbar
,
GAIL_TYPE_RANGE
)
static
void
gail_scrollbar_class_init
(
GailScrollbarClass
*
klass
)
{
AtkObjectClass
*
class
=
ATK_OBJECT_CLASS
(
klass
);
class
->
initialize
=
gail_scrollbar_initialize
;
class
->
get_index_in_parent
=
gail_scrollbar_get_index_in_parent
;
}
G_DEFINE_TYPE
(
GtkScrollbarAccessible
,
gtk_scrollbar_accessible
,
GAIL_TYPE_RANGE
)
static
void
g
ail
_scrollbar_init
(
G
ail
Scrollbar
*
accessible
)
g
tk
_scrollbar_
accessible_
init
(
G
tk
Scrollbar
Accessible
*
accessible
)
{
}
static
void
g
ail
_scrollbar_initialize
(
AtkObject
*
accessible
,
g
tk
_scrollbar_
accessible_
initialize
(
AtkObject
*
accessible
,
gpointer
data
)
{
ATK_OBJECT_CLASS
(
g
ail
_scrollbar_parent_class
)
->
initialize
(
accessible
,
data
);
ATK_OBJECT_CLASS
(
g
tk
_scrollbar_
accessible_
parent_class
)
->
initialize
(
accessible
,
data
);
accessible
->
role
=
ATK_ROLE_SCROLL_BAR
;
}
static
gint
g
ail
_scrollbar_get_index_in_parent
(
AtkObject
*
accessible
)
g
tk
_scrollbar_
accessible_
get_index_in_parent
(
AtkObject
*
accessible
)
{
GtkWidget
*
widget
;
GtkWidget
*
parent
;
...
...
@@ -64,19 +49,12 @@ gail_scrollbar_get_index_in_parent (AtkObject *accessible)
gint
id
;
widget
=
gtk_accessible_get_widget
(
GTK_ACCESSIBLE
(
accessible
));
if
(
widget
==
NULL
)
{
/*
* State is defunct
*/
return
-
1
;
}
g_return_val_if_fail
(
GTK_IS_SCROLLBAR
(
widget
),
-
1
);
parent
=
gtk_widget_get_parent
(
widget
);
if
(
!
GTK_IS_SCROLLED_WINDOW
(
parent
))
return
ATK_OBJECT_CLASS
(
g
ail
_scrollbar_parent_class
)
->
get_index_in_parent
(
accessible
);
return
ATK_OBJECT_CLASS
(
g
tk
_scrollbar_
accessible_
parent_class
)
->
get_index_in_parent
(
accessible
);
scrolled_window
=
GTK_SCROLLED_WINDOW
(
parent
);
id
=
0
;
...
...
@@ -103,4 +81,13 @@ gail_scrollbar_get_index_in_parent (AtkObject *accessible)
}
return
-
1
;
}
}
static
void
gtk_scrollbar_accessible_class_init
(
GtkScrollbarAccessibleClass
*
klass
)
{
AtkObjectClass
*
class
=
ATK_OBJECT_CLASS
(
klass
);
class
->
initialize
=
gtk_scrollbar_accessible_initialize
;
class
->
get_index_in_parent
=
gtk_scrollbar_accessible_get_index_in_parent
;
}
gtk/a11y/g
ail
scrollbar.h
→
gtk/a11y/g
tk
scrollbar
accessible
.h
View file @
87195bc3
...
...
@@ -8,7 +8,7 @@
*
* 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
* 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
...
...
@@ -17,35 +17,35 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef __G
AIL
_SCROLLBAR_H__
#define __G
AIL
_SCROLLBAR_H__
#ifndef __G
TK
_SCROLLBAR_
ACCESSIBLE_
H__
#define __G
TK
_SCROLLBAR_
ACCESSIBLE_
H__
#include
"gailrange.h"
G_BEGIN_DECLS
#define G
AIL
_TYPE_SCROLLBAR (g
ail
_scrollbar_get_type ())
#define G
AIL
_SCROLLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G
AIL
_TYPE_SCROLLBAR
, GailScrollbar
))
#define G
AIL
_SCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G
AIL
_TYPE_SCROLLBAR
, GailScrollbar
Class))
#define G
AIL
_IS_SCROLLBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G
AIL
_TYPE_SCROLLBAR))
#define G
AIL
_IS_SCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), G
AIL
_TYPE_SCROLLBAR))
#define G
AIL
_SCROLLBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G
AIL
_TYPE_SCROLLBAR
, GailScrollbar
Class))
#define G
TK
_TYPE_SCROLLBAR
_ACCESSIBLE
(g
tk
_scrollbar_
accessible_
get_type ())
#define G
TK
_SCROLLBAR
_ACCESSIBLE
(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G
TK
_TYPE_SCROLLBAR
_ACCESSIBLE, GtkScrollbarAccessible
))
#define G
TK
_SCROLLBAR_
ACCESSIBLE_
CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G
TK
_TYPE_SCROLLBAR
_ACCESSIBLE, GtkScrollbarAccessible
Class))
#define G
TK
_IS_SCROLLBAR
_ACCESSIBLE
(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G
TK
_TYPE_SCROLLBAR
_ACCESSIBLE
))
#define G
TK
_IS_SCROLLBAR_
ACCESSIBLE_
CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), G
TK
_TYPE_SCROLLBAR
_ACCESSIBLE
))
#define G
TK
_SCROLLBAR_
ACCESSIBLE_
GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G
TK
_TYPE_SCROLLBAR
_ACCESSIBLE, GtkScrollbarAccessible
Class))
typedef
struct
_G
ail
Scrollbar
GailScrollbar
;
typedef
struct
_G
ail
Scrollbar
Class
GailScrollbar
Class
;
typedef
struct
_G
tk
Scrollbar
Accessible
GtkScrollbarAccessible
;
typedef
struct
_G
tk
Scrollbar
AccessibleClass
GtkScrollbarAccessible
Class
;
struct
_G
ail
Scrollbar
struct
_G
tk
Scrollbar
Accessible
{
GailRange
parent
;
};
GType
gail_scrollbar_get_type
(
void
);
struct
_GailScrollbarClass
struct
_GtkScrollbarAccessibleClass
{
GailRangeClass
parent_class
;
};
GType
gtk_scrollbar_accessible_get_type
(
void
);
G_END_DECLS
#endif
/* __G
AIL
_SCROLLBAR_H__ */
#endif
/* __G
TK
_SCROLLBAR_
ACCESSIBLE_
H__ */
gtk/gtkscrollbar.c
View file @
87195bc3
...
...
@@ -31,6 +31,8 @@
#include
"gtkintl.h"
#include
"gtkprivate.h"
#include
"a11y/gtkscrollbaraccessible.h"
/**
* SECTION:gtkscrollbar
...
...
@@ -108,6 +110,8 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
P_
(
"Display a second forward arrow button on the opposite end of the scrollbar"
),
FALSE
,
GTK_PARAM_READABLE
));
gtk_widget_class_set_accessible_type
(
widget_class
,
GTK_TYPE_SCROLLBAR_ACCESSIBLE
);
}
static
void
...
...
tests/a11y/appchooser.txt
View file @
87195bc3
...
...
@@ -396,7 +396,7 @@ Click "Show other applications", for more options, or "Find applications online"
<AtkAction>
action 0 name: activate
action 0 description: activate the cell
unnamed-G
ail
Scrollbar-8
unnamed-G
tk
Scrollbar
Accessible
-8
"scroll bar"
parent: unnamed-GailScrolledWindow-4
index: 1
...
...
@@ -412,7 +412,7 @@ Click "Show other applications", for more options, or "Find applications online"
maximum value: 0.000000
current value: 0.000000
minimum increment: 39.800000
unnamed-G
ail
Scrollbar-9
unnamed-G
tk
Scrollbar
Accessible
-9
"scroll bar"
parent: unnamed-GailScrolledWindow-4
index: 2
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment