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

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

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

Modified Files:
	Wimp.swi 
Log Message:
Added WimpTextOp_StringWidthWithFlags.


Index: Wimp.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib/Wimp.swi,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Wimp.swi	20 Nov 2002 19:09:11 -0000	1.8
--- Wimp.swi	20 Nov 2002 19:40:58 -0000	1.9
***************
*** 2086,2089 ****
--- 2086,2093 ----
     );
  
+ TYPE WimpTextOp_StringWidthFlags = .Bits;
+ CONST
+    WimpTextOp_SizeCovered = WimpTextOp_StringWidthFlags: &80000000 "RISC O S 4.32+";
+ 
  TYPE WimpTextOp_PaintFlags = .Bits;
  CONST
***************
*** 2091,2106 ****
     WimpTextOp_RJustify      = WimpTextOp_PaintFlags: &80000000;
  
! SWI Wimp_TextOp = (NUMBER 0x400f9 "Manipulates and displays text using the
!          current desktop font -
!       see individual reason codes", ABSENT),
!    WimpTextOp_SetColour = (NUMBER 0x400f9, ENTRY (R0 # 0 "Sets the colour to
!          use for text plotting with WimpTextOp_Paint", R1 = OS_Colour: fg,
!          R2 = OS_Colour: bg), EXIT (R0?)),
!    WimpTextOp_StringWidth = (NUMBER 0x400f9, ENTRY (R0 # 1 "Gets the width of
!          a string for the current desktop font", R1 -> .String: s,
!          R2 = .Int: len), EXIT (R0! = .Int: width)),
!    WimpTextOp_Paint = (NUMBER 0x400f9, ENTRY (R0 # 2 "Plots text on the
!          screen using the current desktop font", R0 | WimpTextOp_PaintFlags: flags,
!          R1 -> .String: s, R2 # -1, R3 # -1, R4 = .Int: x0, R5 = .Int: y0));
  
  SWI Wimp_SetWatchdogState = (NUMBER 0x400fa "Sets the state of the Wimp's watchdog",
--- 2095,2150 ----
     WimpTextOp_RJustify      = WimpTextOp_PaintFlags: &80000000;
  
! SWI
!    Wimp_TextOp =
!    (  NUMBER 0x400f9 "Manipulates and displays text using the current
!                       desktop font - see individual reason codes",
!       ABSENT
!    ),
! 
!    WimpTextOp_SetColour =
!    (  NUMBER 0x400f9,
!       ENTRY
!       (  R0 # 0 "Sets the colour to use for text plotting with WimpTextOp_Paint",
!          R1 = OS_Colour: fg,
!          R2 = OS_Colour: bg
!       ),
!       EXIT
!       (  R0?
!    )  ),
! 
!    WimpTextOp_StringWidth =
!    (  NUMBER 0x400f9,
!       ENTRY
!       (  R0 # 1 "Gets the width of a string for the current desktop font",
!          R1 -> .String: s,
!          R2 = .Int: len
!       ),
!       EXIT
!       (  R0! = .Int: width
!    )  ),
! 
!    WimpTextOp_StringWidthWithFlags =
!    (  NUMBER 0x400f9,
!       ENTRY
!       (  R0 # 1 "Gets the width of a string for the current desktop font",
!          R0 | WimpTextOp_StringWidthFlags: flags,
!          R1 -> .String: s,
!          R2 = .Int: len
!       ),
!       EXIT
!       (  R0! = .Int: width
!    )  ),
! 
!    WimpTextOp_Paint =
!    (  NUMBER 0x400f9,
!       ENTRY
!       (  R0 # 2 "Plots text on the screen using the current desktop font",
!          R0 | WimpTextOp_PaintFlags: flags,
!          R1 -> .String: s,
!          R2 # -1,
!          R3 # -1,
!          R4 = .Int: x0,
!          R5 = .Int: y0
!    )  );
  
  SWI Wimp_SetWatchdogState = (NUMBER 0x400fa "Sets the state of the Wimp's watchdog",