Another cleanup that doesn't seem to actually help

[ITKit.git] / ITCategory-NSMenu.m

diff --git a/ITCategory-NSMenu.m b/ITCategory-NSMenu.m
index 4e94be0..78470cc 100755 (executable)
--- a/ITCategory-NSMenu.m
+++ b/ITCategory-NSMenu.m
@@ -12,39 +12,45 @@
 - (id)_menuImpl;
 @end
 
+extern void _NSGetMenuItemForCommandKeyEvent (NSMenu *menu, void *chicken, void *taco, void *food); 
 extern MenuRef _NSGetCarbonMenu( NSMenu *menu);
 
 @implementation NSMenu (ITCategory)
 
-- (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 {
+- (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);
+    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);
+        }
     }
 }
 
 - (MenuRef)menuRef {
     MenuRef carbonMenu;
+    int w00t, m00f;
     
     if( [self respondsToSelector:@selector(_menuImpl)] ) {
-        [self _menuImpl];
+        (void)[self _menuImpl];
     } else {
         return nil;
     }
     
+    _NSGetMenuItemForCommandKeyEvent(self, NULL, &w00t, &m00f); 
     carbonMenu = _NSGetCarbonMenu(self);
     return carbonMenu;
 }