diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-07-23 14:49:52 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-07-23 14:49:52 +0000 |
| commit | 9f62b7ba60b594352740a67a69724dcd8a39c298 (patch) | |
| tree | ad0b83bca941586d1f90794127cdd864313a8ce0 /unicode/src/menu | |
| parent | 3dc26d2e5c5b360f844ea23c3f60ea4178f6f883 (diff) | |
| download | usdx-9f62b7ba60b594352740a67a69724dcd8a39c298.tar.gz usdx-9f62b7ba60b594352740a67a69724dcd8a39c298.tar.xz usdx-9f62b7ba60b594352740a67a69724dcd8a39c298.zip | |
some merge fixes
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1856 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'unicode/src/menu')
| -rw-r--r-- | unicode/src/menu/UMenu.pas | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unicode/src/menu/UMenu.pas b/unicode/src/menu/UMenu.pas index 7cdaef36..0c6ebc63 100644 --- a/unicode/src/menu/UMenu.pas +++ b/unicode/src/menu/UMenu.pas @@ -1616,7 +1616,7 @@ begin if RightMbESC and (MouseButton = SDL_BUTTON_RIGHT) and BtnDown then begin //if RightMbESC is set, send ESC keypress - Result:=ParseInput(SDLK_ESCAPE, #0, true); + Result:=ParseInput(SDLK_ESCAPE, 0, true); end; nBut := InteractAt(X, Y); @@ -1628,18 +1628,18 @@ begin if (MouseButton = SDL_BUTTON_LEFT) and BtnDown then begin //click button - Result:=ParseInput(SDLK_RETURN, #0, true); + Result:=ParseInput(SDLK_RETURN, 0, true); end; if (Interactions[nBut].Typ = iSelectS) then begin //forward/backward in select slide with mousewheel if (MouseButton = SDL_BUTTON_WHEELDOWN) and BtnDown then begin - ParseInput(SDLK_RIGHT, #0, true); + ParseInput(SDLK_RIGHT, 0, true); end; if (MouseButton = SDL_BUTTON_WHEELUP) and BtnDown then begin - ParseInput(SDLK_LEFT, #0, true); + ParseInput(SDLK_LEFT, 0, true); end; end; end |