define some constants for characters we use

JackieXie168 · Jul 6, 2013 · aaf2b52 · aaf2b52
1 parent 7626b85
commit aaf2b52
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/NSEvent_SKExtensions.h b/NSEvent_SKExtensions.h
@@ -38,6 +38,11 @@
 
 #import <Cocoa/Cocoa.h>
 
+enum {
+    SKSpaceCharacter = 0x0020,
+    SKEscapeCharacter = 0x001b
+};
+
 @interface NSEvent (SKExtensions)
 
 + (NSUInteger)standardModifierFlags;

diff --git a/SKDragImageView.m b/SKDragImageView.m
@@ -103,7 +103,7 @@ - (NSMenu *)menuForEvent:(NSEvent *)theEvent {
 }
 
 - (void)keyDown:(NSEvent *)theEvent {
-    if ([theEvent firstCharacter] == 0x20 && [theEvent deviceIndependentModifierFlags] == 0) {
+    if ([theEvent firstCharacter] == SKSpaceCharacter && [theEvent deviceIndependentModifierFlags] == 0) {
         [self togglePreviewPanel:nil];
     } else {
         [super keyDown:theEvent];

diff --git a/SKOutlineView.m b/SKOutlineView.m
@@ -42,8 +42,6 @@ This software is Copyright (c) 2007-2013
 #import "NSEvent_SKExtensions.h"
 #import "NSFont_SKExtensions.h"
 
-#define SPACE_CHARACTER (unichar)0x20
-
 
 @implementation SKOutlineView
 
@@ -98,14 +96,14 @@ - (void)keyDown:(NSEvent *)theEvent {
     if ((eventChar == NSNewlineCharacter || eventChar == NSEnterCharacter || eventChar == NSCarriageReturnCharacter) && modifierFlags == 0) {
         if ([self doubleAction] == NULL || [self sendAction:[self doubleAction] to:[self target]] == NO)
             NSBeep();
-    } else if ((eventChar == SPACE_CHARACTER) && modifierFlags == 0) {
+    } else if ((eventChar == SKSpaceCharacter) && modifierFlags == 0) {
         if (supportsQuickLook == NO)
             [[self enclosingScrollView] pageDown:nil];
         else if ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible])
             [[QLPreviewPanel sharedPreviewPanel] orderOut:nil];
         else
             [[QLPreviewPanel sharedPreviewPanel] makeKeyAndOrderFront:nil];
-    } else if ((eventChar == SPACE_CHARACTER) && modifierFlags == NSShiftKeyMask) {
+    } else if ((eventChar == SKSpaceCharacter) && modifierFlags == NSShiftKeyMask) {
         if (supportsQuickLook == NO)
             [[self enclosingScrollView] pageUp:nil];
     } else if (eventChar == NSHomeFunctionKey && (modifierFlags & ~NSFunctionKeyMask) == 0) {

diff --git a/SKPDFView.m b/SKPDFView.m
@@ -72,8 +72,6 @@ This software is Copyright (c) 2006-2013
 #import "NSGraphics_SKExtensions.h"
 #import "NSArray_SKExtensions.h"
 
-#define SKEscapeCharacter 0x001b
-
 #define ANNOTATION_MODE_COUNT 9
 #define TOOL_MODE_COUNT 5
 

diff --git a/SKTableView.m b/SKTableView.m
@@ -43,8 +43,6 @@ This software is Copyright (c) 2007-2013
 #import "NSFont_SKExtensions.h"
 #import "SKImageToolTipWindow.h"
 
-#define SPACE_CHARACTER (unichar)0x20
-
 
 @interface SKTableView (SKPrivate)
 - (void)rebuildTrackingAreas;
@@ -88,14 +86,14 @@ - (void)keyDown:(NSEvent *)theEvent {
             NSBeep();
     } else if ((eventChar == NSDeleteCharacter || eventChar == NSDeleteFunctionKey) && modifierFlags == 0 && [self canDelete]) {
         [self delete:self];
-    } else if ((eventChar == SPACE_CHARACTER) && modifierFlags == 0) {
+    } else if ((eventChar == SKSpaceCharacter) && modifierFlags == 0) {
         if (supportsQuickLook == NO)
             [[self enclosingScrollView] pageDown:nil];
         else if ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible])
             [[QLPreviewPanel sharedPreviewPanel] orderOut:nil];
         else
             [[QLPreviewPanel sharedPreviewPanel] makeKeyAndOrderFront:nil];
-    } else if ((eventChar == SPACE_CHARACTER) && modifierFlags == NSShiftKeyMask) {
+    } else if ((eventChar == SKSpaceCharacter) && modifierFlags == NSShiftKeyMask) {
         if (supportsQuickLook == NO)
             [[self enclosingScrollView] pageUp:nil];
     } else if (eventChar == NSHomeFunctionKey && (modifierFlags & ~NSFunctionKeyMask) == 0) {