comparison: ui/winui/toolkit.cpp
ui/winui/toolkit.cpp
- branch
- newapi
- changeset 379
- 958bae372271
- parent 373
- 2eede3d98aba
equal
deleted
inserted
replaced
| 378:d41b1ffc5f77 | 379:958bae372271 |
|---|---|
| 34 #include <cx/mempool.h> | 34 #include <cx/mempool.h> |
| 35 | 35 |
| 36 #include "../common/context.h" | 36 #include "../common/context.h" |
| 37 #include "../common/document.h" | 37 #include "../common/document.h" |
| 38 #include "../common/toolbar.h" | 38 #include "../common/toolbar.h" |
| 39 #include "../common/properties.h" | |
| 39 | 40 |
| 40 #include "icons.h" | 41 #include "icons.h" |
| 41 | 42 |
| 42 #include "MainWindow.xaml.h" | 43 #include "MainWindow.xaml.h" |
| 43 | 44 |
| 164 //ui_appsdk_bootstrap(); | 165 //ui_appsdk_bootstrap(); |
| 165 | 166 |
| 166 uic_init_global_context(); | 167 uic_init_global_context(); |
| 167 uic_docmgr_init(); | 168 uic_docmgr_init(); |
| 168 uic_toolbar_init(); | 169 uic_toolbar_init(); |
| 170 | |
| 171 uic_load_app_properties(); | |
| 169 } | 172 } |
| 170 | 173 |
| 171 const char* ui_appname() { | 174 const char* ui_appname() { |
| 172 return application_name; | 175 return application_name; |
| 173 } | 176 } |
| 227 }; | 230 }; |
| 228 | 231 |
| 229 void ui_show(UiObject* obj) { | 232 void ui_show(UiObject* obj) { |
| 230 if (obj->wobj) { | 233 if (obj->wobj) { |
| 231 obj->wobj->window.Activate(); | 234 obj->wobj->window.Activate(); |
| 232 } else { | 235 } else if(obj->widget && obj->widget->Show) { |
| 233 // TODO | 236 obj->widget->Show(); |
| 234 } | 237 } |
| 235 } | 238 } |
| 236 | 239 |
| 237 void ui_close(UiObject* obj) { | 240 void ui_close(UiObject* obj) { |
| 238 if (obj->wobj) { | 241 if (obj->wobj) { |
