paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 16:26:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

arosunits: converted macros repaired

Browse Source 
git-svn-id: trunk@28943 -
This commit is contained in:
marcus 2014-10-28 21:41:56 +00:00
parent 727d73677a
commit f432d4c0c6
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/arosunits/src/mui.pas
View File

@ -520,7 +520,7 @@ uses
type type
{ BinCompat Mode? {$ifdef AROS_FLAVOUR_BINCOMPAT}
tMUI_EventHandlerNode = record tMUI_EventHandlerNode = record
ehn_Node : tMinNode; ehn_Node : tMinNode;
ehn_Reserved : BYTE; ehn_Reserved : BYTE;
@ -529,15 +529,17 @@ uses
ehn_Object : PObject_; ehn_Object : PObject_;
ehn_Class : PIClass; ehn_Class : PIClass;
ehn_Events : LongWord; ehn_Events : LongWord;
end;} end;
{$else}
tMUI_EventHandlerNode = record tMUI_EventHandlerNode = record
ehn_Node : tMinNode; ehn_Node : TNode;
ehn_Flags : WORD; ehn_Flags : WORD;
ehn_Object : PObject_; ehn_Object : PObject_;
ehn_Class : PIClass; ehn_Class : PIClass;
ehn_Events : LongWord; ehn_Events : LongWord;
ehn_Priority : BYTE; ehn_Priority : BYTE;
end; end;
{$endif}
pMUI_EventHandlerNode = ^tMUI_EventHandlerNode; pMUI_EventHandlerNode = ^tMUI_EventHandlerNode;
{ flags for ehn_Flags } { flags for ehn_Flags }
@ -3614,37 +3616,37 @@ end;
function OBJ_App(obj : APTR) : PObject_; (* valid between MUIM_Setup/Cleanup *) function OBJ_App(obj : APTR) : PObject_; (* valid between MUIM_Setup/Cleanup *)
begin begin
OBJ_App := pMUI_GlobalInfo(obj)^.mgi_ApplicationObject; OBJ_App := MUIGlobalInfo(obj)^.mgi_ApplicationObject;
end; end;
function OBJ_Win(obj : APTR) : PObject_; (* valid between MUIM_Setup/Cleanup *) function OBJ_Win(obj : APTR) : PObject_; (* valid between MUIM_Setup/Cleanup *)
begin begin
OBJ_Win := PMUI_RenderInfo(obj)^.mri_WindowObject; OBJ_Win := MUIRenderInfo(obj)^.mri_WindowObject;
end; end;
function OBJ_Dri(obj : APTR) : pDrawInfo; (* valid between MUIM_Setup/Cleanup *) function OBJ_Dri(obj : APTR) : pDrawInfo; (* valid between MUIM_Setup/Cleanup *)
begin begin
OBJ_Dri := PMUI_RenderInfo(obj)^.mri_DrawInfo; OBJ_Dri := MUIRenderInfo(obj)^.mri_DrawInfo;
end; end;
function OBJ_Screen(obj : APTR) : pScreen; (* valid between MUIM_Setup/Cleanup *) function OBJ_Screen(obj : APTR) : pScreen; (* valid between MUIM_Setup/Cleanup *)
begin begin
OBJ_Screen := PMUI_RenderInfo(obj)^.mri_Screen; OBJ_Screen := MUIRenderInfo(obj)^.mri_Screen;
end; end;
function OBJ_Pens(obj : APTR) : pWord; (* valid between MUIM_Setup/Cleanup *) function OBJ_Pens(obj : APTR) : pWord; (* valid between MUIM_Setup/Cleanup *)
begin begin
OBJ_Pens := PMUI_RenderInfo(obj)^.mri_Pens; OBJ_Pens := MUIRenderInfo(obj)^.mri_Pens;
end; end;
function OBJ_Window(obj : APTR) : pWindow; (* valid between MUIM_Show/Hide *) function OBJ_Window(obj : APTR) : pWindow; (* valid between MUIM_Show/Hide *)
begin begin
OBJ_Window := PMUI_RenderInfo(obj)^.mri_Window; OBJ_Window := MUIRenderInfo(obj)^.mri_Window;
end; end;
function OBJ_Rp(obj : APTR) : pRastPort; (* valid between MUIM_Show/Hide *) function OBJ_Rp(obj : APTR) : pRastPort; (* valid between MUIM_Show/Hide *)
begin begin
OBJ_Rp := PMUI_RenderInfo(obj)^.mri_RastPort; OBJ_Rp := MUIRenderInfo(obj)^.mri_RastPort;
end; end;
function OBJ_Left(obj : APTR) : smallint; (* valid during MUIM_Draw *) function OBJ_Left(obj : APTR) : smallint; (* valid during MUIM_Draw *)