diff --git a/VersionASM b/VersionASM index 89d18d86db799a07a7de57db0da625cde1e408d6..7793737ce24228642d5d70055cc0f30e2d07a738 100644 --- a/VersionASM +++ b/VersionASM @@ -11,13 +11,13 @@ GBLS Module_HelpVersion GBLS Module_ComponentName GBLS Module_ComponentPath -Module_MajorVersion SETS "5.15" -Module_Version SETA 515 +Module_MajorVersion SETS "5.16" +Module_Version SETA 516 Module_MinorVersion SETS "" -Module_Date SETS "24 Jun 2012" -Module_ApplicationDate SETS "24-Jun-12" +Module_Date SETS "09 Jul 2012" +Module_ApplicationDate SETS "09-Jul-12" Module_ComponentName SETS "Wimp" Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Wimp" -Module_FullVersion SETS "5.15" -Module_HelpVersion SETS "5.15 (24 Jun 2012)" +Module_FullVersion SETS "5.16" +Module_HelpVersion SETS "5.16 (09 Jul 2012)" END diff --git a/VersionNum b/VersionNum index 06ec0c50e55e5818cfd3e5cd1b436f47befba730..05f58e45409897e878bc64e80fb0998ccfcf4db9 100644 --- a/VersionNum +++ b/VersionNum @@ -1,23 +1,23 @@ -/* (5.15) +/* (5.16) * * This file is automatically maintained by srccommit, do not edit manually. * Last processed by srccommit version: 1.1. * */ -#define Module_MajorVersion_CMHG 5.15 +#define Module_MajorVersion_CMHG 5.16 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 24 Jun 2012 +#define Module_Date_CMHG 09 Jul 2012 -#define Module_MajorVersion "5.15" -#define Module_Version 515 +#define Module_MajorVersion "5.16" +#define Module_Version 516 #define Module_MinorVersion "" -#define Module_Date "24 Jun 2012" +#define Module_Date "09 Jul 2012" -#define Module_ApplicationDate "24-Jun-12" +#define Module_ApplicationDate "09-Jul-12" #define Module_ComponentName "Wimp" #define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Wimp" -#define Module_FullVersion "5.15" -#define Module_HelpVersion "5.15 (24 Jun 2012)" -#define Module_LibraryVersionInfo "5:15" +#define Module_FullVersion "5.16" +#define Module_HelpVersion "5.16 (09 Jul 2012)" +#define Module_LibraryVersionInfo "5:16" diff --git a/s/Wimp10 b/s/Wimp10 index ddcb253adf63769649fa62d6dc0b1610e04ffbda..cfa762f82645f8df4b94682087476570213ebf26 100644 --- a/s/Wimp10 +++ b/s/Wimp10 @@ -36,8 +36,7 @@ getborder EntryS "R2,R4-R5" MOV R4,#border_normal MOV R5,#3 ; default values - TST R1,#if_sprite - TSTEQ R1,#if_text + TST R1,#if_text TSTNE R1,#if_indirected BEQ %FT11 ; if not indirected + text then ignore ;