speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests Projects Releases 1 Packages Wiki Activity Actions 5

Fix XML menu small merge from sdl-port issue in guimenu.cpp

Browse source 
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
This commit is contained in:
pouillot 2009-10-25 17:27:40 +00:00
parent eaf9bb8057
commit 09ba0016da
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libs/tgfclient/guiedit.cpp
View file

@ -29,7 +29,6 @@
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#endif #endif
#include <SDL/SDL.h>
#include "tgfclient.h" #include "tgfclient.h"
#include "gui.h" #include "gui.h"
#include "guifont.h" #include "guifont.h"

21
src/libs/tgfclient/guimenu.cpp
View file

@ -30,7 +30,6 @@
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#endif #endif
#include <SDL/SDL.h>
#include "tgfclient.h" #include "tgfclient.h"
#include "gui.h" #include "gui.h"
@ -59,14 +58,14 @@ gfMenuInit(void)
void void
GfuiMenuDefaultKeysAdd(void *scr) GfuiMenuDefaultKeysAdd(void *scr)
{ {
GfuiAddKey(scr, SDLK_TAB, "Select Next Entry", NULL, gfuiSelectNext, NULL); GfuiAddKey(scr, 9, "Select Next Entry", NULL, gfuiSelectNext, NULL);
GfuiAddKey(scr, SDLK_RETURN, "Perform Action", (void*)2, gfuiMouseAction, NULL); GfuiAddKey(scr, 13, "Perform Action", (void*)2, gfuiMouseAction, NULL);
GfuiAddSKey(scr, SDLK_UP, "Select Previous Entry", NULL, gfuiSelectPrev, NULL); GfuiAddSKey(scr, GLUT_KEY_UP, "Select Previous Entry", NULL, gfuiSelectPrev, NULL);
GfuiAddSKey(scr, SDLK_DOWN, "Select Next Entry", NULL, gfuiSelectNext, NULL); GfuiAddSKey(scr, GLUT_KEY_DOWN, "Select Next Entry", NULL, gfuiSelectNext, NULL);
GfuiAddSKey(scr, SDLK_PAGEUP, "Select Previous Entry", NULL, gfuiSelectPrev, NULL); GfuiAddSKey(scr, GLUT_KEY_PAGE_UP, "Select Previous Entry", NULL, gfuiSelectPrev, NULL);
GfuiAddSKey(scr, SDLK_PAGEDOWN, "Select Next Entry", NULL, gfuiSelectNext, NULL); GfuiAddSKey(scr, GLUT_KEY_PAGE_DOWN, "Select Next Entry", NULL, gfuiSelectNext, NULL);
GfuiAddSKey(scr, SDLK_F1, "Help", scr, GfuiHelpScreen, NULL); GfuiAddSKey(scr, GLUT_KEY_F1, "Help", scr, GfuiHelpScreen, NULL);
GfuiAddSKey(scr, SDLK_F12, "Screen-Shot", NULL, GfuiScreenShot, 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, (void*)cbinfo, dispInfo,
remInfo); remInfo);
GfuiAddKey(scr, SDLK_ESCAPE, tip, userdata, onpush, NULL); GfuiAddKey(scr, 27, tip, userdata, onpush, NULL);
return bId; return bId;
} }
@ -263,7 +262,7 @@ GfuiMenuBackQuitButtonCreateEx(void *scr, const char *text, const char *tip, voi
(void*)cbinfo, dispInfo, (void*)cbinfo, dispInfo,
remInfo); remInfo);
GfuiAddKey(scr, SDLK_ESCAPE, tip, userdata, onpush, NULL); GfuiAddKey(scr, 27, tip, userdata, onpush, NULL);
return bId; return bId;
} }