Skip to content

GitLab

Commit 62363129 authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Spinner branch merged

parent bd820a25
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 11 deletions
MakeROM
View file @ 62363129
......@@ -5,11 +5,11 @@ WIPE = -wipe
WFLAGS = ~c~v
# Toolflags:
CCflags = -c -depend !Depend -Itbox:,C: -throwback -zM -ffah -zps1 -DROM
C++flags = -c -depend !Depend -throwback -IC:
Pascalflags = -c -depend !Depend -throwback -IP:
CCflags = -c -depend !Depend -Itbox:,C: -zM -ffah -zps1 -DROM
C++flags = -c -depend !Depend -IC:
Pascalflags = -c -depend !Depend -IP:
Linkflags = -c++ -o $@
ObjAsmflags = -depend !Depend -ThrowBack -Stamp -quit -CloseExec
ObjAsmflags = -depend !Depend -Stamp -quit -CloseExec
CMHGflags =
LibFileflags = -c -o $@
Squeezeflags = -o $@
......
h/style
View file @ 62363129
......@@ -18,6 +18,8 @@
* History: 03-Nov-93: created
* 07-Mar-94: CSM: Removed RJUSTIFY from label flags
* 13-Jun-94: NK : display fields now unfilled
* 06-Jun-97: PW : Added writable icons without borders for Daytona
* 24-Jun-97: PW : Changed slider look for Daytona
*/
#ifndef __style_h
......@@ -131,7 +133,7 @@
(wimp_ICONFLAGS_FORECOL * style_RADIO_BUTTON_FORECOL) |\
(wimp_ICONFLAGS_FORECOL * style_RADIO_BUTTON_FORECOL)\
)
#define style_RADIO_BUTTON_TEXT_VALIDSTR ""
#define style_RADIO_BUTTON_TEXT_VALIDSTR "f17"
#define style_RADIO_BUTTON_BUTTON_ICONFLAGS (wimp_ICONFLAGS_TEXT |\
wimp_ICONFLAGS_SPRITE |\
......@@ -155,7 +157,7 @@
(wimp_ICONFLAGS_FORECOL * style_OPTION_BUTTON_FORECOL) |\
(wimp_ICONFLAGS_BACKCOL * style_OPTION_BUTTON_BACKCOL) \
)
#define style_OPTION_BUTTON_TEXT_VALIDSTR ""
#define style_OPTION_BUTTON_TEXT_VALIDSTR "f17"
#define style_OPTION_BUTTON_BUTTON_ICONFLAGS (wimp_ICONFLAGS_TEXT |\
wimp_ICONFLAGS_VCENTRE |\
......@@ -173,6 +175,17 @@
#define style_WRITABLE_FIELD_FORECOL 7 /* black text */
#define style_WRITABLE_FIELD_BACKCOL 0 /* white background */
#define style_WRITABLE_FIELD_TYPE wimp_BUTTON_WRITABLE
#ifdef DAYTONA_BUILD
#define style_WRITABLE_FIELD_ICONFLAGS (wimp_ICONFLAGS_TEXT |\
wimp_ICONFLAGS_VCENTRE |\
wimp_ICONFLAGS_FILLED |\
wimp_ICONFLAGS_INDIRECT |\
(wimp_ICONFLAGS_BUTTON_TYPE * style_WRITABLE_FIELD_TYPE) |\
(wimp_ICONFLAGS_FORECOL * style_WRITABLE_FIELD_FORECOL) |\
(wimp_ICONFLAGS_BACKCOL * style_WRITABLE_FIELD_BACKCOL)\
)
#else
#define style_WRITABLE_FIELD_ICONFLAGS (wimp_ICONFLAGS_TEXT |\
wimp_ICONFLAGS_HAS_BORDER |\
wimp_ICONFLAGS_VCENTRE |\
......@@ -182,6 +195,8 @@
(wimp_ICONFLAGS_FORECOL * style_WRITABLE_FIELD_FORECOL) |\
(wimp_ICONFLAGS_BACKCOL * style_WRITABLE_FIELD_BACKCOL)\
)
#endif /* DAYTONA_BUILD */
#define style_WRITABLE_FIELD_VALIDSTR "Pptr_write" /* NOT Ktar! */
......@@ -200,10 +215,20 @@
)
#define style_DISPLAY_FIELD_VALIDSTR "R2;f17" /* make sure colours are ok when we come to ff */
#ifdef DAYTONA_BUILD
#define style_SLIDER_BORDERSIZE 4
#define style_HSLIDER_WELL_BACKCOL 7 /* black */
#define style_HSLIDER_WELL_TYPE wimp_BUTTON_NEVER
#define style_HSLIDER_WELL_ICONFLAGS (wimp_ICONFLAGS_FILLED |\
(wimp_ICONFLAGS_BUTTON_TYPE * style_HSLIDER_WELL_TYPE) |\
(wimp_ICONFLAGS_BACKCOL * style_HSLIDER_WELL_BACKCOL)\
)
#define style_HSLIDER_WELL_VALIDSTR ""
#else /* DAYTONA_BUILD */
#define style_SLIDER_BORDERSIZE 12
//#define style_HSLIDER_HEIGHT 40 /* OS Units */
#define style_HSLIDER_HEIGHT 40 /* OS Units */
#define style_HSLIDER_WELL_HEIGHT 40 /* OS Units */
//#define style_HSLIDER_WELL_HEIGHT 40 /* OS Units */
#define style_HSLIDER_WELL_BACKCOL 1 /* v. light grey */
#define style_HSLIDER_WELL_TYPE wimp_BUTTON_NEVER
#define style_HSLIDER_WELL_ICONFLAGS (wimp_ICONFLAGS_HAS_BORDER |\
......@@ -213,6 +238,7 @@
(wimp_ICONFLAGS_BACKCOL * style_HSLIDER_WELL_BACKCOL)\
)
#define style_HSLIDER_WELL_VALIDSTR "R2"
#endif /* DAYTONA_BUILD */
#define style_HSLIDER_BACKGND_HEIGHT 16 /* OS Units */
#define style_HSLIDER_BACKGND_BACKCOL 0 /* white */
......@@ -230,9 +256,18 @@
(wimp_ICONFLAGS_BACKCOL * style_HSLIDER_VALUE_BACKCOL)\
)
#define style_VSLIDER_WIDTH 20 /* OS Units */
//#define style_VSLIDER_WIDTH 20 /* OS Units */
#define style_VSLIDER_WELL_WIDTH 20 /* OS Units */
//#define style_VSLIDER_WELL_WIDTH 20 /* OS Units */
#ifdef DAYTONA_BUILD
#define style_VSLIDER_WELL_BACKCOL 7 /* black */
#define style_VSLIDER_WELL_TYPE wimp_BUTTON_NEVER
#define style_VSLIDER_WELL_ICONFLAGS (wimp_ICONFLAGS_FILLED |\
(wimp_ICONFLAGS_BUTTON_TYPE * style_HSLIDER_WELL_TYPE) |\
(wimp_ICONFLAGS_BACKCOL * style_HSLIDER_WELL_BACKCOL)\
)
#define style_VSLIDER_WELL_VALIDSTR ""
#else /* DAYTONA_BUILD */
#define style_VSLIDER_WELL_BACKCOL 1 /* v. light grey */
#define style_VSLIDER_WELL_TYPE wimp_BUTTON_NEVER
#define style_VSLIDER_WELL_ICONFLAGS (wimp_ICONFLAGS_HAS_BORDER |\
......@@ -242,6 +277,7 @@
(wimp_ICONFLAGS_BACKCOL * style_VSLIDER_WELL_BACKCOL)\
)
#define style_VSLIDER_WELL_VALIDSTR "R2"
#endif /* DAYTONA_BUILD */
#define style_VSLIDER_BACKGND_WIDTH 16 /* OS Units */
#define style_VSLIDER_BACKGND_BACKCOL 0 /* white */
......
h/wimp 0 → 100644
View file @ 62363129
/* Copyright 1997 Acorn Computers 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.
*/
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