Removing the use of private CoreGraphics APIs to draw shadows, and replacing with...

[ITKit.git] / ITCategory-NSMenu.m

diff --git a/ITCategory-NSMenu.m b/ITCategory-NSMenu.m
old mode 100755 (executable)
new mode 100644 (file)
index 4e94be0..5ec05a8
--- a/ITCategory-NSMenu.m
+++ b/ITCategory-NSMenu.m
@@ -1,52 +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 MenuRef _NSGetCarbonMenu( NSMenu *menu);
+@protocol _ITKitCategoryNSMenuItemPantherCompatability <NSMenuItem>
+- (int)indentationLevel;
+- (void)setIndentationLevel:(int)indentationLevel;
+@end
 
-@implementation NSMenu (ITCategory)
+@implementation NSMenu (ITKitCategory)
 
-- (void)indentItem:(NSMenuItem *)item {
-    [self indentItem:item toLevel:2];
+- (void)indentItem:(id <NSMenuItem>)item {
+       [self indentItem:item toLevel:1];
 }
 
 - (void)indentItemAtIndex:(int)index {
-    [self indentItemAtIndex:index toLevel:2];
+       [self indentItemAtIndex:index toLevel:1];
 }
 
-- (void)indentItem:(NSMenuItem *)item toLevel:(int)indentLevel {
-    [self indentItemAtIndex:[self indexOfItem:item] toLevel:indentLevel];
+- (void)indentItem:(id <NSMenuItem>)item toLevel:(int)indentLevel {
+       [self indentItemAtIndex:[self indexOfItem:item] toLevel:indentLevel];
 }
 
 - (void)indentItemAtIndex:(int)index toLevel:(int)indentLevel {
-    MenuRef carbonMenu = [self menuRef];
-    
-    if (carbonMenu) {
-        SetMenuItemIndent(carbonMenu, index, indentLevel);
-    }
+       id <NSMenuItem> 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;
-    
-    if( [self respondsToSelector:@selector(_menuImpl)] ) {
-        [self _menuImpl];
-    } else {
-        return nil;
-    }
-    
-    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