paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 07:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

ShortCutToText now deletes any modifier

Browse Source 
git-svn-id: trunk@5163 -
This commit is contained in:
mattias 2004-02-04 13:40:19 +00:00
parent d7b70bb93d
commit bf8c04c86a
6 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/main.pp
View File

@ -3737,6 +3737,7 @@ begin
AncestorType,true));
if CInterface=nil then begin
// error streaming component -> examine lfm file
writeln('ERROR: streaming failed lfm="',LFMBuf.Filename,'"');
NewComponent:=nil;
AnUnitInfo.Component:=NewComponent;
// open lfm file in editor
@ -10315,6 +10316,9 @@ end.
{ =============================================================================
$Log$
Revision 1.709 2004/02/04 13:40:18 mattias
ShortCutToText now deletes any modifier
Revision 1.708 2004/02/04 11:09:40 mattias
added DefineProperties check for check lfm

1
lcl/actnlist.pas
View File

@ -332,6 +332,7 @@ end;
procedure Register;
begin
RegisterComponents('Standard',[TActionList]);
RegisterNoIcon([TAction]);
end;
{$I containedaction.inc}

6
lcl/dialogs.pp
View File

@ -166,7 +166,8 @@ type
ofEnableSizing, // dialog can be resized, e.g. via the mouse
ofDontAddToRecent, // do not add the path to the history list
ofForceShowHidden, // show hidden files
ofViewDetail // details are OS and interface dependent
ofViewDetail, // details are OS and interface dependent
ofAutoPreview // details are OS and interface dependent
);
TOpenOptions = set of TOpenOption;
@ -410,6 +411,9 @@ end.
{ =============================================================================
$Log$
Revision 1.44 2004/02/04 13:40:19 mattias
ShortCutToText now deletes any modifier
Revision 1.43 2004/02/04 00:21:40 mattias
added SelectDirectory and TListBox.ItemVisible

16
lcl/include/menuitem.inc
View File

@ -945,11 +945,13 @@ end;
Set the shortcut
------------------------------------------------------------------------------}
Procedure TMenuItem.SetShortCut(AValue : TShortCut);
Procedure TMenuItem.SetShortCut(const AValue : TShortCut);
var
NewKey: Word;
NewShift: TShiftState;
Begin
if FShortCut <> AValue then
begin
ShortCutChanged(FShortcut, AValue);
if FShortCut <> AValue then begin
ShortCutChanged(FShortCut, AValue);
FShortCut := AValue;
end;
end;
@ -1079,6 +1081,9 @@ end;
{ =============================================================================
$Log$
Revision 1.47 2004/02/04 13:40:19 mattias
ShortCutToText now deletes any modifier
Revision 1.46 2004/02/02 18:09:41 mattias
added TMenuItem.Action
@ -1248,6 +1253,9 @@ end;
$Log$
Revision 1.47 2004/02/04 13:40:19 mattias
ShortCutToText now deletes any modifier
Revision 1.46 2004/02/02 18:09:41 mattias
added TMenuItem.Action

6
lcl/lcltype.pp
View File

@ -552,6 +552,8 @@ const
VK_NONAME = $FC;
VK_PA1 = $FD;
VK_OEM_CLEAR = $FE;
VK_HIGHESTVALUE = $FE;
//==============================================
//
@ -1941,7 +1943,6 @@ const
type
TShortCut = Low(Word)..High(Word); {should be moved to classes}
function HiWord(i: integer): word;
function LoWord(i: integer): word;
Function Char2VK(C : Char) : Word;
@ -1982,6 +1983,9 @@ end.
{
$Log$
Revision 1.57 2004/02/04 13:40:19 mattias
ShortCutToText now deletes any modifier
Revision 1.56 2004/02/04 12:48:17 mattias
added CLX colors

17
lcl/menus.pp
View File

@ -151,7 +151,7 @@ type
function GetHandle: HMenu;
Procedure SetImageIndex(value : Integer);
procedure SetGroupIndex(AValue: Byte);
procedure SetShortCut(AValue : TShortCut);
procedure SetShortCut(const AValue : TShortCut);
procedure SetVisible(AValue: Boolean);
procedure MenuChanged(Rebuild : Boolean);
procedure SetChildOrder(Child: TComponent; Order: Integer); override;
@ -305,8 +305,6 @@ type
property OnClose: TNotifyEvent read FOnClose write FOnClose;
end;
function ShortCut(const Key: Word; const Shift : TShiftState) : TShortCut;
procedure ShortCutToKey(const ShortCut : TShortCut; var Key: Word;
var Shift : TShiftState);
@ -370,14 +368,14 @@ Begin
if ssAlt in Shift then Inc(Result,scAlt);
end;
Procedure ShortCutToKey(const ShortCut : TShortCut; var Key: Word;
Procedure ShortCutToKey(const ShortCut: TShortCut; var Key: Word;
var Shift : TShiftState);
begin
key := ShortCut and not(scShift+scAlt+scCtrl);
Key := ShortCut and $FF;
Shift := [];
if ShortCut and scShift <> 0 then Include(shift,ssShift);
if ShortCut and scAlt <> 0 then Include(shift,ssAlt);
if ShortCut and scCtrl <> 0 then Include(shift,ssCtrl);
if ShortCut and scShift <> 0 then Include(Shift,ssShift);
if ShortCut and scAlt <> 0 then Include(Shift,ssAlt);
if ShortCut and scCtrl <> 0 then Include(Shift,ssCtrl);
end;
@ -393,6 +391,9 @@ end.
{
$Log$
Revision 1.60 2004/02/04 13:40:19 mattias
ShortCutToText now deletes any modifier
Revision 1.59 2004/02/02 18:09:41 mattias
added TMenuItem.Action