comparison: make/vs/testapp/main.c
make/vs/testapp/main.c
- branch
- newapi
- changeset 214
- 279c0c81d3b1
- parent 213
- 7e39db525fd9
- child 215
- 1bd5534c395d
equal
deleted
inserted
replaced
| 213:7e39db525fd9 | 214:279c0c81d3b1 |
|---|---|
| 162 | 162 |
| 163 | 163 |
| 164 TableData* td1 = malloc(sizeof(TableData)); | 164 TableData* td1 = malloc(sizeof(TableData)); |
| 165 TableData* td2 = malloc(sizeof(TableData)); | 165 TableData* td2 = malloc(sizeof(TableData)); |
| 166 TableData* td3 = malloc(sizeof(TableData)); | 166 TableData* td3 = malloc(sizeof(TableData)); |
| 167 TableData* td4 = malloc(sizeof(TableData)); | |
| 168 TableData* td5 = malloc(sizeof(TableData)); | |
| 169 TableData* td6 = malloc(sizeof(TableData)); | |
| 167 td1->col1 = "a1"; | 170 td1->col1 = "a1"; |
| 168 td1->col2 = "b1"; | 171 td1->col2 = "b1"; |
| 169 td1->col3 = "c1"; | 172 td1->col3 = "c1"; |
| 170 td2->col1 = "a2"; | 173 td2->col1 = "a2"; |
| 171 td2->col2 = "b2"; | 174 td2->col2 = "b2"; |
| 172 td2->col3 = "b3"; | 175 td2->col3 = "b3"; |
| 173 td3->col1 = "a3"; | 176 td3->col1 = "a3"; |
| 174 td3->col2 = "b3"; | 177 td3->col2 = "b3"; |
| 175 td3->col3 = "c3"; | 178 td3->col3 = "c3"; |
| 179 td4->col1 = "a3"; | |
| 180 td4->col2 = "b3"; | |
| 181 td4->col3 = "c3"; | |
| 182 td5->col1 = "a3"; | |
| 183 td5->col2 = "b3"; | |
| 184 td5->col3 = "c3"; | |
| 185 td6->col1 = "a3"; | |
| 186 td6->col2 = "b3"; | |
| 187 td6->col3 = "c3"; | |
| 176 | 188 |
| 177 ui_list_append(wdata->list2, td1); | 189 ui_list_append(wdata->list2, td1); |
| 178 ui_list_append(wdata->list2, td2); | 190 ui_list_append(wdata->list2, td2); |
| 179 ui_list_append(wdata->list2, td3); | 191 ui_list_append(wdata->list2, td3); |
| 192 ui_list_append(wdata->list2, td4); | |
| 193 ui_list_append(wdata->list2, td5); | |
| 194 ui_list_append(wdata->list2, td6); | |
| 180 | 195 |
| 181 ui_scrolledwindow0(obj) { | 196 ui_scrolledwindow0(obj) { |
| 182 ui_grid(obj, .margin = 10, .columnspacing = 5, .rowspacing = 20) { | 197 ui_grid(obj, .margin = 10, .columnspacing = 5, .rowspacing = 20) { |
| 183 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); | 198 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); |
| 184 ui_button(obj, .label = "Button2", .onclick = action1, .onclickdata = "action2"); | 199 ui_button(obj, .label = "Button2", .onclick = action1, .onclickdata = "action2"); |
| 261 | 276 |
| 262 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR lpCmdLine, int nCmdShow) | 277 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR lpCmdLine, int nCmdShow) |
| 263 { | 278 { |
| 264 ui_init("app1", 0, NULL); | 279 ui_init("app1", 0, NULL); |
| 265 ui_onstartup(application_startup, NULL); | 280 ui_onstartup(application_startup, NULL); |
| 266 | 281 |
| 267 ui_menu("File") { | 282 ui_menu("File") { |
| 268 ui_menuitem(.label = "Item 1"); | 283 ui_menuitem(.label = "Item 1"); |
| 269 ui_menuitem(.label = "Item 2"); | 284 ui_menuitem(.label = "Item 2"); |
| 270 ui_menuseparator(); | 285 ui_menuseparator(); |
| 271 ui_menu("File Sub") { | 286 ui_menu("File Sub") { |
