Changes from mercurial repository.

This commit is contained in:
Sorin Sbarnea 2009-10-21 16:25:08 +00:00
parent 44bb32f476
commit 98c68897d8
135 changed files with 2686 additions and 26965 deletions

View file

@ -527,7 +527,8 @@ CMSWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask)
m_oldHotKeyIDs.pop_back();
}
else {
id = m_hotKeys.size() + 1;
//id = m_hotKeys.size() + 1;
id = (UInt32)m_hotKeys.size() + 1;
}
// if this hot key has modifiers only then we'll handle it specially