# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1621900384 0 # Node ID e879afecf3ab63fbe22aa7d8a35eab9016a636c8 # Parent 8253e17b20adbeda6b479162dc380c77c6fbe0bd iOS: Fix dw_window_g/set_text() on buttons, can't use the label directly. diff -r 8253e17b20ad -r e879afecf3ab ios/dw.m --- a/ios/dw.m Mon May 24 23:29:15 2021 +0000 +++ b/ios/dw.m Mon May 24 23:53:04 2021 +0000 @@ -8511,9 +8511,16 @@ { DW_FUNCTION_INIT; id object = _dw_text_handle(handle); + id control = handle; char *retval = NULL; - if([object isKindOfClass:[UILabel class]] || [object isKindOfClass:[UITextField class]]) + if([control isKindOfClass:[UIButton class]]) + { + NSString *nsstr = [control titleForState:UIControlStateNormal]; + + retval = strdup([nsstr UTF8String]); + } + else if([object isKindOfClass:[UILabel class]] || [object isKindOfClass:[UITextField class]]) { NSString *nsstr = [object text]; @@ -8545,9 +8552,15 @@ { DW_FUNCTION_INIT; id object = _dw_text_handle(handle); + id control = handle; Item *item = NULL; - if([object isKindOfClass:[UILabel class]] || [object isKindOfClass:[UITextField class]]) + if([control isKindOfClass:[UIButton class]]) + { + [control setTitle:[NSString stringWithUTF8String:text] forState:UIControlStateNormal]; + item = _dw_box_item(handle); + } + else if([object isKindOfClass:[UILabel class]] || [object isKindOfClass:[UITextField class]]) { [object setText:[NSString stringWithUTF8String:text]]; item = _dw_box_item(handle);