Mercurial > projects > dwt-linux
annotate dwt/accessibility/AccessibleFactory.d @ 259:c0d810de7093
Update SWT 3.4M7 to 3.4
author | Frank Benoit <benoit@tionex.de> |
---|---|
date | Sun, 29 Jun 2008 14:33:38 +0200 |
parents | 5a30aa9820f3 |
children | 4bffbf81e2d6 |
rev | line source |
---|---|
72 | 1 /******************************************************************************* |
42 | 2 * Copyright (c) 2000, 2006 IBM Corporation and others. |
3 * All rights reserved. This program and the accompanying materials | |
4 * are made available under the terms of the Eclipse Public License v1.0 | |
5 * which accompanies this distribution, and is available at | |
6 * http://www.eclipse.org/legal/epl-v10.html | |
7 * | |
8 * Contributors: | |
9 * IBM Corporation - initial API and implementation | |
72 | 10 * Port to the D programming language: |
11 * Frank Benoit <benoit@tionex.de> | |
42 | 12 *******************************************************************************/ |
13 module dwt.accessibility.AccessibleFactory; | |
14 | |
238 | 15 import dwt.dwthelper.utils; |
16 | |
42 | 17 |
18 import dwt.internal.accessibility.gtk.ATK; | |
19 import dwt.internal.gtk.OS; | |
20 import dwt.accessibility.Accessible; | |
21 import dwt.accessibility.ACC; | |
22 import dwt.accessibility.AccessibleObject; | |
23 import dwt.accessibility.AccessibleControlEvent; | |
24 import dwt.accessibility.AccessibleControlListener; | |
25 | |
71 | 26 import dwt.DWT; |
42 | 27 |
28 import tango.io.Stdout; | |
29 | |
30 class AccessibleFactory { | |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
31 AtkObjectFactory * handle; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
32 uint objectParentType; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
33 char* widgetTypeName; |
42 | 34 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
35 //Callback atkObjectFactoryCB_create_accessible; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
36 //Callback gTypeInfo_base_init_factory; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
37 Accessible[GtkWidget*] accessibles; |
42 | 38 |
238 | 39 static long[String] Types; |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
40 static AccessibleFactory[long] Factories; |
42 | 41 |
54 | 42 static uint DefaultParentType; //$NON-NLS-1$ |
238 | 43 static const String FACTORY_PARENTTYPENAME = "AtkObjectFactory"; |
44 static const String SWT_TYPE_PREFIX = "DWT"; | |
45 static const String CHILD_TYPENAME = "Child"; | |
46 static const String FACTORY_TYPENAME = "SWTFactory"; | |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
47 static const int[] actionRoles = [ |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
48 ACC.ROLE_CHECKBUTTON, ACC.ROLE_COMBOBOX, ACC.ROLE_LINK, |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
49 ACC.ROLE_MENUITEM, ACC.ROLE_PUSHBUTTON, ACC.ROLE_RADIOBUTTON, |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
50 ]; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
51 static const int[] hypertextRoles = [ACC.ROLE_LINK]; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
52 static const int[] selectionRoles = [ |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
53 ACC.ROLE_LIST, ACC.ROLE_TABFOLDER, ACC.ROLE_TABLE, ACC.ROLE_TREE, |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
54 ]; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
55 static const int[] textRoles = [ |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
56 ACC.ROLE_COMBOBOX, ACC.ROLE_LINK, ACC.ROLE_LABEL, ACC.ROLE_TEXT, |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
57 ]; |
42 | 58 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
59 /* AT callbacks*/ |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
60 /* interface definitions */ |
104 | 61 private static GTypeInfo* ObjectIfaceDefinition; |
62 private static GInterfaceInfo* ActionIfaceDefinition; | |
63 private static GInterfaceInfo* ComponentIfaceDefinition; | |
64 private static GInterfaceInfo* HypertextIfaceDefinition; | |
65 private static GInterfaceInfo* SelectionIfaceDefinition; | |
66 private static GInterfaceInfo* TextIfaceDefinition; | |
42 | 67 |
104 | 68 private static synchronized void static_this(){ |
69 AccessibleObject.static_this(); | |
70 /* Action interface */ | |
71 if( ActionIfaceDefinition is null ){ | |
54 | 72 DefaultParentType = OS.g_type_from_name ("GtkAccessible"); //$NON-NLS-1$ |
73 ActionIfaceDefinition = cast(GInterfaceInfo*)OS.g_malloc (GInterfaceInfo.sizeof); | |
74 ActionIfaceDefinition.interface_init = &AccessibleFactory.initActionIfaceCB; | |
104 | 75 } |
76 /* Component interface */ | |
77 if( ComponentIfaceDefinition is null ){ | |
54 | 78 ComponentIfaceDefinition = cast(GInterfaceInfo*)OS.g_malloc (GInterfaceInfo.sizeof); |
79 ComponentIfaceDefinition.interface_init = &AccessibleFactory.initComponentIfaceCB; | |
104 | 80 } |
81 /* Hypertext interface */ | |
82 if( HypertextIfaceDefinition is null ){ | |
54 | 83 HypertextIfaceDefinition = cast(GInterfaceInfo*)OS.g_malloc (GInterfaceInfo.sizeof); |
84 HypertextIfaceDefinition.interface_init = &AccessibleFactory.initHypertextIfaceCB; | |
104 | 85 } |
86 /* Selection interface */ | |
87 if( SelectionIfaceDefinition is null ){ | |
54 | 88 SelectionIfaceDefinition = cast(GInterfaceInfo*)OS.g_malloc (GInterfaceInfo.sizeof); |
89 SelectionIfaceDefinition.interface_init = &AccessibleFactory.initSelectionIfaceCB; | |
104 | 90 } |
91 /* Text interface */ | |
92 if( TextIfaceDefinition is null ){ | |
54 | 93 TextIfaceDefinition =cast(GInterfaceInfo*) OS.g_malloc (GInterfaceInfo.sizeof); |
94 TextIfaceDefinition.interface_init = &AccessibleFactory.initTextIfaceCB; | |
104 | 95 } |
54 | 96 } |
42 | 97 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
98 private this (int /*long*/ widgetType) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
99 widgetTypeName = OS.g_type_name (widgetType); |
238 | 100 String factoryName = FACTORY_TYPENAME ~ fromStringz( widgetTypeName ) ~ \0; |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
101 if (OS.g_type_from_name (factoryName.ptr) is 0) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
102 /* register the factory */ |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
103 auto registry = ATK.atk_get_default_registry (); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
104 auto previousFactory = ATK.atk_registry_get_factory (registry, widgetType); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
105 objectParentType = ATK.atk_object_factory_get_accessible_type (previousFactory); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
106 if (objectParentType is 0) objectParentType = DefaultParentType; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
107 auto factoryParentType = OS.g_type_from_name (FACTORY_PARENTTYPENAME.ptr); |
42 | 108 auto typeInfo = cast(GTypeInfo*) OS.g_malloc (GTypeInfo.sizeof); |
109 typeInfo.base_init = &gTypeInfo_base_init_factory; | |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
110 typeInfo.class_size = AtkObjectFactoryClass.sizeof; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
111 typeInfo.instance_size = AtkObjectFactory.sizeof; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
112 auto swtFactoryType = OS.g_type_register_static (factoryParentType, factoryName.ptr, typeInfo, 0); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
113 ATK.atk_registry_set_factory_type (registry, widgetType, swtFactoryType); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
114 handle = ATK.atk_registry_get_factory (registry, widgetType); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
115 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
116 } |
42 | 117 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
118 void addAccessible (Accessible accessible) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
119 auto controlHandle = accessible.getControlHandle (); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
120 accessibles[controlHandle] = accessible; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
121 ATK.atk_object_factory_create_accessible (handle, cast(GObject*)controlHandle); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
122 } |
42 | 123 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
124 private static extern(C) AtkObject* atkObjectFactory_create_accessible (GObject* widget) { |
42 | 125 auto widgetType = OS.G_OBJECT_TYPE ( cast(GTypeInstance*)widget); |
126 if( auto factory = widgetType in Factories ){ | |
127 with( *factory ){ | |
128 Accessible accessible = accessibles[ cast(GtkWidget*) widget ]; | |
129 if (accessible is null) { | |
130 /* | |
131 * we don't care about this control, so create it with the parent's | |
132 * type so that its accessibility callbacks will not pass though here | |
133 */ | |
134 auto result = cast(AtkObject*) OS.g_object_new (objectParentType, null); | |
135 ATK.atk_object_initialize (result, cast(void*)widget); | |
136 return result; | |
137 } | |
138 /* if an atk object has already been created for this widget then just return it */ | |
139 if (accessible.accessibleObject !is null) { | |
140 return accessible.accessibleObject.handle; | |
141 } | |
238 | 142 String buffer = fromStringz( widgetTypeName ).dup; |
42 | 143 auto type = getType (buffer, accessible, objectParentType, ACC.CHILDID_SELF); |
144 AccessibleObject object = new AccessibleObject (type, cast(GtkWidget*)widget, accessible, objectParentType, false); | |
145 accessible.accessibleObject = object; | |
146 return object.handle; | |
147 } | |
148 } | |
149 else{ | |
150 Stdout.formatln( "AccessibleFactory.atkObjectFactoryCB_create_accessible cannot find factory instance" ); | |
151 } | |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
152 } |
42 | 153 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
154 static int /*long*/ getChildType (Accessible accessible, int childIndex) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
155 return getType (CHILD_TYPENAME, accessible, DefaultParentType, childIndex); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
156 } |
42 | 157 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
158 static int /*long*/ getDefaultParentType () { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
159 return DefaultParentType; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
160 } |
42 | 161 |
238 | 162 static int /*long*/ getType (String widgetTypeName, Accessible accessible, int /*long*/ parentType, int childId) { |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
163 AccessibleControlEvent event = new AccessibleControlEvent (accessible); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
164 event.childID = childId; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
165 AccessibleControlListener[] listeners = accessible.getControlListeners (); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
166 for (int i = 0; i < listeners.length; i++) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
167 listeners [i].getRole (event); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
168 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
169 bool action = false, hypertext = false, selection = false, text = false; |
259 | 170 if (event.detail !is 0) { /* a role was specified */ |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
171 for (int i = 0; i < actionRoles.length; i++) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
172 if (event.detail is actionRoles [i]) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
173 action = true; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
174 break; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
175 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
176 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
177 for (int i = 0; i < hypertextRoles.length; i++) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
178 if (event.detail is hypertextRoles [i]) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
179 hypertext = true; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
180 break; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
181 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
182 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
183 for (int i = 0; i < selectionRoles.length; i++) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
184 if (event.detail is selectionRoles [i]) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
185 selection = true; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
186 break; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
187 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
188 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
189 for (int i = 0; i < textRoles.length; i++) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
190 if (event.detail is textRoles [i]) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
191 text = true; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
192 break; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
193 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
194 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
195 } else { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
196 action = hypertext = selection = text = true; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
197 } |
238 | 198 String swtTypeName = SWT_TYPE_PREFIX.dup; |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
199 swtTypeName ~= widgetTypeName; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
200 if (action) swtTypeName ~= "Action"; //$NON-NLS-1$ |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
201 if (hypertext) swtTypeName ~= "Hypertext"; //$NON-NLS-1$ |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
202 if (selection) swtTypeName ~= "Selection"; //$NON-NLS-1$ |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
203 if (text) swtTypeName ~= "Text"; //$NON-NLS-1$ |
42 | 204 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
205 int /*long*/ type = 0; |
42 | 206 if (swtTypeName in Types ) { |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
207 type = Types[swtTypeName]; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
208 } else { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
209 /* define the type */ |
42 | 210 GTypeQuery* query = new GTypeQuery (); |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
211 OS.g_type_query (parentType, query); |
42 | 212 |
213 GTypeInfo* typeInfo = new GTypeInfo (); | |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
214 typeInfo.base_init = &gTypeInfo_base_init_type; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
215 typeInfo.class_size = query.class_size; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
216 typeInfo.instance_size = query.instance_size; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
217 ObjectIfaceDefinition = typeInfo; |
42 | 218 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
219 type = OS.g_type_register_static (parentType, toStringz( swtTypeName ), ObjectIfaceDefinition, 0); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
220 OS.g_type_add_interface_static (type, AccessibleObject.ATK_COMPONENT_TYPE, ComponentIfaceDefinition); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
221 if (action) OS.g_type_add_interface_static (type, AccessibleObject.ATK_ACTION_TYPE, ActionIfaceDefinition); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
222 if (hypertext) OS.g_type_add_interface_static (type, AccessibleObject.ATK_HYPERTEXT_TYPE, HypertextIfaceDefinition); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
223 if (selection) OS.g_type_add_interface_static (type, AccessibleObject.ATK_SELECTION_TYPE, SelectionIfaceDefinition); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
224 if (text) OS.g_type_add_interface_static (type, AccessibleObject.ATK_TEXT_TYPE, TextIfaceDefinition); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
225 Types[swtTypeName] = type; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
226 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
227 return type; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
228 } |
42 | 229 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
230 private static extern(C) void gTypeInfo_base_init_factory (void* klass) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
231 auto atkObjectFactoryClass = ATK.ATK_OBJECT_FACTORY_CLASS (klass); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
232 atkObjectFactoryClass.create_accessible = &atkObjectFactory_create_accessible; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
233 } |
42 | 234 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
235 private static extern(C) void gTypeInfo_base_init_type (void* klass) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
236 auto objectClass = cast(AtkObjectClass*)klass; |
42 | 237 objectClass.get_name = &AccessibleObject.atkObject_get_name; |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
238 objectClass.get_description = &AccessibleObject.atkObject_get_description; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
239 objectClass.get_n_children = &AccessibleObject.atkObject_get_n_children; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
240 objectClass.get_role = &AccessibleObject.atkObject_get_role; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
241 objectClass.get_parent = &AccessibleObject.atkObject_get_parent; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
242 objectClass.ref_state_set = &AccessibleObject.atkObject_ref_state_set; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
243 objectClass.get_index_in_parent = &AccessibleObject.atkObject_get_index_in_parent; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
244 objectClass.ref_child = &AccessibleObject.atkObject_ref_child; |
42 | 245 |
246 GObjectClass* gObjectClass = OS.G_OBJECT_CLASS ( cast(GTypeClass*)klass); | |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
247 gObjectClass.finalize = &AccessibleObject.gObjectClass_finalize; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
248 } |
42 | 249 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
250 private static extern(C) void initActionIfaceCB ( void* g_iface, void* iface_data ) { |
42 | 251 auto iface = cast(AtkActionIface*)g_iface; |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
252 iface.get_keybinding = &AccessibleObject.atkAction_get_keybinding; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
253 iface.get_name = &AccessibleObject.atkAction_get_name; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
254 } |
42 | 255 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
256 private static extern(C) void initComponentIfaceCB ( void* g_iface, void* iface_data ) { |
42 | 257 auto iface = cast(AtkComponentIface*)g_iface; |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
258 iface.get_extents = &AccessibleObject.atkComponent_get_extents; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
259 iface.get_position = &AccessibleObject.atkComponent_get_position; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
260 iface.get_size = &AccessibleObject.atkComponent_get_size; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
261 iface.ref_accessible_at_point = &AccessibleObject.atkComponent_ref_accessible_at_point; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
262 } |
42 | 263 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
264 private static extern(C) void initHypertextIfaceCB ( void* g_iface, void* iface_data ) { |
42 | 265 auto iface = cast(AtkHypertextIface*)g_iface; |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
266 iface.get_link = &AccessibleObject.atkHypertext_get_link; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
267 iface.get_link_index = &AccessibleObject.atkHypertext_get_link_index; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
268 iface.get_n_links = &AccessibleObject.atkHypertext_get_n_links; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
269 } |
42 | 270 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
271 private static extern(C) void initSelectionIfaceCB ( void* g_iface, void* iface_data ) { |
42 | 272 auto iface = cast(AtkSelectionIface*)g_iface; |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
273 iface.is_child_selected = &AccessibleObject.atkSelection_is_child_selected; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
274 iface.ref_selection = &AccessibleObject.atkSelection_ref_selection; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
275 } |
42 | 276 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
277 private static extern(C) void initTextIfaceCB ( void* g_iface, void* iface_data ) { |
42 | 278 auto iface = cast(AtkTextIface*)g_iface; |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
279 iface.get_caret_offset = &AccessibleObject.atkText_get_caret_offset; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
280 iface.get_character_at_offset = &AccessibleObject.atkText_get_character_at_offset; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
281 iface.get_character_count = &AccessibleObject.atkText_get_character_count; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
282 iface.get_n_selections = &AccessibleObject.atkText_get_n_selections; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
283 iface.get_selection = &AccessibleObject.atkText_get_selection; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
284 iface.get_text = &AccessibleObject.atkText_get_text; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
285 iface.get_text_after_offset = &AccessibleObject.atkText_get_text_after_offset; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
286 iface.get_text_at_offset = &AccessibleObject.atkText_get_text_at_offset; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
287 iface.get_text_before_offset = &AccessibleObject.atkText_get_text_before_offset; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
288 } |
42 | 289 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
290 static void registerAccessible (Accessible accessible) { |
104 | 291 static_this(); |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
292 /* If DefaultParentType is 0 then OS accessibility is not active */ |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
293 if (DefaultParentType is 0) return; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
294 auto controlHandle = accessible.getControlHandle (); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
295 auto widgetType = OS.G_OBJECT_TYPE ( cast(GTypeInstance*)controlHandle); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
296 AccessibleFactory factory = Factories[widgetType]; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
297 if (factory is null) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
298 factory = new AccessibleFactory (widgetType); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
299 Factories[widgetType] = factory; |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
300 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
301 factory.addAccessible (accessible); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
302 } |
42 | 303 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
304 void removeAccessible (Accessible accessible) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
305 accessibles.remove (accessible.getControlHandle ()); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
306 } |
42 | 307 |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
308 static void unregisterAccessible (Accessible accessible) { |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
309 auto controlHandle = accessible.getControlHandle (); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
310 auto widgetType = OS.G_OBJECT_TYPE (cast(GTypeInstance*)controlHandle); |
140 | 311 if ( auto factory = widgetType in Factories ) { |
59
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
312 factory.removeAccessible (accessible); |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
313 } |
8cec8f536af3
All D sources complete gvim retab (4 spaces), bug with Composite moveAbove/moveBelow fixed.
Frank Benoit <benoit@tionex.de>
parents:
54
diff
changeset
|
314 } |
42 | 315 } |