Skip to content
GitLab
Commit 918514d5 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

First cut at GailEntry -> GtkEntryAccessible 

Replace the factory for entry and spin button with
gtk_widget_class_set_accessible_type() calls, and move then
to the GtkAccessible namespace.
parent c2d1e3ee
Expand all Hide whitespace changes
Inline Side-by-side
gtk/a11y/Makefile.am
View file @ 918514d5
......@@ -18,7 +18,7 @@ gail_c_sources = \
gailcombobox.c \
gailcontainer.c \
gailcontainercell.c \
gailentry.c \
gtkentryaccessible.c \
gailexpander.c \
gailframe.c \
gailimage.c \
......@@ -43,7 +43,7 @@ gail_c_sources = \
gailscrollbar.c \
gailscrolledwindow.c \
gailseparator.c \
gailspinbutton.c \
gtkspinbuttonaccessible.c \
gailsubmenuitem.c \
gailstatusbar.c \
gailtextcell.c \
......@@ -72,7 +72,7 @@ gail_private_h_sources = \
gailcombobox.h \
gailcontainercell.h \
gailcontainer.h \
gailentry.h \
gtkentryaccessible.h \
gailexpander.h \
gailfactory.h \
gailframe.h \
......@@ -98,7 +98,7 @@ gail_private_h_sources = \
gailscrollbar.h \
gailscrolledwindow.h \
gailseparator.h \
gailspinbutton.h \
gtkspinbuttonaccessible.h \
gailsubmenuitem.h \
gailstatusbar.h \
gailtextcell.h \
......
gtk/a11y/gail.c
View file @ 918514d5
......@@ -34,7 +34,6 @@
#include "gailcombobox.h"
#include "gailcontainer.h"
#include "gailcontainercell.h"
#include "gailentry.h"
#include "gailexpander.h"
#include "gailframe.h"
#include "gailimage.h"
......@@ -55,7 +54,6 @@
#include "gailscrollbar.h"
#include "gailscrolledwindow.h"
#include "gailseparator.h"
#include "gailspinbutton.h"
#include "gailstatusbar.h"
#include "gailtextcell.h"
#include "gailtextview.h"
......@@ -121,7 +119,6 @@ GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_TOGGLE_BUTTON, GailToggleButton, gail_toggle_b
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_IMAGE, GailImage, gail_image, GTK_TYPE_IMAGE)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_TEXT_VIEW, GailTextView, gail_text_view, GTK_TYPE_TEXT_VIEW)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_COMBO_BOX, GailComboBox, gail_combo_box, GTK_TYPE_COMBO_BOX)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_ENTRY, GailEntry, gail_entry, GTK_TYPE_ENTRY)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_MENU_SHELL, GailMenuShell, gail_menu_shell, GTK_TYPE_MENU_SHELL)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_MENU, GailMenu, gail_menu, GTK_TYPE_MENU)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_WINDOW, GailWindow, gail_window, GTK_TYPE_BIN)
......@@ -132,7 +129,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_CALENDAR, GailCalendar, gail_calendar, GTK_TYPE_CALENDAR)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_PROGRESS_BAR, GailProgressBar, gail_progress_bar, GTK_TYPE_PROGRESS_BAR)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SPIN_BUTTON, GailSpinButton, gail_spin_button, GTK_TYPE_SPIN_BUTTON)
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)
......@@ -898,7 +894,6 @@ gail_accessibility_module_init (void)
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_IMAGE, gail_image);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_TEXT_VIEW, gail_text_view);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_COMBO_BOX, gail_combo_box);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_ENTRY, gail_entry);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_MENU_BAR, gail_menu_shell);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_MENU, gail_menu);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_WINDOW, gail_window);
......@@ -909,7 +904,6 @@ gail_accessibility_module_init (void)
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_NOTEBOOK, gail_notebook);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CALENDAR, gail_calendar);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_PROGRESS_BAR, gail_progress_bar);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SPIN_BUTTON, gail_spin_button);
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);
......
gtk/a11y/gailentry.h → gtk/a11y/gtkentryaccessible.h
View file @ 918514d5
......@@ -17,25 +17,25 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef __GAIL_ENTRY_H__
#define __GAIL_ENTRY_H__
#ifndef __GTK_ENTRY_ACCESSIBLE_H__
#define __GTK_ENTRY_ACCESSIBLE_H__
#include "gailwidget.h"
#include "gailtextutil.h"
G_BEGIN_DECLS
#define GAIL_TYPE_ENTRY (gail_entry_get_type ())
#define GAIL_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_ENTRY, GailEntry))
#define GAIL_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_ENTRY, GailEntryClass))
#define GAIL_IS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_ENTRY))
#define GAIL_IS_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_ENTRY))
#define GAIL_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_ENTRY, GailEntryClass))
#define GTK_TYPE_ENTRY_ACCESSIBLE (gtk_entry_accessible_get_type ())
#define GTK_ENTRY_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY_ACCESSIBLE, GtkEntryAccessible))
#define GTK_ENTRY_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ENTRY_ACCESSIBLE, GtkEntryAccessibleClass))
#define GTK_IS_ENTRY_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ENTRY_ACCESSIBLE))
#define GTK_IS_ENTRY_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ENTRY_ACCESSIBLE))
#define GTK_ENTRY_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ENTRY_ACCESSIBLE, GtkEntryAccessibleClass))
typedef struct _GailEntry GailEntry;
typedef struct _GailEntryClass GailEntryClass;
typedef struct _GtkEntryAccessible GtkEntryAccessible;
typedef struct _GtkEntryAccessibleClass GtkEntryAccessibleClass;
struct _GailEntry
struct _GtkEntryAccessible
{
GailWidget parent;
......@@ -57,13 +57,13 @@ struct _GailEntry
guint insert_idle_handler;
};
GType gail_entry_get_type (void);
GType gtk_entry_accessible_get_type (void);
struct _GailEntryClass
struct _GtkEntryAccessibleClass
{
GailWidgetClass parent_class;
};
G_END_DECLS
#endif /* __GAIL_ENTRY_H__ */
#endif /* __GTK_ENTRY_ACCESSIBLE_H__ */
gtk/a11y/gailspinbutton.c → gtk/a11y/gtkspinbuttonaccessible.c
View file @ 918514d5
......@@ -21,39 +21,38 @@
#include <string.h>
#include <gtk/gtk.h>
#include "gailspinbutton.h"
#include "gtkspinbuttonaccessible.h"
#include "gailadjustment.h"
#include "gail-private-macros.h"
static void gail_spin_button_class_init (GailSpinButtonClass *klass);
static void gail_spin_button_init (GailSpinButton *button);
static void gail_spin_button_real_initialize (AtkObject *obj,
static void gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass);
static void gtk_spin_button_accessible_init (GtkSpinButtonAccessible *button);
static void gtk_spin_button_accessible_real_initialize (AtkObject *obj,
gpointer data);
static void gail_spin_button_finalize (GObject *object);
static void gtk_spin_button_accessible_finalize (GObject *object);
static void atk_value_interface_init (AtkValueIface *iface);
static void gail_spin_button_real_notify_gtk (GObject *obj,
static void gtk_spin_button_accessible_real_notify_gtk (GObject *obj,
GParamSpec *pspec);
static void gail_spin_button_get_current_value (AtkValue *obj,
static void gtk_spin_button_accessible_get_current_value (AtkValue *obj,
GValue *value);
static void gail_spin_button_get_maximum_value (AtkValue *obj,
static void gtk_spin_button_accessible_get_maximum_value (AtkValue *obj,
GValue *value);
static void gail_spin_button_get_minimum_value (AtkValue *obj,
static void gtk_spin_button_accessible_get_minimum_value (AtkValue *obj,
GValue *value);
static void gail_spin_button_get_minimum_increment (AtkValue *obj,
static void gtk_spin_button_accessible_get_minimum_increment (AtkValue *obj,
GValue *value);
static gboolean gail_spin_button_set_current_value (AtkValue *obj,
static gboolean gtk_spin_button_accessible_set_current_value (AtkValue *obj,
const GValue *value);
static void gail_spin_button_value_changed (GtkAdjustment *adjustment,
static void gtk_spin_button_accessible_value_changed (GtkAdjustment *adjustment,
gpointer data);
G_DEFINE_TYPE_WITH_CODE (GailSpinButton, gail_spin_button, GAIL_TYPE_ENTRY,
G_DEFINE_TYPE_WITH_CODE (GtkSpinButtonAccessible, gtk_spin_button_accessible, GTK_TYPE_ENTRY_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
static void
gail_spin_button_class_init (GailSpinButtonClass *klass)
gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
......@@ -61,27 +60,27 @@ gail_spin_button_class_init (GailSpinButtonClass *klass)
widget_class = (GailWidgetClass*)klass;
widget_class->notify_gtk = gail_spin_button_real_notify_gtk;
widget_class->notify_gtk = gtk_spin_button_accessible_real_notify_gtk;
class->initialize = gail_spin_button_real_initialize;
class->initialize = gtk_spin_button_accessible_real_initialize;
gobject_class->finalize = gail_spin_button_finalize;
gobject_class->finalize = gtk_spin_button_accessible_finalize;
}
static void
gail_spin_button_init (GailSpinButton *button)
gtk_spin_button_accessible_init (GtkSpinButtonAccessible *button)
{
}
static void
gail_spin_button_real_initialize (AtkObject *obj,
gtk_spin_button_accessible_real_initialize (AtkObject *obj,
gpointer data)
{
GtkAdjustment *adjustment;
GailSpinButton *spin_button = GAIL_SPIN_BUTTON (obj);
GtkSpinButtonAccessible *spin_button = GTK_SPIN_BUTTON_ACCESSIBLE (obj);
GtkSpinButton *gtk_spin_button;
ATK_OBJECT_CLASS (gail_spin_button_parent_class)->initialize (obj, data);
ATK_OBJECT_CLASS (gtk_spin_button_accessible_parent_class)->initialize (obj, data);
gtk_spin_button = GTK_SPIN_BUTTON (data);
/*
......@@ -94,7 +93,7 @@ gail_spin_button_real_initialize (AtkObject *obj,
spin_button->adjustment = gail_adjustment_new (adjustment);
g_signal_connect (adjustment,
"value-changed",
G_CALLBACK (gail_spin_button_value_changed),
G_CALLBACK (gtk_spin_button_accessible_value_changed),
obj);
}
else
......@@ -107,22 +106,20 @@ gail_spin_button_real_initialize (AtkObject *obj,
static void
atk_value_interface_init (AtkValueIface *iface)
{
iface->get_current_value = gail_spin_button_get_current_value;
iface->get_maximum_value = gail_spin_button_get_maximum_value;
iface->get_minimum_value = gail_spin_button_get_minimum_value;
iface->get_minimum_increment = gail_spin_button_get_minimum_increment;
iface->set_current_value = gail_spin_button_set_current_value;
iface->get_current_value = gtk_spin_button_accessible_get_current_value;
iface->get_maximum_value = gtk_spin_button_accessible_get_maximum_value;
iface->get_minimum_value = gtk_spin_button_accessible_get_minimum_value;
iface->get_minimum_increment = gtk_spin_button_accessible_get_minimum_increment;
iface->set_current_value = gtk_spin_button_accessible_set_current_value;
}
static void
gail_spin_button_get_current_value (AtkValue *obj,
gtk_spin_button_accessible_get_current_value (AtkValue *obj,
GValue *value)
{
GailSpinButton *spin_button;
GtkSpinButtonAccessible *spin_button;
g_return_if_fail (GAIL_IS_SPIN_BUTTON (obj));
spin_button = GAIL_SPIN_BUTTON (obj);
spin_button = GTK_SPIN_BUTTON_ACCESSIBLE (obj);
if (spin_button->adjustment == NULL)
/*
* Adjustment has not been specified
......@@ -133,14 +130,12 @@ gail_spin_button_get_current_value (AtkValue *obj,
}
static void
gail_spin_button_get_maximum_value (AtkValue *obj,
gtk_spin_button_accessible_get_maximum_value (AtkValue *obj,
GValue *value)
{
GailSpinButton *spin_button;
g_return_if_fail (GAIL_IS_SPIN_BUTTON (obj));
GtkSpinButtonAccessible *spin_button;
spin_button = GAIL_SPIN_BUTTON (obj);
spin_button = GTK_SPIN_BUTTON_ACCESSIBLE (obj);
if (spin_button->adjustment == NULL)
/*
* Adjustment has not been specified
......@@ -151,14 +146,12 @@ gail_spin_button_get_maximum_value (AtkValue *obj,
}
static void
gail_spin_button_get_minimum_value (AtkValue *obj,
gtk_spin_button_accessible_get_minimum_value (AtkValue *obj,
GValue *value)
{
GailSpinButton *spin_button;
g_return_if_fail (GAIL_IS_SPIN_BUTTON (obj));
GtkSpinButtonAccessible *spin_button;
spin_button = GAIL_SPIN_BUTTON (obj);
spin_button = GTK_SPIN_BUTTON_ACCESSIBLE (obj);
if (spin_button->adjustment == NULL)
/*
* Adjustment has not been specified
......@@ -169,13 +162,11 @@ gail_spin_button_get_minimum_value (AtkValue *obj,
}
static void
gail_spin_button_get_minimum_increment (AtkValue *obj, GValue *value)
gtk_spin_button_accessible_get_minimum_increment (AtkValue *obj, GValue *value)
{
GailSpinButton *spin_button;
GtkSpinButtonAccessible *spin_button;
g_return_if_fail (GAIL_IS_SPIN_BUTTON (obj));
spin_button = GAIL_SPIN_BUTTON (obj);
spin_button = GTK_SPIN_BUTTON_ACCESSIBLE (obj);
if (spin_button->adjustment == NULL)
/*
* Adjustment has not been specified
......@@ -186,14 +177,12 @@ gail_spin_button_get_minimum_increment (AtkValue *obj, GValue *value)
}
static gboolean
gail_spin_button_set_current_value (AtkValue *obj,
gtk_spin_button_accessible_set_current_value (AtkValue *obj,
const GValue *value)
{
GailSpinButton *spin_button;
g_return_val_if_fail (GAIL_IS_SPIN_BUTTON (obj), FALSE);
GtkSpinButtonAccessible *spin_button;
spin_button = GAIL_SPIN_BUTTON (obj);
spin_button = GTK_SPIN_BUTTON_ACCESSIBLE (obj);
if (spin_button->adjustment == NULL)
/*
* Adjustment has not been specified
......@@ -204,25 +193,25 @@ gail_spin_button_set_current_value (AtkValue *obj,
}
static void
gail_spin_button_finalize (GObject *object)
gtk_spin_button_accessible_finalize (GObject *object)
{
GailSpinButton *spin_button = GAIL_SPIN_BUTTON (object);
GtkSpinButtonAccessible *spin_button = GTK_SPIN_BUTTON_ACCESSIBLE (object);
if (spin_button->adjustment)
{
g_object_unref (spin_button->adjustment);
spin_button->adjustment = NULL;
}
G_OBJECT_CLASS (gail_spin_button_parent_class)->finalize (object);
G_OBJECT_CLASS (gtk_spin_button_accessible_parent_class)->finalize (object);
}
static void
gail_spin_button_real_notify_gtk (GObject *obj,
gtk_spin_button_accessible_real_notify_gtk (GObject *obj,
GParamSpec *pspec)
{
GtkWidget *widget = GTK_WIDGET (obj);
GailSpinButton *spin_button = GAIL_SPIN_BUTTON (gtk_widget_get_accessible (widget));
GtkSpinButtonAccessible *spin_button = GTK_SPIN_BUTTON_ACCESSIBLE (gtk_widget_get_accessible (widget));
if (strcmp (pspec->name, "adjustment") == 0)
{
......@@ -247,24 +236,24 @@ gail_spin_button_real_notify_gtk (GObject *obj,
spin_button->adjustment = gail_adjustment_new (adjustment);
g_signal_connect (adjustment,
"value-changed",
G_CALLBACK (gail_spin_button_value_changed),
G_CALLBACK (gtk_spin_button_accessible_value_changed),
spin_button);
}
else
GAIL_WIDGET_CLASS (gail_spin_button_parent_class)->notify_gtk (obj, pspec);
GAIL_WIDGET_CLASS (gtk_spin_button_accessible_parent_class)->notify_gtk (obj, pspec);
}
static void
gail_spin_button_value_changed (GtkAdjustment *adjustment,
gtk_spin_button_accessible_value_changed (GtkAdjustment *adjustment,
gpointer data)
{
GailSpinButton *spin_button;
GtkSpinButtonAccessible *spin_button;
gail_return_if_fail (adjustment != NULL);
gail_return_if_fail (data != NULL);
if (adjustment == NULL || data == NULL)
return;
spin_button = GAIL_SPIN_BUTTON (data);
spin_button = GTK_SPIN_BUTTON_ACCESSIBLE (data);
g_object_notify (G_OBJECT (spin_button), "accessible-value");
}
......
gtk/a11y/gailspinbutton.h → gtk/a11y/gtkspinbuttonaccessible.h
View file @ 918514d5
......@@ -17,37 +17,37 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef __GAIL_SPIN_BUTTON_H__
#define __GAIL_SPIN_BUTTON_H__
#ifndef __GTK_SPIN_BUTTON_ACCESSIBLE_H__
#define __GTK_SPIN_BUTTON_ACCESSIBLE_H__
#include "gailentry.h"
#include "gtkentryaccessible.h"
G_BEGIN_DECLS
#define GAIL_TYPE_SPIN_BUTTON (gail_spin_button_get_type ())
#define GAIL_SPIN_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SPIN_BUTTON, GailSpinButton))
#define GAIL_SPIN_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_SPIN_BUTTON, GailSpinButtonClass))
#define GAIL_IS_SPIN_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_SPIN_BUTTON))
#define GAIL_IS_SPIN_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_SPIN_BUTTON))
#define GAIL_SPIN_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_SPIN_BUTTON, GailSpinButtonClass))
#define GTK_TYPE_SPIN_BUTTON_ACCESSIBLE (gtk_spin_button_accessible_get_type ())
#define GTK_SPIN_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE, GtkSpinButtonAccessible))
#define GTK_SPIN_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE, GtkSpinButtonAccessibleClass))
#define GTK_IS_SPIN_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE))
#define GTK_IS_SPIN_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE))
#define GTK_SPIN_BUTTON_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE, GtkSpinButtonAccessibleClass))
typedef struct _GailSpinButton GailSpinButton;
typedef struct _GailSpinButtonClass GailSpinButtonClass;
typedef struct _GtkSpinButtonAccessible GtkSpinButtonAccessible;
typedef struct _GtkSpinButtonAccessibleClass GtkSpinButtonAccessibleClass;
struct _GailSpinButton
struct _GtkSpinButtonAccessible
{
GailEntry parent;
GtkEntryAccessible parent;
AtkObject *adjustment;
};
GType gail_spin_button_get_type (void);
struct _GailSpinButtonClass
struct _GtkSpinButtonAccessibleClass
{
GailEntryClass parent_class;
GtkEntryAccessibleClass parent_class;
};
GType gtk_spin_button_accessible_get_type (void);
G_END_DECLS
#endif /* __GAIL_SPIN_BUTTON_H__ */
#endif /* __GTK_SPIN_BUTTON_ACCESSIBLE_H__ */
gtk/gtkentry.c
View file @ 918514d5
......@@ -67,6 +67,8 @@
#include "gtkwidgetprivate.h"
#include "gtkstylecontextprivate.h"
#include "a11y/gtkentryaccessible.h"
/**
* SECTION:gtkentry
* @Short_description: A single line text entry field
......@@ -1870,6 +1872,8 @@ gtk_entry_class_init (GtkEntryClass *class)
GTK_PARAM_READABLE));
g_type_class_add_private (gobject_class, sizeof (GtkEntryPrivate));
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE);
}
static void
......
gtk/gtkspinbutton.c
View file @ 918514d5
......@@ -45,6 +45,8 @@
#include "gtkintl.h"
#include "gtktypebuiltins.h"
#include "a11y/gtkspinbuttonaccessible.h"
#define MIN_SPIN_BUTTON_WIDTH 30
#define MAX_TIMER_CALLS 5
#define EPSILON 1e-10
......@@ -507,6 +509,8 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
add_spin_binding (binding_set, GDK_KEY_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_START);
g_type_class_add_private (class, sizeof (GtkSpinButtonPrivate));
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SPIN_BUTTON_ACCESSIBLE);
}
static void
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment