comparison: ui/cocoa/toolkit.m
ui/cocoa/toolkit.m
- changeset 1079
- 70725b87381a
- parent 1078
- 2e09a6f28a44
equal
deleted
inserted
replaced
| 1078:2e09a6f28a44 | 1079:70725b87381a |
|---|---|
| 52 | 52 |
| 53 static UiBool exit_on_shutdown; | 53 static UiBool exit_on_shutdown; |
| 54 | 54 |
| 55 /* ------------------- App Init / Event Loop functions ------------------- */ | 55 /* ------------------- App Init / Event Loop functions ------------------- */ |
| 56 | 56 |
| 57 static AppDelegate *app_delegate; | |
| 57 | 58 |
| 58 void ui_init(const char *appname, int argc, char **argv) { | 59 void ui_init(const char *appname, int argc, char **argv) { |
| 59 application_name = appname ? strdup(appname) : NULL; | 60 application_name = appname ? strdup(appname) : NULL; |
| 60 app_argc = argc; | 61 app_argc = argc; |
| 61 app_argv = (const char**)argv; | 62 app_argv = (const char**)argv; |
| 70 NSApplication *app = [NSApplication sharedApplication]; | 71 NSApplication *app = [NSApplication sharedApplication]; |
| 71 //[app setActivationPolicy:NSApplicationActivationPolicyRegular]; | 72 //[app setActivationPolicy:NSApplicationActivationPolicyRegular]; |
| 72 | 73 |
| 73 //[NSBundle loadNibNamed:@"MainMenu" owner:NSApp ]; | 74 //[NSBundle loadNibNamed:@"MainMenu" owner:NSApp ]; |
| 74 //[[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp topLevelObjects:&topLevelObjects]; | 75 //[[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp topLevelObjects:&topLevelObjects]; |
| 76 | |
| 77 app_delegate = [[AppDelegate alloc] init]; | |
| 78 app.delegate = app_delegate; | |
| 75 | 79 |
| 76 ui_icon_init(); | 80 ui_icon_init(); |
| 77 ui_toolbar_init(); | 81 ui_toolbar_init(); |
| 78 | 82 |
| 79 } | 83 } |
