merged 1.3 r1048:1049 into 1.4 and trunk
This commit is contained in:
parent
baaa240a8c
commit
9104860863
|
@ -26,6 +26,8 @@ CGKeyCode escKeyCode = 53;
|
||||||
CGKeyCode shiftKeyCode = 56;
|
CGKeyCode shiftKeyCode = 56;
|
||||||
CGKeyCode controlKeyCode = 59;
|
CGKeyCode controlKeyCode = 59;
|
||||||
|
|
||||||
|
// TODO: make pollActiveModifiers tests work reliably.
|
||||||
|
/*
|
||||||
TEST(COSXKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCorrect)
|
TEST(COSXKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCorrect)
|
||||||
{
|
{
|
||||||
CMockKeyMap keyMap;
|
CMockKeyMap keyMap;
|
||||||
|
@ -93,3 +95,4 @@ TEST(COSXKeyStateTests, pollActiveModifiers_controlKeyDownThenUp_masksAreCorrect
|
||||||
EXPECT_TRUE((upMask & KeyModifierControl) == 0)
|
EXPECT_TRUE((upMask & KeyModifierControl) == 0)
|
||||||
<< "control key still in mask (" << upMask << ") - make sure no keys are being held down";
|
<< "control key still in mask (" << upMask << ") - make sure no keys are being held down";
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
Loading…
Reference in New Issue