From 09ba0016daecfe319756596f855afbb47d8d59a8 Mon Sep 17 00:00:00 2001 From: pouillot Date: Sun, 25 Oct 2009 17:27:40 +0000 Subject: [PATCH] Fix XML menu small merge from sdl-port issue in guimenu.cpp git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@1671 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: ff0bfe14dc6eacc8669c979c4d38ea3eb4839a66 Former-commit-id: bffc13ffdad01d7278e41040e05a382e0e3c5f95 --- src/libs/tgfclient/guiedit.cpp | 1 - src/libs/tgfclient/guimenu.cpp | 21 ++++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/libs/tgfclient/guiedit.cpp b/src/libs/tgfclient/guiedit.cpp index 93fcd28f..925acdba 100644 --- a/src/libs/tgfclient/guiedit.cpp +++ b/src/libs/tgfclient/guiedit.cpp @@ -29,7 +29,6 @@ #ifdef WIN32 #include #endif -#include #include "tgfclient.h" #include "gui.h" #include "guifont.h" diff --git a/src/libs/tgfclient/guimenu.cpp b/src/libs/tgfclient/guimenu.cpp index b80ca078..665256ed 100644 --- a/src/libs/tgfclient/guimenu.cpp +++ b/src/libs/tgfclient/guimenu.cpp @@ -30,7 +30,6 @@ #ifdef WIN32 #include #endif -#include #include "tgfclient.h" #include "gui.h" @@ -59,14 +58,14 @@ gfMenuInit(void) void GfuiMenuDefaultKeysAdd(void *scr) { - GfuiAddKey(scr, SDLK_TAB, "Select Next Entry", NULL, gfuiSelectNext, NULL); - GfuiAddKey(scr, SDLK_RETURN, "Perform Action", (void*)2, gfuiMouseAction, NULL); - GfuiAddSKey(scr, SDLK_UP, "Select Previous Entry", NULL, gfuiSelectPrev, NULL); - GfuiAddSKey(scr, SDLK_DOWN, "Select Next Entry", NULL, gfuiSelectNext, NULL); - GfuiAddSKey(scr, SDLK_PAGEUP, "Select Previous Entry", NULL, gfuiSelectPrev, NULL); - GfuiAddSKey(scr, SDLK_PAGEDOWN, "Select Next Entry", NULL, gfuiSelectNext, NULL); - GfuiAddSKey(scr, SDLK_F1, "Help", scr, GfuiHelpScreen, NULL); - GfuiAddSKey(scr, SDLK_F12, "Screen-Shot", NULL, GfuiScreenShot, NULL); + GfuiAddKey(scr, 9, "Select Next Entry", NULL, gfuiSelectNext, NULL); + GfuiAddKey(scr, 13, "Perform Action", (void*)2, gfuiMouseAction, NULL); + GfuiAddSKey(scr, GLUT_KEY_UP, "Select Previous Entry", NULL, gfuiSelectPrev, NULL); + GfuiAddSKey(scr, GLUT_KEY_DOWN, "Select Next Entry", NULL, gfuiSelectNext, NULL); + GfuiAddSKey(scr, GLUT_KEY_PAGE_UP, "Select Previous Entry", NULL, gfuiSelectPrev, NULL); + GfuiAddSKey(scr, GLUT_KEY_PAGE_DOWN, "Select Next Entry", NULL, gfuiSelectNext, NULL); + GfuiAddSKey(scr, GLUT_KEY_F1, "Help", scr, GfuiHelpScreen, NULL); + GfuiAddSKey(scr, GLUT_KEY_F12, "Screen-Shot", NULL, GfuiScreenShot, NULL); } @@ -228,7 +227,7 @@ GfuiMenuBackQuitButtonCreate(void *scr, const char *text, const char *tip, void (void*)cbinfo, dispInfo, remInfo); - GfuiAddKey(scr, SDLK_ESCAPE, tip, userdata, onpush, NULL); + GfuiAddKey(scr, 27, tip, userdata, onpush, NULL); return bId; } @@ -263,7 +262,7 @@ GfuiMenuBackQuitButtonCreateEx(void *scr, const char *text, const char *tip, voi (void*)cbinfo, dispInfo, remInfo); - GfuiAddKey(scr, SDLK_ESCAPE, tip, userdata, onpush, NULL); + GfuiAddKey(scr, 27, tip, userdata, onpush, NULL); return bId; }