[ro-oslib-commits] OSLib/!OsLib/Source/User/oslib Wimp.swi,1.14,1.15

[<th...@us...>]

Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv26083

Modified Files:
	Wimp.swi 
Log Message:
Changed to avoid double definition of Wimp_PlotIconWithSpriteArea in
assembler header files.


Index: Wimp.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib/Wimp.swi,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Wimp.swi	21 Sep 2003 12:14:10 -0000	1.14
--- Wimp.swi	7 Dec 2003 12:44:29 -0000	1.15
***************
*** 1903,1908 ****
  
  CONST
!    Wimp_PlotIconWithSpriteArea = Wimp_PlotIcon: 0x1,
!    Wimp_PlotIconUnderPointer   = Wimp_PlotIcon: 0x2;
  
  SWI Wimp_PlotIcon =
--- 1903,1908 ----
  
  CONST
!    Wimp_PlotIconGivenSpriteArea = Wimp_PlotIcon: 0x1,
!    Wimp_PlotIconUnderPointer    = Wimp_PlotIcon: 0x2;
  
  SWI Wimp_PlotIcon =
***************
*** 1930,1934 ****
  SWI Wimp_PlotIconWithSpriteArea =
     (  NUMBER 0x400E2 "Plots an icon taking the context from a window if
!             used outside an update loop - RISC O S 4+",
        ENTRY
        (  R1 -> Wimp_Icon: icon,
--- 1930,1935 ----
  SWI Wimp_PlotIconWithSpriteArea =
     (  NUMBER 0x400E2 "Plots an icon taking the context from a window if
!             used outside an update loop and using the specified sprite
!             area - RISC O S 4+",
        ENTRY
        (  R1 -> Wimp_Icon: icon,
***************
*** 1936,1940 ****
           R3 = .Int: x_origin,
           R4 = .Int: y_origin,
!          R5 # Wimp_PlotIconWithSpriteArea,
           R5 | Wimp_PlotIconFlags: flags,
           R6 = Wimp_Colour: background_colour,
--- 1937,1941 ----
           R3 = .Int: x_origin,
           R4 = .Int: y_origin,
!          R5 # Wimp_PlotIconGivenSpriteArea,
           R5 | Wimp_PlotIconFlags: flags,
           R6 = Wimp_Colour: background_colour,