Changeset 7426

Timestamp:

Dec 17, 2008, 2:13:49 AM (13 years ago)

Author:

livings124

Message:

get rid of an unnecessary class

Location:

trunk/macosx

Files:

• Controller.m (modified) (4 diffs)
• Makefile.am (modified) (1 diff)
• NSMenuAdditions.h (deleted)
• NSMenuAdditions.m (deleted)

trunk/macosx/Controller.m

@@ -45 +45 @@
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
-#import "NSMenuAdditions.h"
 #import "ExpandedPathToPathTransformer.h"
 #import "ExpandedPathToIconTransformer.h"
@@ -2285 +2284 @@
 - (void) menuNeedsUpdate: (NSMenu *) menu
 {
-    #warning streamline?
     if (menu == fGroupsSetMenu || menu == fGroupsSetContextMenu)
     {
@@ -2292 +2290 @@
         
         NSMenu * groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(setGroup:) isSmall: NO];
-        [menu appendItemsFromMenu: groupMenu atIndexes: [NSIndexSet indexSetWithIndexesInRange:
-                NSMakeRange(0, [groupMenu numberOfItems])] atBottom: NO];
+        const NSInteger groupMenuCount = [groupMenu numberOfItems];
+        for (NSInteger i = 0; i < groupMenuCount; i++)
+        {
+            NSMenuItem * item = [[groupMenu itemAtIndex: 0] retain];
+            [groupMenu removeItemAtIndex: 0];
+            [menu addItem: item];
+            [item release];
+        }
     }
     else if (menu == fGroupFilterMenu)
@@ -2302 +2306 @@
         NSMenu * groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(setGroupFilter:)
                                 isSmall: YES];
-        [menu appendItemsFromMenu: groupMenu atIndexes: [NSIndexSet indexSetWithIndexesInRange:
-                NSMakeRange(0, [groupMenu numberOfItems])] atBottom: YES];
+        const NSInteger groupMenuCount = [groupMenu numberOfItems];
+        for (NSInteger i = 0; i < groupMenuCount; i++)
+        {
+            NSMenuItem * item = [[groupMenu itemAtIndex: 0] retain];
+            [groupMenu removeItemAtIndex: 0];
+            [menu addItem: item];
+            [item release];
+        }
     }
     else if (menu == fUploadMenu || menu == fDownloadMenu)

trunk/macosx/Makefile.am

@@ -90 +90 @@
     NSBezierPathAdditions.h \
     NSBezierPathAdditions.m \
-    NSMenuAdditions.h \
-    NSMenuAdditions.m \
     NSStringAdditions.h \
     NSStringAdditions.m \