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

Converter: Treat also Wintypes and Winproc units as Windows specific when converting for multi-platform. Issue #22677

Browse Source 
git-svn-id: trunk@38343 -
This commit is contained in:
juha 2012-08-23 06:21:49 +00:00
parent 1223b09763
commit 11a9424522
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
converter/convertsettings.pas
View File

@ -168,6 +168,9 @@ type
var var
ConvertSettingsForm: TConvertSettingsForm; ConvertSettingsForm: TConvertSettingsForm;
function IsWinSpecificUnit(const ALowercaseUnitName: string): Boolean;
implementation implementation
@ -333,6 +336,16 @@ begin
end; end;
end; end;
function IsWinSpecificUnit(const ALowercaseUnitName: string): Boolean;
// These units exist in Windows only.
// They must be treated as missing units when converting for multi-platform.
begin
Result := (ALowercaseUnitName = 'windows')
or (ALowercaseUnitName = 'shellapi')
or (ALowercaseUnitName = 'wintypes')
or (ALowercaseUnitName = 'winproc') ;
end;
{ TConvertSettings } { TConvertSettings }
constructor TConvertSettings.Create(const ATitle: string); constructor TConvertSettings.Create(const ATitle: string);

13
converter/usedunits.pas
View File

@ -238,15 +238,16 @@ begin
IDEMessagesWindow.AddMsg(Format(lisConvDelphiFixedUnitCase, IDEMessagesWindow.AddMsg(Format(lisConvDelphiFixedUnitCase,
[OldUnitName, NewUnitName]), '', -1); [OldUnitName, NewUnitName]), '', -1);
end; end;
// Report Windows specific units as missing if target is MultiPlatform, // Report Windows specific units as missing if target is MultiPlatform.
// needed if work-platform is Windows (kind of a hack). 'variants' ? // Needed if work-platform is Windows (kind of a hack).
if Settings.MultiPlatform and ((LowNU='windows') or (LowNU='shellapi')) then if Settings.MultiPlatform and IsWinSpecificUnit(LowNU) then
fMissingUnits.Add(s); fMissingUnits.Add(s);
end end
else begin else begin
// Omit Windows specific units from the list if target is "Windows only", // If the unit is not found, add it to fMissingUnits, but don't add
// needed if work-platform is different from Windows (kind of a hack). // Windows specific units if target is "Windows only".
if Settings.MultiPlatform or ((LowNU<>'windows') and (LowNU<>'shellapi')) then // Needed if work-platform is different from Windows (kind of a hack).
if Settings.MultiPlatform or not IsWinSpecificUnit(LowNU) then
fMissingUnits.Add(s); fMissingUnits.Add(s);
end; end;
if CodeTool.CurPos.Flag=cafComma then begin if CodeTool.CurPos.Flag=cafComma then begin