Revision: 4007
http://skim-app.svn.sourceforge.net/skim-app/?rev=4007&view=rev
Author: hofman
Date: 2008-06-11 13:40:16 -0700 (Wed, 11 Jun 2008)
Log Message:
-----------
add another convenience method to remove all menu items
Modified Paths:
--------------
trunk/NSMenu_SKExtensions.h
trunk/NSMenu_SKExtensions.m
trunk/SKMainWindowController_Toolbar.m
Modified: trunk/NSMenu_SKExtensions.h
===================================================================
--- trunk/NSMenu_SKExtensions.h 2008-06-11 20:20:50 UTC (rev 4006)
+++ trunk/NSMenu_SKExtensions.h 2008-06-11 20:40:16 UTC (rev 4007)
@@ -55,6 +55,8 @@
- (NSMenuItem *)insertItemWithTitle:(NSString *)aString submenu:(NSMenu
*)aSubmenu atIndex:(NSInteger)anIndex;
- (NSMenuItem *)addItemWithTitle:(NSString *)aString submenu:(NSMenu
*)aSubmenu;
+- (void)removeAllItems;
+
@end
Modified: trunk/NSMenu_SKExtensions.m
===================================================================
--- trunk/NSMenu_SKExtensions.m 2008-06-11 20:20:50 UTC (rev 4006)
+++ trunk/NSMenu_SKExtensions.m 2008-06-11 20:40:16 UTC (rev 4007)
@@ -91,6 +91,12 @@
return [self insertItemWithTitle:aString submenu:aSubmenu atIndex:[self
numberOfItems]];
}
+- (void)removeAllItems {
+ NSInteger i = [self numberOfItems];
+ while (i--)
+ [self removeItemAtIndex:i];
+}
+
@end
Modified: trunk/SKMainWindowController_Toolbar.m
===================================================================
--- trunk/SKMainWindowController_Toolbar.m 2008-06-11 20:20:50 UTC (rev
4006)
+++ trunk/SKMainWindowController_Toolbar.m 2008-06-11 20:40:16 UTC (rev
4007)
@@ -99,16 +99,14 @@
NSToolbarItem *toolbarItem = [toolbarItems
objectForKey:SKDocumentToolbarColorSwatchItemIdentifier];
NSMenu *menu = [[toolbarItem menuFormRepresentation] submenu];
- int i = [menu numberOfItems];
- while (i--)
- [menu removeItemAtIndex:i];
-
NSEnumerator *colorEnum = [[colorSwatch colors] objectEnumerator];
NSColor *color;
NSRect rect = NSMakeRect(0.0, 0.0, 16.0, 16.0);
NSRect lineRect = NSInsetRect(rect, 0.5, 0.5);
NSRect swatchRect = NSInsetRect(rect, 1.0, 1.0);
+ [menu removeAllItems];
+
while (color = [colorEnum nextObject]) {
NSImage *image = [[NSImage alloc] initWithSize:rect.size];
NSMenuItem *item = [menu addItemWithTitle:@""
action:@selector(selectColor:) keyEquivalent:@""];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
