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
d15319b7
Commit
d15319b7
authored
Jun 26, 2011
by
Matthias Clasen
Browse files
Convert GailLinkButton to GtkLinkButtonAccessible
parent
21524245
Changes
5
Hide whitespace changes
Inline
Side-by-side
gtk/a11y/Makefile.am
View file @
d15319b7
...
...
@@ -22,7 +22,7 @@ gail_c_sources = \
gtkimageaccessible.c
\
gailimagecell.c
\
gtklabelaccessible.c
\
g
ail
linkbutton.c
\
g
tk
linkbutton
accessible
.c
\
gailmisc.c
\
gailmenu.c
\
gailmenushell.c
\
...
...
@@ -74,7 +74,7 @@ gail_private_h_sources = \
gtkimageaccessible.h
\
gailimagecell.h
\
gtklabelaccessible.h
\
g
ail
linkbutton.h
\
g
tk
linkbutton
accessible
.h
\
gailmisc.h
\
gailmenu.h
\
gailmenushell.h
\
...
...
gtk/a11y/gail.c
View file @
d15319b7
...
...
@@ -33,7 +33,6 @@
#include
"gailcontainercell.h"
#include
"gailexpander.h"
#include
"gailimagecell.h"
#include
"gaillinkbutton.h"
#include
"gailmenu.h"
#include
"gailmenushell.h"
#include
"gailmenuitem.h"
...
...
@@ -103,7 +102,6 @@ static GQuark quark_focus_object = 0;
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_WIDGET
,
GailWidget
,
gail_widget
,
GTK_TYPE_WIDGET
)
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_CONTAINER
,
GailContainer
,
gail_container
,
GTK_TYPE_CONTAINER
)
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_BUTTON
,
GailButton
,
gail_button
,
GTK_TYPE_BUTTON
)
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_LINK_BUTTON
,
GailLinkButton
,
gail_link_button
,
GTK_TYPE_LINK_BUTTON
)
GAIL_IMPLEMENT_FACTORY_WITH_FUNC
(
GAIL_TYPE_MENU_ITEM
,
GailMenuItem
,
gail_menu_item
,
gail_menu_item_new
)
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_TOGGLE_BUTTON
,
GailToggleButton
,
gail_toggle_button
,
GTK_TYPE_TOGGLE_BUTTON
)
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_COMBO_BOX
,
GailComboBox
,
gail_combo_box
,
GTK_TYPE_COMBO_BOX
)
...
...
@@ -868,7 +866,6 @@ gail_accessibility_module_init (void)
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_WIDGET
,
gail_widget
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_CONTAINER
,
gail_container
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_BUTTON
,
gail_button
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_LINK_BUTTON
,
gail_link_button
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_MENU_ITEM
,
gail_menu_item
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_TOGGLE_BUTTON
,
gail_toggle_button
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_COMBO_BOX
,
gail_combo_box
);
...
...
gtk/a11y/g
ail
linkbutton.c
→
gtk/a11y/g
tk
linkbutton
accessible
.c
View file @
d15319b7
...
...
@@ -20,44 +20,44 @@
#include
"config.h"
#include
<gtk/gtk.h>
#include
"g
ail
linkbutton.h"
#include
"g
tk
linkbutton
accessible
.h"
typedef
struct
_G
ail
LinkButtonLink
G
ail
LinkButtonLink
;
typedef
struct
_G
ail
LinkButtonLinkClass
G
ail
LinkButtonLinkClass
;
typedef
struct
_G
tk
LinkButton
Accessible
Link
G
tk
LinkButton
Accessible
Link
;
typedef
struct
_G
tk
LinkButton
Accessible
LinkClass
G
tk
LinkButton
Accessible
LinkClass
;
struct
_G
ail
LinkButtonLink
struct
_G
tk
LinkButton
Accessible
Link
{
AtkHyperlink
parent
;
G
ail
LinkButton
*
button
;
G
tk
LinkButton
Accessible
*
button
;
};
struct
_G
ail
LinkButtonLinkClass
struct
_G
tk
LinkButton
Accessible
LinkClass
{
AtkHyperlinkClass
parent_class
;
};
static
void
atk_action_interface_init
(
AtkActionIface
*
iface
);
G_DEFINE_TYPE_WITH_CODE
(
G
ail
LinkButtonLink
,
g
ail
_link_button_link
,
ATK_TYPE_HYPERLINK
,
G_DEFINE_TYPE_WITH_CODE
(
G
tk
LinkButton
Accessible
Link
,
g
tk
_link_button_
accessible_
link
,
ATK_TYPE_HYPERLINK
,
G_IMPLEMENT_INTERFACE
(
ATK_TYPE_ACTION
,
atk_action_interface_init
))
static
AtkHyperlink
*
g
ail
_link_button_link_new
(
G
ail
LinkButton
*
button
)
g
tk
_link_button_
accessible_
link_new
(
G
tk
LinkButton
Accessible
*
button
)
{
G
ail
LinkButtonLink
*
link
;
G
tk
LinkButton
Accessible
Link
*
link
;
link
=
g_object_new
(
g
ail
_link_button_link_get_type
(),
NULL
);
link
=
g_object_new
(
g
tk
_link_button_
accessible_
link_get_type
(),
NULL
);
link
->
button
=
button
;
return
ATK_HYPERLINK
(
link
);
}
static
gchar
*
g
ail
_link_button_link_get_uri
(
AtkHyperlink
*
link
,
g
tk
_link_button_
accessible_
link_get_uri
(
AtkHyperlink
*
link
,
gint
i
)
{
G
ail
LinkButtonLink
*
l
=
(
G
ail
LinkButtonLink
*
)
link
;
G
tk
LinkButton
Accessible
Link
*
l
=
(
G
tk
LinkButton
Accessible
Link
*
)
link
;
GtkWidget
*
widget
;
const
gchar
*
uri
;
...
...
@@ -68,63 +68,63 @@ gail_link_button_link_get_uri (AtkHyperlink *link,
}
static
gint
g
ail
_link_button_link_get_n_anchors
(
AtkHyperlink
*
link
)
g
tk
_link_button_
accessible_
link_get_n_anchors
(
AtkHyperlink
*
link
)
{
return
1
;
}
static
gboolean
g
ail
_link_button_link_is_valid
(
AtkHyperlink
*
link
)
g
tk
_link_button_
accessible_
link_is_valid
(
AtkHyperlink
*
link
)
{
return
TRUE
;
}
static
AtkObject
*
g
ail
_link_button_link_get_object
(
AtkHyperlink
*
link
,
g
tk
_link_button_
accessible_
link_get_object
(
AtkHyperlink
*
link
,
gint
i
)
{
G
ail
LinkButtonLink
*
l
=
(
G
ail
LinkButtonLink
*
)
link
;
G
tk
LinkButton
Accessible
Link
*
l
=
(
G
tk
LinkButton
Accessible
Link
*
)
link
;
return
ATK_OBJECT
(
l
->
button
);
}
static
gint
g
ail
_link_button_link_get_start_index
(
AtkHyperlink
*
link
)
g
tk
_link_button_
accessible_
link_get_start_index
(
AtkHyperlink
*
link
)
{
return
0
;
}
static
gint
g
ail
_link_button_link_get_end_index
(
AtkHyperlink
*
link
)
g
tk
_link_button_
accessible_
link_get_end_index
(
AtkHyperlink
*
link
)
{
G
ail
LinkButtonLink
*
l
=
(
G
ail
LinkButtonLink
*
)
link
;
G
tk
LinkButton
Accessible
Link
*
l
=
(
G
tk
LinkButton
Accessible
Link
*
)
link
;
return
atk_text_get_character_count
(
ATK_TEXT
(
l
->
button
));
}
static
void
g
ail
_link_button_link_init
(
G
ail
LinkButtonLink
*
link
)
g
tk
_link_button_
accessible_
link_init
(
G
tk
LinkButton
Accessible
Link
*
link
)
{
}
static
void
g
ail
_link_button_link_class_init
(
G
ail
LinkButtonLinkClass
*
class
)
g
tk
_link_button_
accessible_
link_class_init
(
G
tk
LinkButton
Accessible
LinkClass
*
class
)
{
AtkHyperlinkClass
*
hyperlink_class
=
ATK_HYPERLINK_CLASS
(
class
);
hyperlink_class
->
get_uri
=
g
ail
_link_button_link_get_uri
;
hyperlink_class
->
get_n_anchors
=
g
ail
_link_button_link_get_n_anchors
;
hyperlink_class
->
is_valid
=
g
ail
_link_button_link_is_valid
;
hyperlink_class
->
get_object
=
g
ail
_link_button_link_get_object
;
hyperlink_class
->
get_start_index
=
g
ail
_link_button_link_get_start_index
;
hyperlink_class
->
get_end_index
=
g
ail
_link_button_link_get_end_index
;
hyperlink_class
->
get_uri
=
g
tk
_link_button_
accessible_
link_get_uri
;
hyperlink_class
->
get_n_anchors
=
g
tk
_link_button_
accessible_
link_get_n_anchors
;
hyperlink_class
->
is_valid
=
g
tk
_link_button_
accessible_
link_is_valid
;
hyperlink_class
->
get_object
=
g
tk
_link_button_
accessible_
link_get_object
;
hyperlink_class
->
get_start_index
=
g
tk
_link_button_
accessible_
link_get_start_index
;
hyperlink_class
->
get_end_index
=
g
tk
_link_button_
accessible_
link_get_end_index
;
}
static
gboolean
g
ail
_link_button_link_do_action
(
AtkAction
*
action
,
g
tk
_link_button_
accessible_
link_do_action
(
AtkAction
*
action
,
gint
i
)
{
G
ail
LinkButtonLink
*
link
=
(
G
ail
LinkButtonLink
*
)
action
;
G
tk
LinkButton
Accessible
Link
*
link
=
(
G
tk
LinkButton
Accessible
Link
*
)
action
;
GtkWidget
*
widget
;
widget
=
GTK_WIDGET
(
link
->
button
);
...
...
@@ -143,14 +143,14 @@ gail_link_button_link_do_action (AtkAction *action,
}
static
gint
g
ail
_link_button_link_get_n_actions
(
AtkAction
*
action
)
g
tk
_link_button_
accessible_
link_get_n_actions
(
AtkAction
*
action
)
{
return
1
;
}
static
const
gchar
*
g
ail
_link_button_link_get_name
(
AtkAction
*
action
,
gint
i
)
g
tk
_link_button_
accessible_
link_get_name
(
AtkAction
*
action
,
gint
i
)
{
g_return_val_if_fail
(
i
==
0
,
NULL
);
...
...
@@ -160,9 +160,9 @@ gail_link_button_link_get_name (AtkAction *action,
static
void
atk_action_interface_init
(
AtkActionIface
*
iface
)
{
iface
->
do_action
=
g
ail
_link_button_link_do_action
;
iface
->
get_n_actions
=
g
ail
_link_button_link_get_n_actions
;
iface
->
get_name
=
g
ail
_link_button_link_get_name
;
iface
->
do_action
=
g
tk
_link_button_
accessible_
link_do_action
;
iface
->
get_n_actions
=
g
tk
_link_button_
accessible_
link_get_n_actions
;
iface
->
get_name
=
g
tk
_link_button_
accessible_
link_get_name
;
}
static
gboolean
...
...
@@ -174,13 +174,13 @@ activate_link (GtkLinkButton *button, AtkHyperlink *link)
}
static
AtkHyperlink
*
g
ail
_link_button_get_hyperlink
(
AtkHyperlinkImpl
*
impl
)
g
tk
_link_button_
accessible_
get_hyperlink
(
AtkHyperlinkImpl
*
impl
)
{
G
ail
LinkButton
*
button
=
G
AIL
_LINK_BUTTON
(
impl
);
G
tk
LinkButton
Accessible
*
button
=
G
TK
_LINK_BUTTON
_ACCESSIBLE
(
impl
);
if
(
!
button
->
link
)
{
button
->
link
=
g
ail
_link_button_link_new
(
button
);
button
->
link
=
g
tk
_link_button_
accessible_
link_new
(
button
);
g_signal_connect
(
gtk_accessible_get_widget
(
GTK_ACCESSIBLE
(
button
)),
"activate-link"
,
G_CALLBACK
(
activate_link
),
button
->
link
);
}
...
...
@@ -190,33 +190,33 @@ gail_link_button_get_hyperlink (AtkHyperlinkImpl *impl)
static
void
atk_hypertext_impl_interface_init
(
AtkHyperlinkImplIface
*
iface
);
G_DEFINE_TYPE_WITH_CODE
(
G
ail
LinkButton
,
gail
_link_button
,
GAIL_TYPE_BUTTON
,
G_DEFINE_TYPE_WITH_CODE
(
G
tk
LinkButton
Accessible
,
gtk
_link_button
_accessible
,
GAIL_TYPE_BUTTON
,
G_IMPLEMENT_INTERFACE
(
ATK_TYPE_HYPERLINK_IMPL
,
atk_hypertext_impl_interface_init
))
static
void
g
ail
_link_button_init
(
G
ail
LinkButton
*
button
)
g
tk
_link_button_
accessible_
init
(
G
tk
LinkButton
Accessible
*
button
)
{
}
static
void
g
ail
_link_button_finalize
(
GObject
*
object
)
g
tk
_link_button_
accessible_
finalize
(
GObject
*
object
)
{
G
ail
LinkButton
*
button
=
G
AIL
_LINK_BUTTON
(
object
);
G
tk
LinkButton
Accessible
*
button
=
G
TK
_LINK_BUTTON
_ACCESSIBLE
(
object
);
if
(
button
->
link
)
g_object_unref
(
button
->
link
);
G_OBJECT_CLASS
(
g
ail
_link_button_parent_class
)
->
finalize
(
object
);
G_OBJECT_CLASS
(
g
tk
_link_button_
accessible_
parent_class
)
->
finalize
(
object
);
}
static
void
g
ail
_link_button_class_init
(
G
ail
LinkButtonClass
*
klass
)
g
tk
_link_button_
accessible_
class_init
(
G
tk
LinkButton
Accessible
Class
*
klass
)
{
G_OBJECT_CLASS
(
klass
)
->
finalize
=
g
ail
_link_button_finalize
;
G_OBJECT_CLASS
(
klass
)
->
finalize
=
g
tk
_link_button_
accessible_
finalize
;
}
static
void
atk_hypertext_impl_interface_init
(
AtkHyperlinkImplIface
*
iface
)
{
iface
->
get_hyperlink
=
g
ail
_link_button_get_hyperlink
;
iface
->
get_hyperlink
=
g
tk
_link_button_
accessible_
get_hyperlink
;
}
gtk/a11y/g
ail
linkbutton.h
→
gtk/a11y/g
tk
linkbutton
accessible
.h
View file @
d15319b7
...
...
@@ -17,37 +17,37 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef __G
AIL
_LINK_BUTTON_H__
#define __G
AIL
_LINK_BUTTON_H__
#ifndef __G
TK
_LINK_BUTTON_
ACCESSIBLE_
H__
#define __G
TK
_LINK_BUTTON_
ACCESSIBLE_
H__
#include
"gailbutton.h"
G_BEGIN_DECLS
#define G
AIL
_TYPE_LINK_BUTTON (g
ail
_link_button_get_type ())
#define G
AIL
_LINK_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G
AIL
_TYPE_LINK_BUTTON
, GailLinkButton
))
#define G
AIL
_LINK_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G
AIL
_TYPE_LINK_BUTTON
, GailLinkButton
Class))
#define G
AIL
_IS_LINK_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G
AIL
_TYPE_LINK_BUTTON))
#define G
AIL
_IS_LINK_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), G
AIL
_TYPE_LINK_BUTTON))
#define G
AIL
_LINK_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G
AIL
_TYPE_LINK_BUTTON
, GailLinkButton
Class))
#define G
TK
_TYPE_LINK_BUTTON
_ACCESSIBLE
(g
tk
_link_button_
accessible_
get_type ())
#define G
TK
_LINK_BUTTON
_ACCESSIBLE
(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G
TK
_TYPE_LINK_BUTTON
_ACCESSIBLE, GtkLinkButtonAccessible
))
#define G
TK
_LINK_BUTTON_
ACCESSIBLE_
CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G
TK
_TYPE_LINK_BUTTON
_ACCESSIBLE, GtkLinkButtonAccessible
Class))
#define G
TK
_IS_LINK_BUTTON
_ACCESSIBLE
(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G
TK
_TYPE_LINK_BUTTON
_ACCESSIBLE
))
#define G
TK
_IS_LINK_BUTTON_
ACCESSIBLE_
CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), G
TK
_TYPE_LINK_BUTTON
_ACCESSIBLE
))
#define G
TK
_LINK_BUTTON_
ACCESSIBLE_
GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G
TK
_TYPE_LINK_BUTTON
_ACCESSIBLE, GtkLinkButtonAccessible
Class))
typedef
struct
_G
ail
LinkButton
G
ail
LinkButton
;
typedef
struct
_G
ail
LinkButton
Class
GailLinkButton
Class
;
typedef
struct
_G
tk
LinkButton
Accessible
G
tk
LinkButton
Accessible
;
typedef
struct
_G
tk
LinkButton
AccessibleClass
GtkLinkButtonAccessible
Class
;
struct
_G
ail
LinkButton
struct
_G
tk
LinkButton
Accessible
{
GailButton
parent
;
AtkHyperlink
*
link
;
};
GType
gail_link_button_get_type
(
void
);
struct
_GailLinkButtonClass
struct
_GtkLinkButtonAccessibleClass
{
GailButtonClass
parent_class
;
};
GType
gtk_link_button_accessible_get_type
(
void
);
G_END_DECLS
#endif
/* __G
AIL
_LINK_BUTTON_H__ */
#endif
/* __G
TK
_LINK_BUTTON_
ACCESSIBLE_
H__ */
gtk/gtklinkbutton.c
View file @
d15319b7
...
...
@@ -63,9 +63,9 @@
#include
"gtkstock.h"
#include
"gtkshow.h"
#include
"gtktooltip.h"
#include
"gtkintl.h"
#include
"a11y/gtklinkbuttonaccessible.h"
struct
_GtkLinkButtonPrivate
{
...
...
@@ -214,6 +214,8 @@ gtk_link_button_class_init (GtkLinkButtonClass *klass)
_gtk_boolean_handled_accumulator
,
NULL
,
_gtk_marshal_BOOLEAN__VOID
,
G_TYPE_BOOLEAN
,
0
);
gtk_widget_class_set_accessible_type
(
widget_class
,
GTK_TYPE_LINK_BUTTON_ACCESSIBLE
);
}
static
void
...
...
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