Commit 1d0b2c48 authored by ROOL's avatar ROOL 🤖
Browse files

Add missing methods and flags

Detail:
  ColourDbox - GetHelpMessage/SetHelpMessage methods added
  Iconbar - 4 extra flags added
  Menu - 2 extra flags added
  Scale - min/max structure members switched to match tboxlibint and module
Admin:
  Omissions discovered during User Interface Toolbox manual update.

Version 1.19. Tagged as 'ToolboxLib-1_19'
parent 428710a1
......@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "1.18"
Module_Version SETA 118
Module_MajorVersion SETS "1.19"
Module_Version SETA 119
Module_MinorVersion SETS ""
Module_Date SETS "20 Jun 2020"
Module_ApplicationDate SETS "20-Jun-20"
Module_Date SETS "12 Sep 2022"
Module_ApplicationDate SETS "12-Sep-22"
Module_ComponentName SETS "ToolboxLib"
Module_FullVersion SETS "1.18"
Module_HelpVersion SETS "1.18 (20 Jun 2020)"
Module_FullVersion SETS "1.19"
Module_HelpVersion SETS "1.19 (12 Sep 2022)"
END
/* (1.18)
/* (1.19)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 1.18
#define Module_MajorVersion_CMHG 1.19
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 20 Jun 2020
#define Module_Date_CMHG 12 Sep 2022
#define Module_MajorVersion "1.18"
#define Module_Version 118
#define Module_MajorVersion "1.19"
#define Module_Version 119
#define Module_MinorVersion ""
#define Module_Date "20 Jun 2020"
#define Module_Date "12 Sep 2022"
#define Module_ApplicationDate "20-Jun-20"
#define Module_ApplicationDate "12-Sep-22"
#define Module_ComponentName "ToolboxLib"
#define Module_FullVersion "1.18"
#define Module_HelpVersion "1.18 (20 Jun 2020)"
#define Module_LibraryVersionInfo "1:18"
#define Module_FullVersion "1.19"
#define Module_HelpVersion "1.19 (12 Sep 2022)"
#define Module_LibraryVersionInfo "1:19"
......@@ -43,10 +43,12 @@ ObjectsA-M = \
Sources.button.o.setvalue\
Sources.colourdbox.o.getcol\
Sources.colourdbox.o.getdboxh\
Sources.colourdbox.o.gethelp\
Sources.colourdbox.o.getmodel\
Sources.colourdbox.o.getnone\
Sources.colourdbox.o.getwimph\
Sources.colourdbox.o.setcol\
Sources.colourdbox.o.sethelp\
Sources.colourdbox.o.setmodel\
Sources.colourdbox.o.setnone\
Sources.colourmenu.o.getcol\
......
......@@ -14,10 +14,12 @@
Sources.button.o.setvalue
Sources.colourdbox.o.getcol
Sources.colourdbox.o.getdboxh
Sources.colourdbox.o.gethelp
Sources.colourdbox.o.getmodel
Sources.colourdbox.o.getnone
Sources.colourdbox.o.getwimph
Sources.colourdbox.o.setcol
Sources.colourdbox.o.sethelp
Sources.colourdbox.o.setmodel
Sources.colourdbox.o.setnone
Sources.colourmenu.o.getcol
......
......@@ -100,6 +100,8 @@ typedef struct
#define ColourDbox_GetColourModel 5
#define ColourDbox_SetNoneAvailable 6
#define ColourDbox_GetNoneAvailable 7
#define ColourDbox_SetHelpMessage 8
#define ColourDbox_GetHelpMessage 9
/****************************************************************************
......@@ -158,6 +160,40 @@ typedef struct
#endif
/*
* Name : colourdbox_get_help_message
* Description : Gets the ColourDbox object's interactive help message
* In : unsigned int flags
* ObjectId colourdbox
* char *buffer
* int buff_size
* Out : None
* Returns : pointer to error block
*/
extern _kernel_oserror *colourdbox_get_help_message ( unsigned int flags,
ObjectId colourdbox,
char *buffer,
int buff_size
);
/*
* Name : colourdbox_set_help_message
* Description : Sets the ColourDbox object's interactive help message
* In : unsigned int flags
* ObjectId colourdbox
* const char *message_text
* Out : None
* Returns : pointer to error block
*/
extern _kernel_oserror *colourdbox_set_help_message ( unsigned int flags,
ObjectId colourdbox,
const char *message_text
);
/*
* Name : colourdbox_get_none_available
* Description : Gets whether the "none" option is available for the specified ColourDbox
......
......@@ -55,8 +55,11 @@
#define Iconbar_ShowAdjustTransient 0x00000008
#define Iconbar_GenerateSelectClickedEvent 0x00000020
#define Iconbar_GenerateAdjustClickedEvent 0x00000040
#define Iconbar_ShowSelectCentred 0x00000080
#define Iconbar_ShowAdjustCentred 0x00000100
#define Iconbar_ShowSelectAtPointer 0x00000200
#define Iconbar_ShowAdjustAtPointer 0x00000400
#define Iconbar_ValidFlags 0x00000177
/* template definition */
......
......@@ -59,6 +59,8 @@
#define Menu_Entry_SubMenu 0x00000400
#define Menu_Entry_GenerateSubMenuEvent 0x00000800
#define Menu_Entry_ClickShowTransient 0x00001000
#define Menu_Entry_ClickShowCentred 0x00002000
#define Menu_Entry_ClickShowAtPointer 0x00004000
/*-- templates --*/
......
......@@ -62,8 +62,8 @@
typedef struct
{
unsigned int flags;
int max_value;
int min_value;
int max_value;
int step_size;
char *title;
int max_title;
......
/* Copyright 2022 RISC OS Open Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/************************************************************************
* Acorn Computers Ltd, 1994. *
* *
* It may be freely used to create executable images for saleable *
* products but cannot be sold in source form or as an object library *
* without the prior written consent of Acorn Computers Ltd. *
* *
* If this file is re-distributed (even if modified) it should retain *
* this copyright notice. *
* *
************************************************************************/
/*
* Name : gethelp.c
* Purpose : Veneer for method ColourDbox_GetHelpMessage
* Description : Gets the ColourDbox object's interactive help message
*/
#include "kernel.h"
#include "toolbox.h"
#include "colourdbox.h"
/*
* Name : colourdbox_get_help_message
* Description : Gets the ColourDbox object's interactive help message
* In : unsigned int flags
* ObjectId colourdbox
* char *buffer
* int buff_size
* Out : None
* Returns : pointer to error block
*/
extern _kernel_oserror *colourdbox_get_help_message ( unsigned int flags,
ObjectId colourdbox,
char *buffer,
int buff_size
)
{
_kernel_swi_regs r;
r.r[0] = flags;
r.r[1] = (int) colourdbox;
r.r[2] = ColourDbox_GetHelpMessage;
r.r[3] = (int) buffer;
r.r[4] = (int) buff_size;
return(_kernel_swi(Toolbox_ObjectMiscOp,&r,&r));
}
/* Copyright 2022 RISC OS Open Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/************************************************************************
* Acorn Computers Ltd, 1994. *
* *
* It may be freely used to create executable images for saleable *
* products but cannot be sold in source form or as an object library *
* without the prior written consent of Acorn Computers Ltd. *
* *
* If this file is re-distributed (even if modified) it should retain *
* this copyright notice. *
* *
************************************************************************/
/*
* Name : sethelp.c
* Purpose : Veneer for method ColourDbox_SetHelpMessage
* Description : Sets the ColourDbox object's interactive help message
*/
#include "kernel.h"
#include "toolbox.h"
#include "colourdbox.h"
/*
* Name : colourdbox_set_help_message
* Description : Sets the ColourDbox object's interactive help message
* In : unsigned int flags
* ObjectId colourdbox
* const char *message_text
* Out : None
* Returns : pointer to error block
*/
extern _kernel_oserror *colourdbox_set_help_message ( unsigned int flags,
ObjectId colourdbox,
const char *message_text
)
{
_kernel_swi_regs r;
r.r[0] = flags;
r.r[1] = (int) colourdbox;
r.r[2] = ColourDbox_SetHelpMessage;
r.r[3] = (int) message_text;
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