Attached is the fix for mouse wheel support. This is against anon CVS, and I know you just did a big code merge, so hopefully this will be easy to apply since it's so small. :)