comparison: ui/winui/window.cpp
ui/winui/window.cpp
- branch
- newapi
- changeset 373
- 2eede3d98aba
- parent 256
- 8874a68bafb0
- child 374
- eae5d6623fd3
equal
deleted
inserted
replaced
| 372:4657ec1229f2 | 373:2eede3d98aba |
|---|---|
| 107 CxList* def_l = uic_get_toolbar_defaults(UI_TOOLBAR_LEFT); | 107 CxList* def_l = uic_get_toolbar_defaults(UI_TOOLBAR_LEFT); |
| 108 CxList* def_c = uic_get_toolbar_defaults(UI_TOOLBAR_CENTER); | 108 CxList* def_c = uic_get_toolbar_defaults(UI_TOOLBAR_CENTER); |
| 109 CxList* def_r = uic_get_toolbar_defaults(UI_TOOLBAR_RIGHT); | 109 CxList* def_r = uic_get_toolbar_defaults(UI_TOOLBAR_RIGHT); |
| 110 | 110 |
| 111 bool addappmenu = true; | 111 bool addappmenu = true; |
| 112 if (def_r->size > 0) { | 112 if (cxListSize(def_r) > 0) { |
| 113 CommandBar toolbar_r = ui_create_toolbar(obj, def_r, addappmenu); | 113 CommandBar toolbar_r = ui_create_toolbar(obj, def_r, addappmenu); |
| 114 toolbar_grid.SetColumn(toolbar_r, 2); | 114 toolbar_grid.SetColumn(toolbar_r, 2); |
| 115 toolbar_grid.SetRow(toolbar_r, 0); | 115 toolbar_grid.SetRow(toolbar_r, 0); |
| 116 toolbar_grid.Children().Append(toolbar_r); | 116 toolbar_grid.Children().Append(toolbar_r); |
| 117 addappmenu = false; | 117 addappmenu = false; |
| 118 } | 118 } |
| 119 if (def_c->size > 0) { | 119 if (cxListSize(def_c) > 0) { |
| 120 CommandBar toolbar_c = ui_create_toolbar(obj, def_c, addappmenu); | 120 CommandBar toolbar_c = ui_create_toolbar(obj, def_c, addappmenu); |
| 121 toolbar_c.HorizontalAlignment(HorizontalAlignment::Center); | 121 toolbar_c.HorizontalAlignment(HorizontalAlignment::Center); |
| 122 toolbar_grid.SetColumn(toolbar_c, 1); | 122 toolbar_grid.SetColumn(toolbar_c, 1); |
| 123 toolbar_grid.SetRow(toolbar_c, 0); | 123 toolbar_grid.SetRow(toolbar_c, 0); |
| 124 toolbar_grid.Children().Append(toolbar_c); | 124 toolbar_grid.Children().Append(toolbar_c); |
| 125 addappmenu = false; | 125 addappmenu = false; |
| 126 } | 126 } |
| 127 if (def_l->size > 0) { | 127 if (cxListSize(def_l) > 0) { |
| 128 CommandBar toolbar_l = ui_create_toolbar(obj, def_l, addappmenu); | 128 CommandBar toolbar_l = ui_create_toolbar(obj, def_l, addappmenu); |
| 129 toolbar_grid.SetColumn(toolbar_l, 0); | 129 toolbar_grid.SetColumn(toolbar_l, 0); |
| 130 toolbar_grid.SetRow(toolbar_l, 0); | 130 toolbar_grid.SetRow(toolbar_l, 0); |
| 131 toolbar_grid.Children().Append(toolbar_l); | 131 toolbar_grid.Children().Append(toolbar_l); |
| 132 } | 132 } |
