X-Git-Url: http://git.ithinksw.org/ITKit.git/blobdiff_plain/bdd55e54cd41b9deceb02c64d9345e91246f61d4..a8daf8ac0972b8b5b582a97b50889fec447f45a4:/ITCategory-NSMenu.m?ds=inline

diff --git a/ITCategory-NSMenu.m b/ITCategory-NSMenu.m
index fd048e1..80501bf 100755
--- a/ITCategory-NSMenu.m
+++ b/ITCategory-NSMenu.m
@@ -1,11 +1,3 @@
-//
-//  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)
@@ -17,22 +9,26 @@ 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 + 1, 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);
+        }
     }
 }
 
@@ -41,7 +37,7 @@ extern MenuRef _NSGetCarbonMenu( NSMenu *menu);
     int w00t, m00f;
     
     if( [self respondsToSelector:@selector(_menuImpl)] ) {
-        [self _menuImpl];
+        (void)[self _menuImpl];
     } else {
         return nil;
     }
@@ -51,4 +47,14 @@ extern MenuRef _NSGetCarbonMenu( NSMenu *menu);
     return carbonMenu;
 }
 
+- (void)removeAllItems {
+	int numOfItems = [self numberOfItems];
+	int i = numOfItems;
+	
+	while (i != 0) {
+		[self removeItemAtIndex:(i-1)];
+		i--;
+	}
+}
+
 @end