comparison: ui/cocoa/toolkit.m
ui/cocoa/toolkit.m
- changeset 677
- 04bcb1930fbf
- parent 674
- 51670b0bc625
- child 687
- d43b4fcd3d8c
equal
deleted
inserted
replaced
| 676:f0eea815c5ff | 677:04bcb1930fbf |
|---|---|
| 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 "menu.h" | 37 #import "menu.h" |
| 38 #import "Toolbar.h" | |
| 38 | 39 |
| 39 #import "AppDelegate.h" | 40 #import "AppDelegate.h" |
| 40 | 41 |
| 41 static const char *application_name; | 42 static const char *application_name; |
| 42 | 43 |
| 68 uic_load_app_properties(); | 69 uic_load_app_properties(); |
| 69 | 70 |
| 70 [NSApplication sharedApplication]; | 71 [NSApplication sharedApplication]; |
| 71 //[NSBundle loadNibNamed:@"MainMenu" owner:NSApp ]; | 72 //[NSBundle loadNibNamed:@"MainMenu" owner:NSApp ]; |
| 72 //[[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp topLevelObjects:&topLevelObjects]; | 73 //[[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp topLevelObjects:&topLevelObjects]; |
| 74 | |
| 75 ui_toolbar_init(); | |
| 73 } | 76 } |
| 74 | 77 |
| 75 const char* ui_appname() { | 78 const char* ui_appname() { |
| 76 return application_name; | 79 return application_name; |
| 77 } | 80 } |
