Synchronized with trunk

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1201 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2009-08-14 08:02:57 +00:00
commit 7a8cc0c76a
21 changed files with 2589 additions and 1850 deletions

View file

@ -142,7 +142,7 @@ namespace Key
F15,
Pause,
Count // For internal use
Count // Keep last -- total number of keyboard keys
};
}
@ -160,7 +160,7 @@ namespace Mouse
XButton1,
XButton2,
Count // For internal use
Count // Keep last -- total number of mouse buttons
};
}
@ -180,7 +180,7 @@ namespace Joy
AxisV,
AxisPOV,
Count // For internal use
Count // Keep last -- total number of joystick axis
};
}
@ -286,7 +286,9 @@ public :
MouseLeft,
JoyButtonPressed,
JoyButtonReleased,
JoyMoved
JoyMoved,
Count // Keep last -- total number of event types
};
////////////////////////////////////////////////////////////