diff options
| author | Tomáš Znamenáček | 2015-04-10 09:06:12 +0200 |
|---|---|---|
| committer | Tomáš Znamenáček | 2015-04-10 09:06:12 +0200 |
| commit | 3f63f8fefccf36f567308854f5b1e3908a15c9c3 (patch) | |
| tree | a6dc38e5a50bbe7f6ea3eb2e327b2c1aa78df636 /Framework | |
| parent | 6c4577199c3d46ddcd9b6c5caf56ade9fc2559aa (diff) | |
| parent | dcb134242da943861596d001bf65c4a2c2a46d89 (diff) | |
| download | MASShortcut-3f63f8fefccf36f567308854f5b1e3908a15c9c3.tar.bz2 | |
Merge pull request #69 from pfandrade/master
Not declaring MASShortcutGlyph as a variable in the header.
Prevents duplicate symbol errors.
Diffstat (limited to 'Framework')
| -rw-r--r-- | Framework/MASKeyCodes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Framework/MASKeyCodes.h b/Framework/MASKeyCodes.h index 40cee9e..989c942 100644 --- a/Framework/MASKeyCodes.h +++ b/Framework/MASKeyCodes.h @@ -21,7 +21,7 @@ enum { kMASShortcutGlyphPadClear = 0x2327, kMASShortcutGlyphNorthwestArrow = 0x2196, kMASShortcutGlyphSoutheastArrow = 0x2198, -} MASShortcutGlyph; +}; NS_INLINE NSString* NSStringFromMASKeyCode(unsigned short ch) { |