aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorMax Horn2003-06-15 11:32:14 +0000
committerMax Horn2003-06-15 11:32:14 +0000
commitb8b80805c17b5865f63394659f9907cf5b1690ec (patch)
tree4258ee36ef18425e585aaa28132335cb3a4ebf37 /backends
parent8446d7d67ec6205aa51f748beeb141b1367532b4 (diff)
downloadscummvm-rg350-b8b80805c17b5865f63394659f9907cf5b1690ec.tar.gz
scummvm-rg350-b8b80805c17b5865f63394659f9907cf5b1690ec.tar.bz2
scummvm-rg350-b8b80805c17b5865f63394659f9907cf5b1690ec.zip
fixed 'quit' entry in help for Mac OS X; disabled Alt-X/Ctrl-Z on OS X (Cmd-Q is the one and only true way to quit here :-)
svn-id: r8505
Diffstat (limited to 'backends')
-rw-r--r--backends/sdl/sdl-common.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp
index 3d3acf573e..f22d671476 100644
--- a/backends/sdl/sdl-common.cpp
+++ b/backends/sdl/sdl-common.cpp
@@ -543,19 +543,20 @@ bool OSystem_SDL_Common::poll_event(Event *event) {
break;
}
- // Ctrl-z and Alt-X quit
- if ((b == KBD_CTRL && ev.key.keysym.sym=='z') || (b == KBD_ALT && ev.key.keysym.sym=='x')) {
- event->event_code = EVENT_QUIT;
- return true;
- }
-
#ifdef MACOSX
// On Macintosh', Cmd-Q quits
if ((ev.key.keysym.mod & KMOD_META) && ev.key.keysym.sym=='q') {
event->event_code = EVENT_QUIT;
return true;
}
+#else
+ // Ctrl-z and Alt-X quit
+ if ((b == KBD_CTRL && ev.key.keysym.sym=='z') || (b == KBD_ALT && ev.key.keysym.sym=='x')) {
+ event->event_code = EVENT_QUIT;
+ return true;
+ }
#endif
+
// Ctr-Alt-<key> will change the GFX mode
if (b == (KBD_CTRL|KBD_ALT)) {
char keys[] = "1234567890";