Merge some changes to the SDL2 branch
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/sdl2@2103 416bcca6-2ee7-4201-b75f-2eb2f807beb1