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
a129392b
Commit
a129392b
authored
Jun 26, 2011
by
Matthias Clasen
Browse files
Convert GailFrame to GtkFrameAccessible
parent
1ef996ca
Changes
5
Hide whitespace changes
Inline
Side-by-side
gtk/a11y/Makefile.am
View file @
a129392b
...
...
@@ -18,7 +18,7 @@ gail_c_sources = \
gailcontainercell.c
\
gtkentryaccessible.c
\
gailexpander.c
\
g
ail
frame.c
\
g
tk
frame
accessible
.c
\
gailimage.c
\
gailimagecell.c
\
gtklabelaccessible.c
\
...
...
@@ -70,7 +70,7 @@ gail_private_h_sources = \
gtkentryaccessible.h
\
gailexpander.h
\
gailfactory.h
\
g
ail
frame.h
\
g
tk
frame
accessible
.h
\
gailimage.h
\
gailimagecell.h
\
gtklabelaccessible.h
\
...
...
gtk/a11y/gail.c
View file @
a129392b
...
...
@@ -32,7 +32,6 @@
#include
"gailcontainer.h"
#include
"gailcontainercell.h"
#include
"gailexpander.h"
#include
"gailframe.h"
#include
"gailimage.h"
#include
"gailimagecell.h"
#include
"gaillinkbutton.h"
...
...
@@ -121,7 +120,6 @@ GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_STATUSBAR, GailStatusbar, gail_statusbar, GTK_
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_NOTEBOOK
,
GailNotebook
,
gail_notebook
,
GTK_TYPE_NOTEBOOK
)
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_PROGRESS_BAR
,
GailProgressBar
,
gail_progress_bar
,
GTK_TYPE_PROGRESS_BAR
)
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_TREE_VIEW
,
GailTreeView
,
gail_tree_view
,
GTK_TYPE_TREE_VIEW
)
GAIL_IMPLEMENT_FACTORY
(
GAIL_TYPE_FRAME
,
GailFrame
,
gail_frame
,
GTK_TYPE_FRAME
)
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
)
...
...
@@ -890,7 +888,6 @@ gail_accessibility_module_init (void)
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_NOTEBOOK
,
gail_notebook
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_PROGRESS_BAR
,
gail_progress_bar
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_TREE_VIEW
,
gail_tree_view
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_FRAME
,
gail_frame
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_CELL_RENDERER_TEXT
,
gail_text_cell
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_CELL_RENDERER_TOGGLE
,
gail_boolean_cell
);
GAIL_WIDGET_SET_FACTORY
(
GTK_TYPE_CELL_RENDERER_PIXBUF
,
gail_image_cell
);
...
...
gtk/a11y/g
ail
frame.c
→
gtk/a11y/g
tk
frame
accessible
.c
View file @
a129392b
...
...
@@ -21,65 +21,47 @@
#include
<string.h>
#include
<gtk/gtk.h>
#include
"g
ail
frame.h"
#include
"g
tk
frame
accessible
.h"
static
void
gail_frame_class_init
(
GailFrameClass
*
klass
);
static
void
gail_frame_init
(
GailFrame
*
frame
);
static
void
gail_frame_initialize
(
AtkObject
*
accessible
,
gpointer
data
);
static
const
gchar
*
gail_frame_get_name
(
AtkObject
*
obj
);
G_DEFINE_TYPE
(
G
ail
Frame
,
gail_fram
e
,
GAIL_TYPE_CONTAINER
)
G_DEFINE_TYPE
(
G
tk
Frame
Accessible
,
gtk_frame_accessibl
e
,
GAIL_TYPE_CONTAINER
)
static
void
gail_frame_class_init
(
GailFrameClass
*
klass
)
gtk_frame_accessible_initialize
(
AtkObject
*
accessible
,
gpointer
data
)
{
A
tkObjectClass
*
class
=
ATK_OBJECT_CLASS
(
klass
);
A
TK_OBJECT_CLASS
(
gtk_frame_accessible_parent_class
)
->
initialize
(
accessible
,
data
);
class
->
initialize
=
gail_frame_initialize
;
class
->
get_name
=
gail_frame_get_name
;
accessible
->
role
=
ATK_ROLE_PANEL
;
}
static
void
g
ail
_frame_
init
(
GailFrame
*
frame
)
static
const
gchar
*
g
tk
_frame_
accessible_get_name
(
AtkObject
*
obj
)
{
const
gchar
*
name
;
GtkWidget
*
widget
;
widget
=
gtk_accessible_get_widget
(
GTK_ACCESSIBLE
(
obj
));
if
(
widget
==
NULL
)
return
NULL
;
name
=
ATK_OBJECT_CLASS
(
gtk_frame_accessible_parent_class
)
->
get_name
(
obj
);
if
(
name
!=
NULL
)
return
name
;
return
gtk_frame_get_label
(
GTK_FRAME
(
widget
));
}
static
void
gail_frame_initialize
(
AtkObject
*
accessible
,
gpointer
data
)
gtk_frame_accessible_class_init
(
GtkFrameAccessibleClass
*
klass
)
{
A
TK_OBJECT_CLASS
(
gail_frame_parent_class
)
->
initialize
(
accessible
,
data
);
A
tkObjectClass
*
class
=
ATK_OBJECT_CLASS
(
klass
);
accessible
->
role
=
ATK_ROLE_PANEL
;
class
->
initialize
=
gtk_frame_accessible_initialize
;
class
->
get_name
=
gtk_frame_accessible_get_name
;
}
static
const
gchar
*
g
ail
_frame_
get_name
(
AtkObject
*
obj
)
static
void
g
tk
_frame_
accessible_init
(
GtkFrameAccessible
*
frame
)
{
const
gchar
*
name
;
g_return_val_if_fail
(
GAIL_IS_FRAME
(
obj
),
NULL
);
name
=
ATK_OBJECT_CLASS
(
gail_frame_parent_class
)
->
get_name
(
obj
);
if
(
name
!=
NULL
)
{
return
name
;
}
else
{
/*
* Get the text on the label
*/
GtkWidget
*
widget
;
widget
=
gtk_accessible_get_widget
(
GTK_ACCESSIBLE
(
obj
));
if
(
widget
==
NULL
)
{
/*
* State is defunct
*/
return
NULL
;
}
return
gtk_frame_get_label
(
GTK_FRAME
(
widget
));
}
}
gtk/a11y/g
ail
frame.h
→
gtk/a11y/g
tk
frame
accessible
.h
View file @
a129392b
...
...
@@ -17,35 +17,35 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef __G
AIL
_FRAME_H__
#define __G
AIL
_FRAME_H__
#ifndef __G
TK
_FRAME_
ACCESSIBLE_
H__
#define __G
TK
_FRAME_
ACCESSIBLE_
H__
#include
"gailcontainer.h"
G_BEGIN_DECLS
#define G
AIL
_TYPE_FRAME (g
ail
_frame_get_type ())
#define G
AIL
_FRAME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G
AIL
_TYPE_FRAME, G
ail
Frame))
#define G
AIL
_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G
AIL
_TYPE_FRAME, G
ail
FrameClass))
#define G
AIL
_IS_FRAME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G
AIL
_TYPE_FRAME))
#define G
AIL
_IS_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), G
AIL
_TYPE_FRAME))
#define G
AIL
_FRAME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G
AIL
_TYPE_FRAME, G
ail
FrameClass))
#define G
TK
_TYPE_FRAME
_ACCESSIBLE
(g
tk
_frame_
accessible_
get_type ())
#define G
TK
_FRAME
_ACCESSIBLE
(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G
TK
_TYPE_FRAME
_ACCESSIBLE
, G
tk
Frame
Accessible
))
#define G
TK
_FRAME_
ACCESSIBLE_
CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G
TK
_TYPE_FRAME
_ACCESSIBLE
, G
tk
Frame
Accessible
Class))
#define G
TK
_IS_FRAME
_ACCESSIBLE
(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G
TK
_TYPE_FRAME
_ACCESSIBLE
))
#define G
TK
_IS_FRAME_
ACCESSIBLE_
CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), G
TK
_TYPE_FRAME
_ACCESSIBLE
))
#define G
TK
_FRAME_
ACCESSIBLE_
GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G
TK
_TYPE_FRAME
_ACCESSIBLE
, G
tk
Frame
Accessible
Class))
typedef
struct
_G
ail
Frame
G
ail
Frame
;
typedef
struct
_G
ail
Frame
Class
GailFram
eClass
;
typedef
struct
_G
tk
Frame
Accessible
G
tk
Frame
Accessible
;
typedef
struct
_G
tk
Frame
AccessibleClass
GtkFrameAccessibl
eClass
;
struct
_G
ail
Frame
struct
_G
tk
Frame
Accessible
{
GailContainer
parent
;
};
GType
gail_frame_get_type
(
void
);
struct
_GailFrameClass
struct
_GtkFrameAccessibleClass
{
GailContainerClass
parent_class
;
};
GType
gtk_frame_accessible_get_type
(
void
);
G_END_DECLS
#endif
/* __G
AIL
_FRAME_H__ */
#endif
/* __G
TK
_FRAME_
ACCESSIBLE_
H__ */
gtk/gtkframe.c
View file @
a129392b
...
...
@@ -33,6 +33,7 @@
#include
"gtkintl.h"
#include
"gtkbuildable.h"
#include
"a11y/gtkframeaccessible.h"
/**
* SECTION:gtkframe
...
...
@@ -221,6 +222,8 @@ gtk_frame_class_init (GtkFrameClass *class)
class
->
compute_child_allocation
=
gtk_frame_real_compute_child_allocation
;
g_type_class_add_private
(
class
,
sizeof
(
GtkFramePrivate
));
gtk_widget_class_set_accessible_type
(
widget_class
,
GTK_TYPE_FRAME_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