X-Git-Url: http://git.ithinksw.org/ITKit.git/blobdiff_plain/ceb1dcca2b608f56e53188b5bb623755c4eeddbb..0fc44e732f98ed55cdd0d0914c4031ad9c005edc:/ITCategory-NSMenu.m?ds=sidebyside diff --git a/ITCategory-NSMenu.m b/ITCategory-NSMenu.m old mode 100755 new mode 100644 index 78470cc..5ec05a8 --- a/ITCategory-NSMenu.m +++ b/ITCategory-NSMenu.m @@ -1,58 +1,66 @@ -// -// ITCategory-NSMenu.m -// ITKit -// -// Created by Joseph Spiros on Sat Sep 27 2003. -// Copyright (c) 2003 __MyCompanyName__. All rights reserved. -// - #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]; + [self indentItem:item toLevel:1]; } - (void)indentItemAtIndex:(int)index { - [self indentItemAtIndex:index toLevel:1]; + [self indentItemAtIndex:index toLevel:1]; } - (void)indentItem:(id )item toLevel:(int)indentLevel { - [self indentItemAtIndex:[self indexOfItem:item] toLevel:indentLevel]; + [self indentItemAtIndex:[self indexOfItem:item] toLevel:indentLevel]; } - (void)indentItemAtIndex:(int)index toLevel:(int)indentLevel { - if ([[self itemAtIndex:index] respondsToSelector:@selector(setIndentationLevel:)]) { - (void)[[self itemAtIndex:index] setIndentationLevel:indentLevel]; - } else { - MenuRef carbonMenu = [self menuRef]; - if (carbonMenu) { - SetMenuItemIndent(carbonMenu, index + 1, indentLevel); - } - } + id theItem = [self itemAtIndex:index]; + if ([theItem respondsToSelector:@selector(setIndentationLevel:)]) { + [(id <_ITKitCategoryNSMenuItemPantherCompatability>)theItem setIndentationLevel:indentLevel]; + } else { + MenuRef carbonMenu = [self menuRef]; + if (carbonMenu) { + SetMenuItemIndent(carbonMenu, index + 1, indentLevel); + } + } } - (MenuRef)menuRef { - MenuRef carbonMenu; - int w00t, m00f; - - if( [self respondsToSelector:@selector(_menuImpl)] ) { - (void)[self _menuImpl]; - } else { - return nil; - } - - _NSGetMenuItemForCommandKeyEvent(self, NULL, &w00t, &m00f); - carbonMenu = _NSGetCarbonMenu(self); - return carbonMenu; + MenuRef carbonMenu; + int w00t, m00f; + + if ([self respondsToSelector:@selector(_menuImpl)]) { + (void)[self _menuImpl]; + } else { + return nil; + } + + _NSGetMenuItemForCommandKeyEvent(self, NULL, &w00t, &m00f); + carbonMenu = _NSGetCarbonMenu(self); + return carbonMenu; } -@end +- (void)removeAllItems { + int numOfItems = [self numberOfItems]; + int i = numOfItems; + + while (i != 0) { + [self removeItemAtIndex:(i-1)]; + i--; + } +} + +@end \ No newline at end of file