comparison: ui/cocoa/toolkit.m
ui/cocoa/toolkit.m
- changeset 112
- c3f2f16fa4b8
- parent 109
- c3dfcb8f0be7
- child 113
- dde28a806552
equal
deleted
inserted
replaced
| 111:81c4f73236a4 | 112:c3f2f16fa4b8 |
|---|---|
| 62 app_argc = argc; | 62 app_argc = argc; |
| 63 app_argv = (const char**)argv; | 63 app_argv = (const char**)argv; |
| 64 | 64 |
| 65 uic_init_global_context(); | 65 uic_init_global_context(); |
| 66 | 66 |
| 67 uic_docmgr_init(); | |
| 68 uic_menu_init(); | 67 uic_menu_init(); |
| 69 uic_toolbar_init(); | 68 uic_toolbar_init(); |
| 70 | 69 |
| 71 uic_load_app_properties(); | 70 uic_load_app_properties(); |
| 72 | 71 |
| 147 | 146 |
| 148 /* ------------------- Window Visibility functions ------------------- */ | 147 /* ------------------- Window Visibility functions ------------------- */ |
| 149 | 148 |
| 150 void ui_show(UiObject *obj) { | 149 void ui_show(UiObject *obj) { |
| 151 if(obj->wobj) { | 150 if(obj->wobj) { |
| 152 NSWindow *window = (__bridge NSWindow*)obj->wobj; | 151 id<UiToplevelObject> window = (__bridge id<UiToplevelObject>)obj->wobj; |
| 153 [window makeKeyAndOrderFront:nil]; | 152 |
| 153 if(![window getIsVisible]) { | |
| 154 obj->ref++; | |
| 155 } | |
| 156 | |
| 157 [window setVisible:YES]; | |
| 154 } | 158 } |
| 155 } | 159 } |
| 156 | 160 |
| 157 void ui_close(UiObject *obj) { | 161 void ui_close(UiObject *obj) { |
| 158 | 162 // TODO: unref, window close, ... |
| 163 if(obj->wobj) { | |
| 164 id<UiToplevelObject> window = (__bridge id<UiToplevelObject>)obj->wobj; | |
| 165 [window setVisible:NO]; | |
| 166 } | |
| 159 } | 167 } |
| 160 | 168 |
| 161 /* ------------------- Job Control / Threadpool functions ------------------- */ | 169 /* ------------------- Job Control / Threadpool functions ------------------- */ |
| 162 | 170 |
| 163 void ui_job(UiObject *obj, ui_threadfunc tf, void *td, ui_callback f, void *fd) { | 171 void ui_job(UiObject *obj, ui_threadfunc tf, void *td, ui_callback f, void *fd) { |
