diff options
| author | Luke Yelavich <[email protected]> | 2016-10-08 12:22:45 +1100 |
|---|---|---|
| committer | Luke Yelavich <[email protected]> | 2016-10-11 19:36:03 +1100 |
| commit | 99a9c6e7c6a67484c029518bdb31160469627701 (patch) | |
| tree | 2d7268eb3491d3a642f2cc26654445c2df5b7343 /libcaja-private | |
| parent | 6e142d59d7408e53ab1e579dba62517b6f59e307 (diff) | |
| download | caja-99a9c6e7c6a67484c029518bdb31160469627701.tar.bz2 caja-99a9c6e7c6a67484c029518bdb31160469627701.tar.xz | |
Fix accessible object inherritance when used with GTK 3
Also disable eel accessibility code that is not needed.
Fixes https://github.com/mate-desktop/caja/issues/590
Diffstat (limited to 'libcaja-private')
| -rw-r--r-- | libcaja-private/caja-icon-container.c | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index af8de17e..44ccc05d 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -44,6 +44,9 @@ #include <eel/eel-art-extensions.h> #include <eel/eel-editable-label.h> #include <eel/eel-string.h> +#if GTK_CHECK_VERSION(3, 0, 0) +#include <eel/eel-canvas.h> +#endif #include <eel/eel-canvas-rect-ellipse.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> @@ -182,6 +185,21 @@ typedef struct static GType caja_icon_container_accessible_get_type (void); +#if GTK_CHECK_VERSION(3, 0, 0) +typedef struct _CajaIconContainerAccessible CajaIconContainerAccessible; +typedef struct _CajaIconContainerAccessibleClass CajaIconContainerAccessibleClass; + +struct _CajaIconContainerAccessible +{ + EelCanvasAccessible parent; +}; + +struct _CajaIconContainerAccessibleClass +{ + EelCanvasAccessibleClass parent_class; +}; +#endif + static void activate_selected_items (CajaIconContainer *container); static void activate_selected_items_alternate (CajaIconContainer *container, CajaIcon *icon); @@ -6272,6 +6290,7 @@ expose_event (GtkWidget *widget, } #endif +#if !GTK_CHECK_VERSION(3, 0, 0) static AtkObject * get_accessible (GtkWidget *widget) { @@ -6287,6 +6306,7 @@ get_accessible (GtkWidget *widget) return eel_accessibility_set_atk_object_return (widget, accessible); } +#endif static void grab_notify_cb (GtkWidget *widget, @@ -6730,7 +6750,11 @@ caja_icon_container_class_init (CajaIconContainerClass *class) widget_class->motion_notify_event = motion_notify_event; widget_class->key_press_event = key_press_event; widget_class->popup_menu = popup_menu; +#if GTK_CHECK_VERSION(3,2,0) + gtk_widget_class_set_accessible_type (widget_class, caja_icon_container_accessible_get_type ()); +#else widget_class->get_accessible = get_accessible; +#endif #if GTK_CHECK_VERSION(3,0,0) widget_class->style_updated = style_updated; #else @@ -10555,6 +10579,38 @@ caja_icon_container_accessible_finalize (GObject *object) G_OBJECT_CLASS (accessible_parent_class)->finalize (object); } +#if GTK_CHECK_VERSION(3,2,0) +static void +caja_icon_container_accessible_init (CajaIconContainerAccessible *accessible) +{ +} + +static void +caja_icon_container_accessible_class_init (CajaIconContainerAccessibleClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass); + + accessible_parent_class = g_type_class_peek_parent (klass); + + gobject_class->finalize = caja_icon_container_accessible_finalize; + + atk_class->get_n_children = caja_icon_container_accessible_get_n_children; + atk_class->ref_child = caja_icon_container_accessible_ref_child; + atk_class->initialize = caja_icon_container_accessible_initialize; + + accessible_private_data_quark = g_quark_from_static_string ("icon-container-accessible-private-data"); +} + +G_DEFINE_TYPE_WITH_CODE (CajaIconContainerAccessible, + caja_icon_container_accessible, + eel_canvas_accessible_get_type (), + G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, + caja_icon_container_accessible_action_interface_init) + G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, + caja_icon_container_accessible_selection_interface_init)); + +#else static void caja_icon_container_accessible_class_init (AtkObjectClass *klass) { @@ -10605,6 +10661,7 @@ caja_icon_container_accessible_get_type (void) return type; } +#endif #if ! defined (CAJA_OMIT_SELF_CHECK) |