Mercurial > projects > dwt-linux
diff dwt/accessibility/AccessibleObject.d @ 361:4bffbf81e2d6
redirect direct prints to DwtLogger
author | Frank Benoit <benoit@tionex.de> |
---|---|
date | Fri, 20 Mar 2009 21:00:06 +0100 |
parents | ffb904674b52 |
children |
line wrap: on
line diff
--- a/dwt/accessibility/AccessibleObject.d Fri Mar 20 20:30:32 2009 +0100 +++ b/dwt/accessibility/AccessibleObject.d Fri Mar 20 21:00:06 2009 +0100 @@ -25,7 +25,6 @@ import dwt.accessibility.AccessibleFactory; import dwt.widgets.Display; import dwt.dwthelper.utils; -import tango.io.Stdout; import tango.text.Util; import Math = tango.math.Math; @@ -73,7 +72,7 @@ this.accessible = accessible; this.isLightweight = isLightweight; AccessibleObjects[handle] = this; - if (DEBUG) Stdout.formatln("new AccessibleObject: {}", handle); + if (DEBUG) getDwtLogger().info("new AccessibleObject: {}", handle); } void addChild (AccessibleObject child) { @@ -83,7 +82,7 @@ package static extern(C) char* atkAction_get_keybinding (void* obj, int index) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkAction_get_keybinding"); + if (DEBUG) getDwtLogger().info ("-->atkAction_get_keybinding"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; char* parentResult; @@ -116,7 +115,7 @@ package static extern(C) char* atkAction_get_name (void* obj, int index) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkAction_get_name"); + if (DEBUG) getDwtLogger().info ("-->atkAction_get_name"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; char* parentResult; @@ -149,7 +148,7 @@ package static extern(C) void atkComponent_get_extents (void* obj, int* x, int* y, int* width, int* height, int coord_type) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkComponent_get_extents"); + if (DEBUG) getDwtLogger().info ("-->atkComponent_get_extents"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return 0; *x = 0; @@ -203,7 +202,7 @@ package static extern(C) void atkComponent_get_position (void* obj, int* x, int* y, int coord_type) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkComponent_get_position, object: {} x:{} y:{} coord:{}", atkObject, x, y, coord_type); + if (DEBUG) getDwtLogger().info ("-->atkComponent_get_position, object: {} x:{} y:{} coord:{}", atkObject, x, y, coord_type); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return 0; *x=0; @@ -255,7 +254,7 @@ //package static extern(C) void atkComponent_get_size (void* obj, int* width, int* height, int coord_type) { package static extern(C) void atkComponent_get_size (void* obj, int* width, int* height) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkComponent_get_size"); + if (DEBUG) getDwtLogger().info ("-->atkComponent_get_size"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return 0; *width=0; @@ -286,7 +285,7 @@ package static extern(C) AtkObject* atkComponent_ref_accessible_at_point (void* obj, int x, int y, int coord_type) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkComponent_ref_accessible_at_point"); + if (DEBUG) getDwtLogger().info ("-->atkComponent_ref_accessible_at_point"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; AtkObject* parentResult; @@ -327,24 +326,24 @@ package static extern(C) AtkHyperlink* atkHypertext_get_link (void* obj, int link_index) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkHypertext_get_link"); + if (DEBUG) getDwtLogger().info ("-->atkHypertext_get_link"); return null; } package static extern(C) int atkHypertext_get_n_links (void* obj) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkHypertext_get_n_links"); + if (DEBUG) getDwtLogger().info ("-->atkHypertext_get_n_links"); return 0; /* read hyperlink's name */ } package static extern(C) int atkHypertext_get_link_index (void* obj, int char_index) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkHypertext_get_link_index"); + if (DEBUG) getDwtLogger().info ("-->atkHypertext_get_link_index"); return 0; } package static extern(C) char* atkObject_get_description (AtkObject* atkObject) { - if (DEBUG) Stdout.formatln ("-->atkObject_get_description"); + if (DEBUG) getDwtLogger().info ("-->atkObject_get_description"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; char* parentResult; @@ -372,7 +371,7 @@ return descriptionPtr.ptr; } package static extern(C) char* atkObject_get_name (AtkObject* atkObject) { - if (DEBUG) Stdout.formatln ("-->atkObject_get_name: {}", atkObject); + if (DEBUG) getDwtLogger().info ("-->atkObject_get_name: {}", atkObject); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; char* parentResult; @@ -400,7 +399,7 @@ } package static extern(C) int atkObject_get_n_children (AtkObject* atkObject) { - if (DEBUG) Stdout.formatln ("-->atkObject_get_n_children: {}", atkObject); + if (DEBUG) getDwtLogger().info ("-->atkObject_get_n_children: {}", atkObject); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return 0; int /*long*/ parentResult = 0; @@ -421,7 +420,7 @@ } package static extern(C) int atkObject_get_index_in_parent (AtkObject* atkObject) { - if (DEBUG) Stdout.formatln ("-->atkObjectCB_get_index_in_parent. "); + if (DEBUG) getDwtLogger().info ("-->atkObjectCB_get_index_in_parent. "); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return 0; if (object.index !is -1) return object.index; @@ -431,7 +430,7 @@ } package static extern(C) AtkObject* atkObject_get_parent (AtkObject* atkObject) { - if (DEBUG) Stdout.formatln ("-->atkObject_get_parent: {}", atkObject); + if (DEBUG) getDwtLogger().info ("-->atkObject_get_parent: {}", atkObject); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; if (object.parent !is null) return object.parent.handle; @@ -441,7 +440,7 @@ } package static extern(C) int atkObject_get_role (AtkObject* atkObject) { - if (DEBUG) Stdout.formatln ("-->atkObject_get_role: {}", atkObject); + if (DEBUG) getDwtLogger().info ("-->atkObject_get_role: {}", atkObject); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return 0; if (object.getAccessibleListeners ().length !is 0) { @@ -494,7 +493,7 @@ } package static extern(C) AtkObject* atkObject_ref_child (AtkObject* atkObject, int /*long*/ index) { - if (DEBUG) Stdout.formatln ("-->atkObject_ref_child: {} of: {}", index, atkObject); + if (DEBUG) getDwtLogger().info ("-->atkObject_ref_child: {} of: {}", index, atkObject); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; object.updateChildren (); @@ -509,7 +508,7 @@ } package static extern(C) AtkStateSet * atkObject_ref_state_set (AtkObject* atkObject) { - if (DEBUG) Stdout.formatln ("-->atkObject_ref_state_set"); + if (DEBUG) getDwtLogger().info ("-->atkObject_ref_state_set"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; AtkStateSet* parentResult; @@ -551,7 +550,7 @@ package static extern(C) int atkSelection_is_child_selected (void* obj, int index) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkSelection_is_child_selected"); + if (DEBUG) getDwtLogger().info ("-->atkSelection_is_child_selected"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return 0; int /*long*/ parentResult = 0; @@ -578,7 +577,7 @@ package static extern(C) AtkObject* atkSelection_ref_selection (void* obj, int index) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkSelection_ref_selection"); + if (DEBUG) getDwtLogger().info ("-->atkSelection_ref_selection"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; AtkObject* parentResult; @@ -607,7 +606,7 @@ package static extern(C) int atkText_get_caret_offset (void* obj) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkText_get_caret_offset"); + if (DEBUG) getDwtLogger().info ("-->atkText_get_caret_offset"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return 0; int /*long*/ parentResult = 0; @@ -631,7 +630,7 @@ package static extern(C) uint atkText_get_character_at_offset (void* obj, int offset) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkText_get_character_at_offset"); + if (DEBUG) getDwtLogger().info ("-->atkText_get_character_at_offset"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return 0; String text = object.getText (); @@ -647,7 +646,7 @@ package static extern(C) int atkText_get_character_count (void* obj) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkText_get_character_count"); + if (DEBUG) getDwtLogger().info ("-->atkText_get_character_count"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return 0; String text = object.getText (); @@ -663,7 +662,7 @@ package static extern(C) int atkText_get_n_selections (void* obj) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln("-->atkText_get_n_selections"); + if (DEBUG) getDwtLogger().info("-->atkText_get_n_selections"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return 0; int /*long*/ parentResult = 0; @@ -686,7 +685,7 @@ package static extern(C) char* atkText_get_selection (void* obj, int selection_num, int* start_offset, int* end_offset) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkText_get_selection"); + if (DEBUG) getDwtLogger().info ("-->atkText_get_selection"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; *start_offset=0; @@ -718,7 +717,7 @@ package static extern(C) char* atkText_get_text (void* obj, int start_offset, int end_offset) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkText_get_text: {},{}", start_offset, end_offset); + if (DEBUG) getDwtLogger().info ("-->atkText_get_text: {},{}", start_offset, end_offset); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; String text = object.getText (); @@ -740,7 +739,7 @@ package static extern(C) char* atkText_get_text_after_offset (void* obj, int offset_value, int boundary_type, int* start_offset, int* end_offset) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkText_get_text_after_offset"); + if (DEBUG) getDwtLogger().info ("-->atkText_get_text_after_offset"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; int offset = cast(int)/*64*/offset_value; @@ -917,7 +916,7 @@ package static extern(C) char* atkText_get_text_at_offset (void* obj, int offset_value, int boundary_type, int* start_offset, int* end_offset) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkText_get_text_at_offset: {} start: {} end: {}", offset_value, start_offset, end_offset); + if (DEBUG) getDwtLogger().info ("-->atkText_get_text_at_offset: {} start: {} end: {}", offset_value, start_offset, end_offset); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; int offset = offset_value; @@ -1035,7 +1034,7 @@ package static extern(C) char* atkText_get_text_before_offset (void* obj, int offset_value, int boundary_type, int* start_offset, int* end_offset) { auto atkObject = cast(AtkObject*)obj; - if (DEBUG) Stdout.formatln ("-->atkText_get_text_before_offset"); + if (DEBUG) getDwtLogger().info ("-->atkText_get_text_before_offset"); AccessibleObject object = getAccessibleObject (atkObject); if (object is null) return null; int offset = offset_value; @@ -1280,7 +1279,7 @@ } void release () { - if (DEBUG) Stdout.formatln("AccessibleObject.release: {}", handle); + if (DEBUG) getDwtLogger().info("AccessibleObject.release: {}", handle); accessible = null; foreach( child; children ){ if (child.isLightweight) OS.g_object_unref (child.handle);