paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 16:09:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed right control release

Browse Source 
git-svn-id: trunk@2481 -
This commit is contained in:
mattias 2002-08-17 23:41:24 +00:00
parent 9cf72ed27f
commit ceae01f603
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/gtk/gtkproc.pp
View File

@ -262,7 +262,7 @@ Procedure InitializePalette(Pal : PGDIObject; Entries : PPALETTEENTRY; RGBCount
function GTKEventState2ShiftState(KeyState: Word): TShiftState; function GTKEventState2ShiftState(KeyState: Word): TShiftState;
function KeyToListCode(KeyCode, VirtKeyCode: Word; Extended: boolean): integer; function KeyToListCode(KeyCode, VirtKeyCode: Word; Extended: boolean): integer;
procedure GetGTKKeyInfo(const Event: PGDKEventKey; var KeyCode,VirtualKey: Word; procedure GetGTKKeyInfo(const Event: PGDKEventKey; var KeyCode,VirtualKey: Word;
var SysKey, Extended, Toggle: Boolean); var SysKey, Extended, Toggle: Boolean; var ShiftState: TShiftState);
procedure StoreCommonDialogSetup(ADialog: TCommonDialog); procedure StoreCommonDialogSetup(ADialog: TCommonDialog);
procedure DestroyCommonDialogAddOns(ADialog: TCommonDialog); procedure DestroyCommonDialogAddOns(ADialog: TCommonDialog);
function ObjectToGTKObject(const AObject: TObject): PGtkObject; function ObjectToGTKObject(const AObject: TObject): PGtkObject;

9
lcl/interfaces/gtk/gtkwinapi.inc
View File

@ -3766,19 +3766,19 @@ begin
VK_LCONTROL: nVirtKey := VK_CONTROL; VK_LCONTROL: nVirtKey := VK_CONTROL;
VK_LMENU: nVirtKey := VK_MENU; VK_LMENU: nVirtKey := VK_MENU;
end; end;
Result := KEYSTATE[FKeyStateList.IndexOf(Pointer(nVirtKey)) <> -1]; Result := KEYSTATE[FKeyStateList.IndexOf(Pointer(nVirtKey)) >=0];
// try extended keys // try extended keys
if Result = 0 if Result = 0
then begin then begin
nVirtKey := nVirtKey or KEYMAP_EXTENDED; nVirtKey := nVirtKey or KEYMAP_EXTENDED;
Result := KEYSTATE[FKeyStateList.IndexOf(Pointer(nVirtKey)) <> -1]; Result := KEYSTATE[FKeyStateList.IndexOf(Pointer(nVirtKey)) >=0];
end; end;
// add toggle // add toggle
if Result <> 0 then if Result <> 0 then
Result := Result or TOGGLESTATE[FKeyStateList.IndexOf(Pointer( Result := Result or TOGGLESTATE[FKeyStateList.IndexOf(Pointer(
nVirtKey or KEYMAP_TOGGLE)) <> -1]; nVirtKey or KEYMAP_TOGGLE)) >=0];
//Assert(False, Format('Trace:[TgtkObject.GetKeyState] %d -> 0x%x', [nVirtKey, Result])); //Assert(False, Format('Trace:[TgtkObject.GetKeyState] %d -> 0x%x', [nVirtKey, Result]));
end; end;
@ -8078,6 +8078,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.236 2003/04/26 10:45:34 mattias
fixed right control release
Revision 1.235 2003/04/16 22:11:35 mattias Revision 1.235 2003/04/16 22:11:35 mattias
fixed codetools Makefile, fixed default prop not found error fixed codetools Makefile, fixed default prop not found error