Show
Ignore:
Timestamp:
03/25/08 18:16:02 (8 months ago)
Author:
Mike Wey
Message:

Support for dmd 2.012

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/atk/Text.d

    r466 r480  
    4747 * module aliases: 
    4848 * local aliases: 
     49 * overrides: 
    4950 */ 
    5051 
    …… 
    257258     * Returns: the text from start_offset up to, but not including end_offset. 
    258259     */ 
    259     public char[] getText(int startOffset, int endOffset) 
     260    public string getText(int startOffset, int endOffset) 
    260261    { 
    261262        // gchar* atk_text_get_text (AtkText *text,  gint start_offset,  gint end_offset); 
    262         return Str.toString(atk_text_get_text(atkText, startOffset, endOffset)).dup; 
     263        return Str.toString(atk_text_get_text(atkText, startOffset, endOffset)); 
    263264    } 
    264265     
    …… 
    310311     * Returns: the text after offset bounded by the specified boundary_type. 
    311312     */ 
    312     public char[] getTextAfterOffset(int offset, AtkTextBoundary boundaryType, int* startOffset, int* endOffset) 
     313    public string getTextAfterOffset(int offset, AtkTextBoundary boundaryType, int* startOffset, int* endOffset) 
    313314    { 
    314315        // gchar* atk_text_get_text_after_offset (AtkText *text,  gint offset,  AtkTextBoundary boundary_type,  gint *start_offset,  gint *end_offset); 
    315         return Str.toString(atk_text_get_text_after_offset(atkText, offset, boundaryType, startOffset, endOffset)).dup; 
     316        return Str.toString(atk_text_get_text_after_offset(atkText, offset, boundaryType, startOffset, endOffset)); 
    316317    } 
    317318     
    …… 
    358359     * Returns: the text at offset bounded by the specified boundary_type. 
    359360     */ 
    360     public char[] getTextAtOffset(int offset, AtkTextBoundary boundaryType, int* startOffset, int* endOffset) 
     361    public string getTextAtOffset(int offset, AtkTextBoundary boundaryType, int* startOffset, int* endOffset) 
    361362    { 
    362363        // gchar* atk_text_get_text_at_offset (AtkText *text,  gint offset,  AtkTextBoundary boundary_type,  gint *start_offset,  gint *end_offset); 
    363         return Str.toString(atk_text_get_text_at_offset(atkText, offset, boundaryType, startOffset, endOffset)).dup; 
     364        return Str.toString(atk_text_get_text_at_offset(atkText, offset, boundaryType, startOffset, endOffset)); 
    364365    } 
    365366     
    …… 
    404405     * Returns: the text before offset bounded by the specified boundary_type. 
    405406     */ 
    406     public char[] getTextBeforeOffset(int offset, AtkTextBoundary boundaryType, int* startOffset, int* endOffset) 
     407    public string getTextBeforeOffset(int offset, AtkTextBoundary boundaryType, int* startOffset, int* endOffset) 
    407408    { 
    408409        // gchar* atk_text_get_text_before_offset (AtkText *text,  gint offset,  AtkTextBoundary boundary_type,  gint *start_offset,  gint *end_offset); 
    409         return Str.toString(atk_text_get_text_before_offset(atkText, offset, boundaryType, startOffset, endOffset)).dup; 
     410        return Str.toString(atk_text_get_text_before_offset(atkText, offset, boundaryType, startOffset, endOffset)); 
    410411    } 
    411412     
    …… 
    566567     * Returns: the selected text. 
    567568     */ 
    568     public char[] getSelection(int selectionNum, int* startOffset, int* endOffset) 
     569    public string getSelection(int selectionNum, int* startOffset, int* endOffset) 
    569570    { 
    570571        // gchar* atk_text_get_selection (AtkText *text,  gint selection_num,  gint *start_offset,  gint *end_offset); 
    571         return Str.toString(atk_text_get_selection(atkText, selectionNum, startOffset, endOffset)).dup; 
     572        return Str.toString(atk_text_get_selection(atkText, selectionNum, startOffset, endOffset)); 
    572573    } 
    573574     
    …… 
    650651     * Returns: an AtkTextAttribute associated with name 
    651652     */ 
    652     public static AtkTextAttribute attributeRegister(char[] name) 
     653    public static AtkTextAttribute attributeRegister(string name) 
    653654    { 
    654655        // AtkTextAttribute atk_text_attribute_register (const gchar *name); 
    …… 
    662663     * Returns: a string containing the name; this string should not be freed 
    663664     */ 
    664     public static char[] attributeGetName(AtkTextAttribute attr) 
     665    public static string attributeGetName(AtkTextAttribute attr) 
    665666    { 
    666667        // const gchar* atk_text_attribute_get_name (AtkTextAttribute attr); 
    667         return Str.toString(atk_text_attribute_get_name(attr)).dup; 
     668        return Str.toString(atk_text_attribute_get_name(attr)); 
    668669    } 
    669670     
    …… 
    674675     * Returns: the AtkTextAttribute enumerated type corresponding to the specifiedname, or ATK_TEXT_ATTRIBUTE_INVALID if no matching text attribute is found. 
    675676     */ 
    676     public static AtkTextAttribute attributeForName(char[] name) 
     677    public static AtkTextAttribute attributeForName(string name) 
    677678    { 
    678679        // AtkTextAttribute atk_text_attribute_for_name (const gchar *name); 
    …… 
    687688     * Returns: a string containing the value; this string should not be freed;NULL is returned if there are no values maintained for the attr value. Signal DetailsThe "text-attributes-changed" signalvoid user_function (AtkText *atktext, gpointer user_data) : Run LastThe "text-attributes-changed" signal is emitted when the text attributes of the text of an object which implements AtkText changes. 
    688689     */ 
    689     public static char[] attributeGetValue(AtkTextAttribute attr, int index) 
     690    public static string attributeGetValue(AtkTextAttribute attr, int index) 
    690691    { 
    691692        // const gchar* atk_text_attribute_get_value (AtkTextAttribute attr,  gint index_); 
    692         return Str.toString(atk_text_attribute_get_value(attr, index)).dup; 
     693        return Str.toString(atk_text_attribute_get_value(attr, index)); 
    693694    } 
    694695}