MUI: fixes for unified ASL interface

git-svn-id: trunk@60729 -
This commit is contained in:
marcus 2019-03-19 22:32:41 +00:00
parent 50b7e5b2a4
commit df9b585827

View File

@ -253,11 +253,7 @@ begin
//TagsList.AddTags([ASLFR_UserData, NativeUInt(MUIApp), ASLFR_IntuiMsgFunc, NativeUInt(@Hook)]);//}
{$ifndef USE_OLD_ASL}
{$ifdef Amiga}
{$ifdef Amiga68k}
if AslRequest(MuiDialog, TagsList) then
{$else}
if AslRequestA(MuiDialog, TagsList) then
{$endif}
if AslRequest(MuiDialog, TagsList) then
{$else}
if MUI_AslRequest(MuiDialog, TagsList) then
{$endif}
@ -275,11 +271,7 @@ begin
end else
{$else}
{$ifdef Amiga}
{$ifdef Amiga68k}
if Boolean(AslRequest(MuiDialog, TagsList)) then
{$else}
if AslRequestA(MuiDialog, TagsList) then
{$endif}
if Boolean(AslRequest(MuiDialog, TagsList)) then
{$else}
if MUI_AslRequest(MuiDialog, TagsList) then
{$endif}
@ -451,11 +443,7 @@ class function TMuiWSFontDialog.CreateHandle(const ACommonDialog: TCommonDialog
var
MuiDialog: PFontRequester;
begin
{$if defined(MorphOS) or defined(Amiga68k)}
MuiDialog := PFontRequester(AllocAslRequest(ASL_FontRequest, nil));
{$else}
MuiDialog := PFontRequester(AllocAslRequest(ASL_FontRequest, [TAG_DONE, 0]));
{$endif}
Result := THandle(MuiDialog);
end;
@ -513,11 +501,7 @@ begin
]);
//
{$ifdef Amiga}
{$ifdef Amiga68k}
if Boolean(AslRequest(MuiDialog, TagsList)) then
{$else}
if AslRequestA(MuiDialog, TagsList) then
{$endif}
if Boolean(AslRequest(MuiDialog, TagsList)) then
{$else}
if MUI_AslRequest(MuiDialog, TagsList) then
{$endif}