comparison: ui/cocoa/toolkit.m
ui/cocoa/toolkit.m
- changeset 687
- d43b4fcd3d8c
- parent 677
- 04bcb1930fbf
- child 720
- 6fa3c629000f
equal
deleted
inserted
replaced
| 686:1e2f3a44d455 | 687:d43b4fcd3d8c |
|---|---|
| 32 #include "../common/properties.h" | 32 #include "../common/properties.h" |
| 33 #include "../common/menu.h" | 33 #include "../common/menu.h" |
| 34 #include "../common/toolbar.h" | 34 #include "../common/toolbar.h" |
| 35 #include "../common/threadpool.h" | 35 #include "../common/threadpool.h" |
| 36 | 36 |
| 37 #import "image.h" | |
| 37 #import "menu.h" | 38 #import "menu.h" |
| 38 #import "Toolbar.h" | 39 #import "Toolbar.h" |
| 39 | 40 |
| 40 #import "AppDelegate.h" | 41 #import "AppDelegate.h" |
| 41 | 42 |
| 70 | 71 |
| 71 [NSApplication sharedApplication]; | 72 [NSApplication sharedApplication]; |
| 72 //[NSBundle loadNibNamed:@"MainMenu" owner:NSApp ]; | 73 //[NSBundle loadNibNamed:@"MainMenu" owner:NSApp ]; |
| 73 //[[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp topLevelObjects:&topLevelObjects]; | 74 //[[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp topLevelObjects:&topLevelObjects]; |
| 74 | 75 |
| 76 ui_icon_init(); | |
| 75 ui_toolbar_init(); | 77 ui_toolbar_init(); |
| 78 | |
| 76 } | 79 } |
| 77 | 80 |
| 78 const char* ui_appname() { | 81 const char* ui_appname() { |
| 79 return application_name; | 82 return application_name; |
| 80 } | 83 } |
