diff options
| author | Alexander Kurtakov | 2015-07-09 08:06:08 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2015-07-09 08:06:08 +0000 |
| commit | f5da4a74625ea861cdc06cc02b3b1f338652ddbb (patch) | |
| tree | c2cc9b6a9c55ca59a3f0c08ba1f6cc3a6eae42ff /bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk | |
| parent | 6f7be940f221201679ce6e9e2d486a30b55d393a (diff) | |
| download | eclipse.platform.swt-f5da4a74625ea861cdc06cc02b3b1f338652ddbb.tar.gz eclipse.platform.swt-f5da4a74625ea861cdc06cc02b3b1f338652ddbb.tar.xz eclipse.platform.swt-f5da4a74625ea861cdc06cc02b3b1f338652ddbb.zip | |
Revert "Bug 470629 - [GTK] [ATK] Replace deprecated atk_role_register"
This reverts commit 6f7be940f221201679ce6e9e2d486a30b55d393a.
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java index 91e2bb1016..b976f71d26 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java @@ -40,13 +40,10 @@ class AccessibleObject { static final Hashtable<LONG, AccessibleObject> AccessibleObjects = new Hashtable<LONG, AccessibleObject> (9); static final boolean DEBUG = Device.DEBUG; - static final int ROW_ROLE; + static final int ROW_ROLE, COLUMN_ROLE; static { - //Gtk2.18 sets Atk 1.3 as minimum. ROLE_TABLE_ROW was introduced in ATK 2.1 - if (ATK.ATK_VERSION >= ATK.VERSION (2, 1, 0)) - ROW_ROLE = ATK.ATK_ROLE_TABLE_ROW; - else - ROW_ROLE = ATK.atk_role_register(Converter.wcsToMbcs(null, "row", true)); //$NON-NLS-1$ + ROW_ROLE = ATK.atk_role_register(Converter.wcsToMbcs(null, "row", true)); //$NON-NLS-1$ + COLUMN_ROLE = ATK.atk_role_register(Converter.wcsToMbcs(null, "column", true)); //$NON-NLS-1$ } AccessibleObject (long /*int*/ type, long /*int*/ widget, Accessible accessible, boolean isLightweight) { @@ -1154,11 +1151,7 @@ class AccessibleObject { case ACC.ROLE_SPLITBUTTON: return ATK.ATK_ROLE_PUSH_BUTTON; case ACC.ROLE_WINDOW: return ATK.ATK_ROLE_WINDOW; case ACC.ROLE_ROW: return ROW_ROLE; - - //COLUMN_ROLE is not used by gtk/atk/ orca screen reader. It's Win32 specific. - //gtk doesn't have a notion of selecting 'columns'. See bug 470629. - case ACC.ROLE_COLUMN: return ATK.ATK_ROLE_UNKNOWN; - + case ACC.ROLE_COLUMN: return COLUMN_ROLE; case ACC.ROLE_ALERT: return ATK.ATK_ROLE_ALERT; case ACC.ROLE_ANIMATION: return ATK.ATK_ROLE_ANIMATION; case ACC.ROLE_CANVAS: return ATK.ATK_ROLE_CANVAS; |