From f9aa96c8e7e74ca5b33ac2a1df3a8454465c8271 Mon Sep 17 00:00:00 2001
From: Simon Middleton <smiddle@gitlab.riscosopen.org>
Date: Thu, 25 Mar 1999 14:15:36 +0000
Subject: [PATCH] Removed the code that restores the original pointer shape
when leaving an error box (NCErrorBox conditional in Wimp07:finisherror).
This option is no longer necessary now that the Wimp_Extend support
ensures that the pointer appears and disappears as the user expects.
Version 4.17. Tagged as 'Wimp-4_17'
---
VersionASM | 6 +++---
VersionNum | 12 ++++++------
s/Wimp07 | 8 +++-----
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/VersionASM b/VersionASM
index 4fa41a9..00c857d 100644
--- a/VersionASM
+++ b/VersionASM
@@ -5,8 +5,8 @@
GBLA Module_Version
GBLS Module_MinorVersion
GBLS Module_Date
-Module_MajorVersion SETS "4.16"
-Module_Version SETA 416
+Module_MajorVersion SETS "4.17"
+Module_Version SETA 417
Module_MinorVersion SETS ""
-Module_Date SETS "17 Mar 1999"
+Module_Date SETS "25 Mar 1999"
END
diff --git a/VersionNum b/VersionNum
index f58f0de..6c8f9ab 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,14 +1,14 @@
-/* (4.16)
+/* (4.17)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 4.16
+#define Module_MajorVersion_CMHG 4.17
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 17 Mar 1999
+#define Module_Date_CMHG 25 Mar 1999
-#define Module_MajorVersion "4.16"
-#define Module_Version 416
+#define Module_MajorVersion "4.17"
+#define Module_Version 417
#define Module_MinorVersion ""
-#define Module_Date "17 Mar 1999"
+#define Module_Date "25 Mar 1999"
diff --git a/s/Wimp07 b/s/Wimp07
index 3cebde5..e180caa 100644
--- a/s/Wimp07
+++ b/s/Wimp07
@@ -1735,11 +1735,9 @@ finisherror
[ NCErrorBox
Push "r0-r2"
MOV R0, #0 ; Unconditionally turn off IconHigh
- SWI XIconHigh_Stop
- ADRL R14, ptrshlflag
- MOV R0, #106
- LDR R1, [R14]
- SWI XOS_Byte ; Restore pointer to the way it was after Hourglass_Smash
+ SWI XIconHigh_Stop
+ ; SJM 25Mar99 Do not restore the pointer shape here
+ ; anymore now that we have Wimp_Extend support
Pull "r0-r2"
]
;
--
GitLab