Revision: 5655
http://skim-app.svn.sourceforge.net/skim-app/?rev=5655&view=rev
Author: hofman
Date: 2009-09-04 09:31:46 +0000 (Fri, 04 Sep 2009)
Log Message:
-----------
Use different method name for getting the current modifiers, as we only get the
standard ones. Use new SL method if available.
Modified Paths:
--------------
trunk/NSEvent_SKExtensions.h
trunk/NSEvent_SKExtensions.m
trunk/SKColorSwatch.m
trunk/SKMainWindowController_Actions.m
trunk/SKPDFView.m
Modified: trunk/NSEvent_SKExtensions.h
===================================================================
--- trunk/NSEvent_SKExtensions.h 2009-09-04 08:30:12 UTC (rev 5654)
+++ trunk/NSEvent_SKExtensions.h 2009-09-04 09:31:46 UTC (rev 5655)
@@ -43,7 +43,7 @@
};
@interface NSEvent (SKExtensions)
-+ (NSUInteger)currentModifierFlags;
++ (NSUInteger)standardModifierFlags;
- (NSUInteger)deviceIndependentModifierFlags;
- (NSUInteger)standardModifierFlags;
- (unichar)firstCharacter;
Modified: trunk/NSEvent_SKExtensions.m
===================================================================
--- trunk/NSEvent_SKExtensions.m 2009-09-04 08:30:12 UTC (rev 5654)
+++ trunk/NSEvent_SKExtensions.m 2009-09-04 09:31:46 UTC (rev 5655)
@@ -40,9 +40,16 @@
#import <Carbon/Carbon.h>
+...@interface NSEvent (SKSnowLeopardDeclarations)
++ (NSUInteger)modifierFlags;
+...@end
+
@implementation NSEvent (SKExtensions)
-+ (NSUInteger)currentModifierFlags {
++ (NSUInteger)standardModifierFlags {
+ if ([self respondsToSelector:@selector(modifierFlags)])
+ return [self modifierFlags] & (NSCommandKeyMask | NSAlternateKeyMask |
NSShiftKeyMask | NSControlKeyMask);
+
NSUInteger flags = 0;
UInt32 currentKeyModifiers = GetCurrentKeyModifiers();
if (currentKeyModifiers & cmdKey)
Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m 2009-09-04 08:30:12 UTC (rev 5654)
+++ trunk/SKColorSwatch.m 2009-09-04 09:31:46 UTC (rev 5655)
@@ -399,7 +399,7 @@
- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender {
NSPoint mouseLoc = [self convertPoint:[sender draggingLocation]
fromView:nil];
- BOOL isCopy = ([NSEvent currentModifierFlags] &&
NSDeviceIndependentModifierFlagsMask) == NSAlternateKeyMask;
+ BOOL isCopy = ([NSEvent standardModifierFlags] &&
NSDeviceIndependentModifierFlagsMask) == NSAlternateKeyMask;
NSInteger i = isCopy ? [self insertionIndexAtPoint:mouseLoc] : [self
colorIndexAtPoint:mouseLoc];
NSDragOperation dragOp = isCopy ? NSDragOperationCopy :
NSDragOperationGeneric;
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2009-09-04 08:30:12 UTC (rev
5654)
+++ trunk/SKMainWindowController_Actions.m 2009-09-04 09:31:46 UTC (rev
5655)
@@ -89,8 +89,8 @@
- (IBAction)selectColor:(id)sender{
PDFAnnotation *annotation = [pdfView activeAnnotation];
if ([annotation isSkimNote]) {
- BOOL isFill = ([NSEvent currentModifierFlags] & NSAlternateKeyMask) !=
0 && [annotation respondsToSelector:@selector(setInteriorColor:)];
- BOOL isText = ([NSEvent currentModifierFlags] & NSAlternateKeyMask) !=
0 && [annotation respondsToSelector:@selector(setFontColor:)];
+ BOOL isFill = ([NSEvent standardModifierFlags] & NSAlternateKeyMask)
!= 0 && [annotation respondsToSelector:@selector(setInteriorColor:)];
+ BOOL isText = ([NSEvent standardModifierFlags] & NSAlternateKeyMask)
!= 0 && [annotation respondsToSelector:@selector(setFontColor:)];
NSColor *color = (isFill ? [(id)annotation interiorColor] : (isText ?
[(id)annotation fontColor] : [annotation color])) ?: [NSColor clearColor];
NSColor *newColor = [sender
respondsToSelector:@selector(representedObject)] ? [sender representedObject] :
[sender respondsToSelector:@selector(color)] ? [sender color] : nil;
if (newColor && [color isEqual:newColor] == NO) {
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2009-09-04 08:30:12 UTC (rev 5654)
+++ trunk/SKPDFView.m 2009-09-04 09:31:46 UTC (rev 5655)
@@ -1729,9 +1729,9 @@
if (highlightAnnotation) {
NSString *type = [highlightAnnotation type];
if ([pboardType isEqualToString:NSColorPboardType]) {
- if (([NSEvent currentModifierFlags] & NSAlternateKeyMask) &&
[highlightAnnotation respondsToSelector:@selector(setInteriorColor:)])
+ if (([NSEvent standardModifierFlags] & NSAlternateKeyMask) &&
[highlightAnnotation respondsToSelector:@selector(setInteriorColor:)])
[(id)highlightAnnotation setInteriorColor:[NSColor
colorFromPasteboard:pboard]];
- else if (([NSEvent currentModifierFlags] & NSAlternateKeyMask)
&& [highlightAnnotation respondsToSelector:@selector(setFontColor:)])
+ else if (([NSEvent standardModifierFlags] &
NSAlternateKeyMask) && [highlightAnnotation
respondsToSelector:@selector(setFontColor:)])
[(id)highlightAnnotation setFontColor:[NSColor
colorFromPasteboard:pboard]];
else
[highlightAnnotation setColor:[NSColor
colorFromPasteboard:pboard]];
@@ -4240,7 +4240,7 @@
- (void)doUpdateCursor {
NSEvent *event = [NSEvent mouseEventWithType:NSMouseMoved
location:[[self window]
mouseLocationOutsideOfEventStream]
- modifierFlags:[NSEvent currentModifierFlags]
+ modifierFlags:[NSEvent
standardModifierFlags]
timestamp:0
windowNumber:[[self window] windowNumber]
context:nil
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit