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

Patch from bug #20121, also added ssModifier constant in the unit Controls for global usage, but use it with care not to do something like [ssModifier, ssMeta] which wont compile in Macs

Browse Source 
git-svn-id: trunk@35131 -
This commit is contained in:
sekelsenmat 2012-02-04 17:39:11 +00:00
parent 3b95059ce4
commit 1130c0fb47
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/controls.pp
View File

@ -70,6 +70,10 @@ const
bvRaised = GraphType.bvRaised; bvRaised = GraphType.bvRaised;
bvSpace = GraphType.bvSpace; bvSpace = GraphType.bvSpace;
// Constant to define which key should be utilized for keyboard shortcuts like Ctrl+C (Copy),Z,X,V
// Mac and iOS use Meta instead of Ctrl for those shortcuts
ssModifier = {$if defined(darwin) or defined(macos) or defined(iphonesim)} ssMeta {$else} ssCtrl {$endif};
type type
TWinControl = class; TWinControl = class;
TControl = class; TControl = class;

10
lcl/maskedit.pp
View File

@ -1657,7 +1657,7 @@ begin
begin//Cut begin//Cut
CutToClipBoard; CutToClipBoard;
end end
else if (Shift = [ssCtrl]) then else if (Shift = [ssModifier]) then
begin//Clear begin//Clear
DeleteSelected; DeleteSelected;
end end
@ -1701,20 +1701,20 @@ begin
PasteFromClipBoard; PasteFromClipBoard;
end; end;
end end
else if (Shift = [ssCtrl]) then else if (Shift = [ssModifier]) then
begin//Copy begin//Copy
CopyToClipBoard; CopyToClipBoard;
end; end;
Key := 0; Key := 0;
Exit; Exit;
end; end;
if (Key = VK_C) and (Shift = [ssCtrl]) then if (Key = VK_C) and (Shift = [ssModifier]) then
begin//Copy begin//Copy
CopyToClipBoard; CopyToClipBoard;
Key := 0; Key := 0;
Exit; Exit;
end; end;
if (Key = VK_X) and (Shift = [ssCtrl]) then if (Key = VK_X) and (Shift = [ssModifier]) then
begin//Cut begin//Cut
if not ReadOnly then if not ReadOnly then
begin begin
@ -1723,7 +1723,7 @@ begin
Exit; Exit;
end; end;
end; end;
if (Key = VK_V) and (Shift = [ssCtrl]) then if (Key = VK_V) and (Shift = [ssModifier]) then
begin//Paste begin//Paste
if not ReadOnly then if not ReadOnly then
begin begin