Commit c6f206fb authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix inconsistent error reporting when changing mode via the iconbar menu

Detail:
  s/Mouse - Fix clicking the 'OK' button in the mode window so that it preserves (and reports) the error instead of clobbering it
Admin:
  Tested on Raspberry Pi
  Clicking OK after entering a bad mode string now generates an error, previously the error was only reported if return was pressed


Version 0.42. Tagged as 'Display-0_42'
parent 0fe05f78
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.41"
Module_Version SETA 41
Module_MajorVersion SETS "0.42"
Module_Version SETA 42
Module_MinorVersion SETS ""
Module_Date SETS "15 Dec 2013"
Module_ApplicationDate SETS "15-Dec-13"
Module_Date SETS "06 Jan 2016"
Module_ApplicationDate SETS "06-Jan-16"
Module_ComponentName SETS "Display"
Module_ComponentPath SETS "castle/RiscOS/Sources/Video/UserI/Display"
Module_FullVersion SETS "0.41"
Module_HelpVersion SETS "0.41 (15 Dec 2013)"
Module_FullVersion SETS "0.42"
Module_HelpVersion SETS "0.42 (06 Jan 2016)"
END
/* (0.41)
/* (0.42)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.41
#define Module_MajorVersion_CMHG 0.42
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Dec 2013
#define Module_Date_CMHG 06 Jan 2016
#define Module_MajorVersion "0.41"
#define Module_Version 41
#define Module_MajorVersion "0.42"
#define Module_Version 42
#define Module_MinorVersion ""
#define Module_Date "15 Dec 2013"
#define Module_Date "06 Jan 2016"
#define Module_ApplicationDate "15-Dec-13"
#define Module_ApplicationDate "06-Jan-16"
#define Module_ComponentName "Display"
#define Module_ComponentPath "castle/RiscOS/Sources/Video/UserI/Display"
#define Module_FullVersion "0.41"
#define Module_HelpVersion "0.41 (15 Dec 2013)"
#define Module_LibraryVersionInfo "0:41"
#define Module_FullVersion "0.42"
#define Module_HelpVersion "0.42 (06 Jan 2016)"
#define Module_LibraryVersionInfo "0:42"
......@@ -162,12 +162,16 @@ click_select
BL Mode_WimpCommand ; Change mode.
SavePSR r2 ; Ensure any error is preserved for return
Push "r0", VS
TST r4, #button_right ; If adjust clicked then
LDRNE r1, menu_handle ; show menu again
MOVEQ r1, #0 ; else remove menu and dialogue.
STREQ r1, menu_handle
MOVEQ r1, #-1
SWI XWimp_CreateMenu
RestPSR r2,,f
Pull "r0", VS
EXIT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment