X-Git-Url: http://git.ithinksw.org/ITKit.git/blobdiff_plain/676d1feebedb6b04b4da4bb58b3ca1282d7740f5..7a218424c6a92eb4979564a7260f862edd46052d:/ITCategory-NSMenu.m diff --git a/ITCategory-NSMenu.m b/ITCategory-NSMenu.m old mode 100755 new mode 100644 index 80501bf..69d3c61 --- a/ITCategory-NSMenu.m +++ b/ITCategory-NSMenu.m @@ -1,13 +1,18 @@ #import "ITCategory-NSMenu.h" -@interface NSMenu (HACKHACKHACKHACK) +extern void _NSGetMenuItemForCommandKeyEvent(NSMenu *menu, void *chicken, void *taco, void *food); +extern MenuRef _NSGetCarbonMenu(NSMenu *menu); + +@interface NSMenu (ITKitCategoryHacks) - (id)_menuImpl; @end -extern void _NSGetMenuItemForCommandKeyEvent (NSMenu *menu, void *chicken, void *taco, void *food); -extern MenuRef _NSGetCarbonMenu( NSMenu *menu); +@protocol _ITKitCategoryNSMenuItemPantherCompatability +- (int)indentationLevel; +- (void)setIndentationLevel:(int)indentationLevel; +@end -@implementation NSMenu (ITCategory) +@implementation NSMenu (ITKitCategory) - (void)indentItem:(id )item { [self indentItem:item toLevel:1]; @@ -22,8 +27,9 @@ extern MenuRef _NSGetCarbonMenu( NSMenu *menu); } - (void)indentItemAtIndex:(int)index toLevel:(int)indentLevel { - if ([[self itemAtIndex:index] respondsToSelector:@selector(setIndentationLevel:)]) { - (void)[[self itemAtIndex:index] setIndentationLevel:indentLevel]; + id theItem = [self itemAtIndex:index]; + if ([theItem respondsToSelector:@selector(setIndentationLevel:)]) { + [(id <_ITKitCategoryNSMenuItemPantherCompatability>)theItem setIndentationLevel:indentLevel]; } else { MenuRef carbonMenu = [self menuRef]; if (carbonMenu) { @@ -36,7 +42,7 @@ extern MenuRef _NSGetCarbonMenu( NSMenu *menu); MenuRef carbonMenu; int w00t, m00f; - if( [self respondsToSelector:@selector(_menuImpl)] ) { + if ([self respondsToSelector:@selector(_menuImpl)]) { (void)[self _menuImpl]; } else { return nil; @@ -57,4 +63,4 @@ extern MenuRef _NSGetCarbonMenu( NSMenu *menu); } } -@end +@end \ No newline at end of file