comparison: ui/cocoa/label.m
ui/cocoa/label.m
- changeset 1230
- cbc38a15e094
- parent 1084
- cce6dad72164
equal
deleted
inserted
replaced
| 1229:4f897819ae05 | 1230:cbc38a15e094 |
|---|---|
| 62 s->set = ui_label_set; | 62 s->set = ui_label_set; |
| 63 | 63 |
| 64 if(s->value.ptr) { | 64 if(s->value.ptr) { |
| 65 label.stringValue = [[NSString alloc]initWithUTF8String:s->value.ptr]; | 65 label.stringValue = [[NSString alloc]initWithUTF8String:s->value.ptr]; |
| 66 } | 66 } |
| 67 if(s->value.free) { | |
| 68 s->value.free(s->value.ptr); | |
| 69 } | |
| 67 } | 70 } |
| 68 | 71 |
| 69 return (__bridge void*)label; | 72 return (__bridge void*)label; |
| 70 } | 73 } |
| 71 | 74 |
| 89 NSTextField *label = (__bridge NSTextField*)s->obj; | 92 NSTextField *label = (__bridge NSTextField*)s->obj; |
| 90 if(s->value.free) { | 93 if(s->value.free) { |
| 91 s->value.free(s->value.ptr); | 94 s->value.free(s->value.ptr); |
| 92 } | 95 } |
| 93 s->value.ptr = strdup(label.stringValue.UTF8String); | 96 s->value.ptr = strdup(label.stringValue.UTF8String); |
| 97 s->value.free = free; | |
| 94 return s->value.ptr; | 98 return s->value.ptr; |
| 95 } | 99 } |
| 96 | 100 |
| 97 void ui_label_set(UiString *s, const char *str) { | 101 void ui_label_set(UiString *s, const char *str) { |
| 98 NSTextField *label = (__bridge NSTextField*)s->obj; | 102 NSTextField *label = (__bridge NSTextField*)s->obj; |
| 99 if(s->value.free) { | 103 if(s->value.free) { |
| 100 s->value.free(s->value.ptr); | 104 s->value.free(s->value.ptr); |
| 101 } | 105 } |
| 102 s->value.ptr = NULL; | 106 s->value.ptr = NULL; |
| 107 s->value.free = NULL; | |
| 103 label.stringValue = [[NSString alloc] initWithUTF8String:str]; | 108 label.stringValue = [[NSString alloc] initWithUTF8String:str]; |
| 104 } | 109 } |
