comparison: make/vs/testapp/main.c
make/vs/testapp/main.c
- branch
- newapi
- changeset 208
- f632bc0589ab
- parent 207
- 93b9f502cb88
- child 211
- 5d71a36b833b
equal
deleted
inserted
replaced
| 207:93b9f502cb88 | 208:f632bc0589ab |
|---|---|
| 226 ui_newline(obj); | 226 ui_newline(obj); |
| 227 | 227 |
| 228 ui_combobox(obj, .list = wdata->list, .onselection= action_listselection_changed, .onactivate= action_onactivate); | 228 ui_combobox(obj, .list = wdata->list, .onselection= action_listselection_changed, .onactivate= action_onactivate); |
| 229 ui_newline(obj); | 229 ui_newline(obj); |
| 230 | 230 |
| 231 ui_tabview(obj, .colspan = 3, .vexpand = true, .hexpand = true, .tabview = UI_TABVIEW_NAVIGATION_TOP2) { | 231 ui_tabview(obj, .colspan = 3, .vexpand = true, .hexpand = true, .tabview = UI_TABVIEW_NAVIGATION_SIDE) { |
| 232 ui_tab(obj, "Tab 1") { | 232 ui_tab(obj, "Tab 1") { |
| 233 ui_button(obj, .label = "Tab 1 Button"); | 233 ui_button(obj, .label = "Tab 1 Button"); |
| 234 } | 234 } |
| 235 ui_tab(obj, "Tab 2") { | 235 ui_tab(obj, "Tab 2") { |
| 236 ui_button(obj, .label = "Tab 2 Button"); | 236 ui_button(obj, .label = "Tab 2 Button"); |
| 262 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR lpCmdLine, int nCmdShow) | 262 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR lpCmdLine, int nCmdShow) |
| 263 { | 263 { |
| 264 ui_init("app1", 0, NULL); | 264 ui_init("app1", 0, NULL); |
| 265 ui_onstartup(application_startup, NULL); | 265 ui_onstartup(application_startup, NULL); |
| 266 | 266 |
| 267 ui_menu("File"); | 267 ui_menu("File") { |
| 268 ui_menuitem("Test", NULL, NULL); | 268 ui_menuitem(.label = "Item 1"); |
| 269 ui_submenu("Sub"); | 269 ui_menuitem(.label = "Item 2"); |
| 270 ui_menuitem("subitem", NULL, NULL); | 270 ui_menuseparator(); |
| 271 ui_submenu_end(); | 271 ui_menu("File Sub") { |
| 272 ui_menuitem("Exit", NULL, NULL); | 272 ui_menuitem(.label = "Sub Item"); |
| 273 } | |
| 274 | |
| 275 ui_menuitem(.label = "Exit"); | |
| 276 } | |
| 273 | 277 |
| 274 ui_toolbar_item("Test", .label = "Test", .onclick = action_toolbar_button); | 278 ui_toolbar_item("Test", .label = "Test", .onclick = action_toolbar_button); |
| 275 ui_toolbar_toggleitem("Toggle", .label = "Toggle", .onchange = action_toolbar_button); | 279 ui_toolbar_toggleitem("Toggle", .label = "Toggle", .onchange = action_toolbar_button); |
| 276 ui_toolbar_toggleitem("Toggle2", .label = "Toggle2", .onchange = action_toolbar_button); | 280 ui_toolbar_toggleitem("Toggle2", .label = "Toggle2", .onchange = action_toolbar_button); |
| 277 ui_toolbar_toggleitem("Toggle3", .label = "Toggle3", .onchange = action_toolbar_button); | 281 ui_toolbar_toggleitem("Toggle3", .label = "Toggle3", .onchange = action_toolbar_button); |
| 278 | 282 |
| 279 ui_toolbar_menu("Menu", .label = "Menu") { | 283 ui_toolbar_menu("Menu", .label = "Menu") { |
| 280 ui_menuitem("TB Test", NULL, NULL); | 284 |
| 281 ui_submenu("TB Sub"); | 285 ui_menuitem(.label = "x", NULL, NULL); |
| 282 ui_menuitem("TB subitem", NULL, NULL); | 286 ui_menu("TB Sub") { |
| 283 ui_submenu_end(); | 287 ui_menuitem("TB subitem", NULL, NULL); |
| 288 } | |
| 284 } | 289 } |
| 285 | 290 |
| 286 ui_toolbar_menu(NULL, .label = "Menu") { | 291 ui_toolbar_menu(NULL, .label = "Menu") { |
| 287 ui_menuitem("Secondary Test", NULL, NULL); | 292 ui_menuitem("Secondary Test", NULL, NULL); |
| 288 ui_submenu("Secondary Sub"); | 293 ui_menu("Secondary Sub") { |
| 289 ui_menuitem("Secondary subitem", NULL, NULL); | 294 ui_menuitem("Secondary subitem", NULL, NULL); |
| 290 ui_submenu_end(); | 295 } |
| 291 } | 296 } |
| 292 | |
| 293 | 297 |
| 294 ui_toolbar_add_default("Test"); | 298 ui_toolbar_add_default("Test"); |
| 295 ui_toolbar_add_default("Toggle"); | 299 ui_toolbar_add_default("Toggle"); |
| 296 ui_toolbar_add_default("Toggle2"); | 300 ui_toolbar_add_default("Toggle2"); |
| 297 ui_toolbar_add_default("Toggle3"); | 301 ui_toolbar_add_default("Toggle3"); |
