diff options
| author | Vadim Shpakovski | 2014-01-06 06:30:57 -0800 |
|---|---|---|
| committer | Vadim Shpakovski | 2014-01-06 06:30:57 -0800 |
| commit | 28c656d654864d455fced6eae19e29381c29fc40 (patch) | |
| tree | 206c20c0b2af64f4919652668ba3bad334511458 | |
| parent | 9edbf670f506602ea3b7cba0cfa38f056ac32813 (diff) | |
| parent | ce5760d61c27243d4d08c4f9693226f805975dad (diff) | |
| download | MASShortcut-28c656d654864d455fced6eae19e29381c29fc40.tar.bz2 | |
Merge pull request #29 from ShadowLightz/master
Silenced compiler warnings, updated README
| -rw-r--r-- | MASShortcut+Monitoring.m | 6 | ||||
| -rw-r--r-- | MASShortcut.m | 2 | ||||
| -rw-r--r-- | README.md | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/MASShortcut+Monitoring.m b/MASShortcut+Monitoring.m index bd0282b..b6750b4 100644 --- a/MASShortcut+Monitoring.m +++ b/MASShortcut+Monitoring.m @@ -1,9 +1,9 @@ #import "MASShortcut+Monitoring.h" -NSMutableDictionary *MASRegisteredHotKeys(); -BOOL InstallCommonEventHandler(); +NSMutableDictionary *MASRegisteredHotKeys(void); +BOOL InstallCommonEventHandler(void); BOOL InstallHotkeyWithShortcut(MASShortcut *shortcut, UInt32 *outCarbonHotKeyID, EventHotKeyRef *outCarbonHotKey); -void UninstallEventHandler(); +void UninstallEventHandler(void); #pragma mark - diff --git a/MASShortcut.m b/MASShortcut.m index f03be0e..4e9888d 100644 --- a/MASShortcut.m +++ b/MASShortcut.m @@ -189,7 +189,7 @@ NSString *const MASShortcutModifierFlags = @"ModifierFlags"; UniCharCount length = 0; UniChar chars[256] = { 0 }; UInt32 deadKeyState = 0; - error = UCKeyTranslate(layoutData, self.keyCode, kUCKeyActionDisplay, 0, // No modifiers + error = UCKeyTranslate(layoutData, (UInt16)self.keyCode, kUCKeyActionDisplay, 0, // No modifiers LMGetKbdType(), kUCKeyTranslateNoDeadKeysMask, &deadKeyState, sizeof(chars) / sizeof(UniChar), &length, chars); keystroke = ((error == noErr) && length ? [NSString stringWithCharacters:chars length:length] : @""); @@ -9,7 +9,7 @@ The project MASShortcut introduces modern API and user interface for recording, I hope, it is really easy: ```objective-c -// Drop a custom view into XIB and set its class to MASShortcutView +// Drop a custom view into XIB, set its class to MASShortcutView and its height to 19. If you select another appearance style look up the correct values in MASShortcutView.h @property (nonatomic, weak) IBOutlet MASShortcutView *shortcutView; // Think up a preference key to store a global shortcut between launches |