From 4c9207123d4514a8d7e91fb640e7a370a8bce7bb Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Mon, 15 Apr 2013 05:51:19 -0400 Subject: [PATCH] compiler: updated bootstrap file; ecere/win32: Added F11/F12 VK translation --- compiler/bootstrap/ecere/bootstrap/File.c | 2 +- ecere/src/gui/Key.ec | 2 +- ecere/src/gui/drivers/Win32Interface.ec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/bootstrap/ecere/bootstrap/File.c b/compiler/bootstrap/ecere/bootstrap/File.c index f37236c..390be35 100644 --- a/compiler/bootstrap/ecere/bootstrap/File.c +++ b/compiler/bootstrap/ecere/bootstrap/File.c @@ -585,7 +585,7 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__sys__File_Tell(struct __ecer { struct __ecereNameSpace__ecere__sys__File * __ecerePointer___ecereNameSpace__ecere__sys__File = (struct __ecereNameSpace__ecere__sys__File *)(this ? (((char *)this) + __ecereClass___ecereNameSpace__ecere__sys__File->offset) : 0); -return __ecerePointer___ecereNameSpace__ecere__sys__File->input ? ftell(__ecerePointer___ecereNameSpace__ecere__sys__File->input) : ftell(__ecerePointer___ecereNameSpace__ecere__sys__File->output); +return (unsigned int)(__ecerePointer___ecereNameSpace__ecere__sys__File->input ? ftell(__ecerePointer___ecereNameSpace__ecere__sys__File->input) : ftell(__ecerePointer___ecereNameSpace__ecere__sys__File->output)); } int __ecereMethod___ecereNameSpace__ecere__sys__File_Read(struct __ecereNameSpace__ecere__com__Instance * this, void * buffer, unsigned int size, unsigned int count) diff --git a/ecere/src/gui/Key.ec b/ecere/src/gui/Key.ec index 563140f..49cacfd 100644 --- a/ecere/src/gui/Key.ec +++ b/ecere/src/gui/Key.ec @@ -198,7 +198,7 @@ public enum KeyCode : Key keyPadDelete = 0x53, // KeyPadLess = 0x56, - // F10-F12 + // F11-F12 f11 = 0x57, f12 = 0x58, diff --git a/ecere/src/gui/drivers/Win32Interface.ec b/ecere/src/gui/drivers/Win32Interface.ec index 9621163..575972c 100644 --- a/ecere/src/gui/drivers/Win32Interface.ec +++ b/ecere/src/gui/drivers/Win32Interface.ec @@ -106,7 +106,7 @@ static byte key2VK[256] = 'D','F','G','H','J','K','L',VK_SEMI,VK_QUOTE,VK_TILDE,VK_SHIFT,VK_BACK_SLASH,'Z','X','C','V', 'B','N','M',VK_COMMA,VK_PERIOD,VK_DIVIDE,VK_SHIFT,VK_MULTIPLY,VK_LMENU,VK_SPACE,VK_CAPITAL,VK_F1,VK_F2,VK_F3,VK_F4,VK_F5, VK_F6,VK_F7,VK_F8,VK_F9,VK_F10,VK_NUMLOCK,VK_SCROLL,VK_NUMPAD7,VK_NUMPAD8,VK_NUMPAD9,VK_SUBTRACT,VK_NUMPAD4,VK_NUMPAD5,VK_NUMPAD6,VK_ADD,VK_NUMPAD1, - VK_NUMPAD2,VK_NUMPAD3,VK_NUMPAD0,VK_DELETE,0,0,0,0,0,0,0,0,0,0,0,0, + VK_NUMPAD2,VK_NUMPAD3,VK_NUMPAD0,VK_DELETE,0,0,0,VK_F11,VK_F12,0,0,0,0,0,0,0, 0,0,0,0,0,0,VK_HOME,VK_UP,VK_PRIOR,VK_LEFT,VK_RIGHT,VK_END,VK_DOWN,VK_NEXT,VK_INSERT,VK_DELETE, 0,0,0,VK_SHIFT,VK_MENU,VK_CONTROL }; -- 1.8.3.1