Commit 005a1936 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix slider_set_bounds, slider_get_bounds parameter order

Detail:
  toolboxlib/h/gadgets, toolboxlib/sources/slider/c/getbound, toolbloxlib/sources/slider/c/setbound - The slider_set_bounds and slider_get_bounds functions were passing the upper and lower bounds to the toolbox SWIs in the wrong order, causing the bounds to be inverted.
  By swapping the order in which the parameters are passed to the SWIs, and swapping the order of the parameters in the function declarations, the parameters are now passed through in the correct order, without breaking any existing code.
  Additionally, the parameter order of the functions now matches the register order of the underlying SWIs.
Admin:
  Tested briefly


Version 0.21. Tagged as 'Libs-0_21'
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
GBLS Module_ComponentPath GBLS Module_ComponentPath
Module_MajorVersion SETS "0.20" Module_MajorVersion SETS "0.21"
Module_Version SETA 20 Module_Version SETA 21
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "26 Jun 2009" Module_Date SETS "04 Feb 2012"
Module_ApplicationDate SETS "26-Jun-09" Module_ApplicationDate SETS "04-Feb-12"
Module_ComponentName SETS "Libs" Module_ComponentName SETS "Libs"
Module_ComponentPath SETS "castle/RiscOS/Sources/Toolbox/Libs" Module_ComponentPath SETS "castle/RiscOS/Sources/Toolbox/Libs"
Module_FullVersion SETS "0.20" Module_FullVersion SETS "0.21"
Module_HelpVersion SETS "0.20 (26 Jun 2009)" Module_HelpVersion SETS "0.21 (04 Feb 2012)"
END END
/* (0.20) /* (0.21)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 0.20 #define Module_MajorVersion_CMHG 0.21
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 Jun 2009 #define Module_Date_CMHG 04 Feb 2012
#define Module_MajorVersion "0.20" #define Module_MajorVersion "0.21"
#define Module_Version 20 #define Module_Version 21
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "26 Jun 2009" #define Module_Date "04 Feb 2012"
#define Module_ApplicationDate "26-Jun-09" #define Module_ApplicationDate "04-Feb-12"
#define Module_ComponentName "Libs" #define Module_ComponentName "Libs"
#define Module_ComponentPath "castle/RiscOS/Sources/Toolbox/Libs" #define Module_ComponentPath "castle/RiscOS/Sources/Toolbox/Libs"
#define Module_FullVersion "0.20" #define Module_FullVersion "0.21"
#define Module_HelpVersion "0.20 (26 Jun 2009)" #define Module_HelpVersion "0.21 (04 Feb 2012)"
#define Module_LibraryVersionInfo "0:20" #define Module_LibraryVersionInfo "0:21"
...@@ -1304,8 +1304,8 @@ extern _kernel_oserror *slider_set_colour ( unsigned int flags, ...@@ -1304,8 +1304,8 @@ extern _kernel_oserror *slider_set_colour ( unsigned int flags,
* In : unsigned int flags * In : unsigned int flags
* ObjectId window * ObjectId window
* ComponentId slider * ComponentId slider
* Out : int *upper_bound * Out : int *lower_bound
* int *lower_bound * int *upper_bound
* int *step_size * int *step_size
* Returns : pointer to error block * Returns : pointer to error block
*/ */
...@@ -1313,8 +1313,8 @@ extern _kernel_oserror *slider_set_colour ( unsigned int flags, ...@@ -1313,8 +1313,8 @@ extern _kernel_oserror *slider_set_colour ( unsigned int flags,
extern _kernel_oserror *slider_get_bounds( unsigned int flags, extern _kernel_oserror *slider_get_bounds( unsigned int flags,
ObjectId window, ObjectId window,
ComponentId slider, ComponentId slider,
int *upper_bound,
int *lower_bound, int *lower_bound,
int *upper_bound,
int *step_size int *step_size
); );
...@@ -1325,8 +1325,8 @@ extern _kernel_oserror *slider_get_bounds( unsigned int flags, ...@@ -1325,8 +1325,8 @@ extern _kernel_oserror *slider_get_bounds( unsigned int flags,
* In : unsigned int flags * In : unsigned int flags
* ObjectId window * ObjectId window
* ComponentId slider * ComponentId slider
* int upper_bound
* int lower_bound * int lower_bound
* int upper_bound
* int step_size * int step_size
* Out : None * Out : None
* Returns : pointer to error block * Returns : pointer to error block
...@@ -1335,8 +1335,8 @@ extern _kernel_oserror *slider_get_bounds( unsigned int flags, ...@@ -1335,8 +1335,8 @@ extern _kernel_oserror *slider_get_bounds( unsigned int flags,
extern _kernel_oserror *slider_set_bounds( unsigned int flags, extern _kernel_oserror *slider_set_bounds( unsigned int flags,
ObjectId window, ObjectId window,
ComponentId slider, ComponentId slider,
int upper_bound,
int lower_bound, int lower_bound,
int upper_bound,
int step_size int step_size
); );
......
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
* In : unsigned int flags * In : unsigned int flags
* ObjectId window * ObjectId window
* ComponentId slider * ComponentId slider
* Out : int *upper_bound * Out : int *lower_bound
* int *lower_bound * int *upper_bound
* int *step_size * int *step_size
* Returns : pointer to error block * Returns : pointer to error block
*/ */
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
extern _kernel_oserror *slider_get_bounds ( unsigned int flags, extern _kernel_oserror *slider_get_bounds ( unsigned int flags,
ObjectId window, ObjectId window,
ComponentId slider, ComponentId slider,
int *upper_bound,
int *lower_bound, int *lower_bound,
int *upper_bound,
int *step_size int *step_size
) )
{ {
...@@ -68,8 +68,8 @@ _kernel_oserror *e; ...@@ -68,8 +68,8 @@ _kernel_oserror *e;
r.r[3] = (int) slider; r.r[3] = (int) slider;
if((e = _kernel_swi(Toolbox_ObjectMiscOp,&r,&r)) == NULL) if((e = _kernel_swi(Toolbox_ObjectMiscOp,&r,&r)) == NULL)
{ {
if(upper_bound != NULL) *upper_bound = (int) r.r[0]; if(lower_bound != NULL) *lower_bound = (int) r.r[0];
if(lower_bound != NULL) *lower_bound = (int) r.r[1]; if(upper_bound != NULL) *upper_bound = (int) r.r[1];
if(step_size != NULL) *step_size = (int) r.r[2]; if(step_size != NULL) *step_size = (int) r.r[2];
} }
......
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
* In : unsigned int flags * In : unsigned int flags
* ObjectId window * ObjectId window
* ComponentId slider * ComponentId slider
* int upper_bound
* int lower_bound * int lower_bound
* int upper_bound
* int step_size * int step_size
* Out : None * Out : None
* Returns : pointer to error block * Returns : pointer to error block
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
extern _kernel_oserror *slider_set_bounds ( unsigned int flags, extern _kernel_oserror *slider_set_bounds ( unsigned int flags,
ObjectId window, ObjectId window,
ComponentId slider, ComponentId slider,
int upper_bound,
int lower_bound, int lower_bound,
int upper_bound,
int step_size int step_size
) )
{ {
...@@ -66,8 +66,8 @@ _kernel_swi_regs r; ...@@ -66,8 +66,8 @@ _kernel_swi_regs r;
r.r[1] = (int) window; r.r[1] = (int) window;
r.r[2] = Slider_SetBounds; r.r[2] = Slider_SetBounds;
r.r[3] = (int) slider; r.r[3] = (int) slider;
r.r[4] = (int) upper_bound; r.r[4] = (int) lower_bound;
r.r[5] = (int) lower_bound; r.r[5] = (int) upper_bound;
r.r[6] = (int) step_size; r.r[6] = (int) step_size;
return(_kernel_swi(Toolbox_ObjectMiscOp,&r,&r)); return(_kernel_swi(Toolbox_ObjectMiscOp,&r,&r));
} }
......
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