comparison: client/args.c
client/args.c
- changeset 980
- 39cb60b6a81b
- parent 966
- e411ed7c5f10
equal
deleted
inserted
replaced
| 979:471ca81a72f5 | 980:39cb60b6a81b |
|---|---|
| 206 if(value->type != CX_JSON_OBJECT) { | 206 if(value->type != CX_JSON_OBJECT) { |
| 207 return args; | 207 return args; |
| 208 } | 208 } |
| 209 | 209 |
| 210 init_common_args(value, args, &button_args); | 210 init_common_args(value, args, &button_args); |
| 211 init_states(value, args, (argfunc_set_intarray)ui_button_args_set_groups); | 211 init_states(value, args, (argfunc_set_intarray)ui_button_args_set_states); |
| 212 | 212 |
| 213 CxJsonValue *val = cxJsonObjGet(value, "label"); | 213 CxJsonValue *val = cxJsonObjGet(value, "label"); |
| 214 if(val && val->type == CX_JSON_STRING) { | 214 if(val && val->type == CX_JSON_STRING) { |
| 215 ui_button_args_set_label(args, val->value.string.ptr); | 215 ui_button_args_set_label(args, val->value.string.ptr); |
| 216 } | 216 } |
| 238 if(value->type != CX_JSON_OBJECT) { | 238 if(value->type != CX_JSON_OBJECT) { |
| 239 return args; | 239 return args; |
| 240 } | 240 } |
| 241 | 241 |
| 242 init_common_args(value, args, &button_args); | 242 init_common_args(value, args, &button_args); |
| 243 init_states(value, args, (argfunc_set_intarray)ui_button_args_set_groups); | 243 init_states(value, args, (argfunc_set_intarray)ui_button_args_set_states); |
| 244 | 244 |
| 245 CxJsonValue *val = cxJsonObjGet(value, "label"); | 245 CxJsonValue *val = cxJsonObjGet(value, "label"); |
| 246 if(val && val->type == CX_JSON_STRING) { | 246 if(val && val->type == CX_JSON_STRING) { |
| 247 ui_toggle_args_set_label(args, val->value.string.ptr); | 247 ui_toggle_args_set_label(args, val->value.string.ptr); |
| 248 } | 248 } |
