Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
RiscOS
S
Sources
V
Video
UserI
Picker
Commits
36dee2ea
Commit
36dee2ea
authored
May 13, 1997
by
Kevin Bracey
Browse files
Version RO_3_71 taken
parent
49ce1d55
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
82 additions
and
82 deletions
+82
-82
SelectTabl/Makefile,fe1
SelectTabl/Makefile,fe1
+1
-1
Support011/Makefile,fe1
Support011/Makefile,fe1
+1
-1
Test/Makefile,fe1
Test/Makefile,fe1
+2
-2
c/cmyk
c/cmyk
+10
-10
c/dialogue
c/dialogue
+31
-31
c/hsv
c/hsv
+18
-18
c/rgb
c/rgb
+18
-18
cmhg/header310
cmhg/header310
+1
-1
No files found.
SelectTabl/Makefile,fe1
View file @
36dee2ea
...
...
@@ -20,7 +20,7 @@ SelectTable: o.main
Link
-output
SelectTable
${OBJS}
OSLib:o.OSLib CLib:o.Stubs
.SUFFIXES
:
.c .o .def .h
.c.o
:
; cc -c -IOS:
,
Support: -wp $<
.c.o
:
; cc -c
${THROWBACK}
-IOS:
,
Support: -wp $<
.def.h
:
; DefMod -h < $< > $@
.def.o
:
; DefMod -l -o l.$* < $<
LibFile
-o
-c
$@
-via
ViaFile
...
...
Support011/Makefile,fe1
View file @
36dee2ea
...
...
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
CC
=
cc
-IOS
:
-depend
!
Depend
-wp
CC
=
cc
-IOS
:
${THROWBACK}
-depend
!
Depend
-wp
CHEADERS
=
h.advance h.ddeutils h.email h.hostfs h.nfs
...
...
Test/Makefile,fe1
View file @
36dee2ea
...
...
@@ -14,8 +14,8 @@
#
VPATH
=
@ <Support
$Dir
>
CC
=
cc
-c
-ISupport
:,OS:
-fachK
-wp
-depend
!
Depend
OBJASM
=
ObjAsm
-depend
!
Depend
-stamp
-quit
CC
=
cc
-c
-ISupport
:,OS:
-fachK
-wp
${THROWBACK}
-depend
!
Depend
OBJASM
=
ObjAsm
${THROWBACK}
-depend
!
Depend
-stamp
-quit
LINK
=
Link
LIBS
=
OSLib:o.oslib CLib:o.Stubs
...
...
c/cmyk
View file @
36dee2ea
...
...
@@ -721,17 +721,17 @@ static os_error *Dialogue_Starting (task_r r, wimp_w main_w,
/*Returns are watched so we can update the steppables from the values
in their respective icons.*/
(
error
=
callback_register
(
cmyk
->
list
,
&
Return
,
colour
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
main_w
,
cmyk
->
first_i
+
cmyk_CMYK_CPERCENT
))
!=
NULL
||
wimp_KEY_PRESSED
,
main_w
,
cmyk
->
first_i
+
cmyk_CMYK_CPERCENT
,
wimp_KEY_RETURN
))
!=
NULL
||
(
error
=
callback_register
(
cmyk
->
list
,
&
Return
,
colour
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
main_w
,
cmyk
->
first_i
+
cmyk_CMYK_MPERCENT
))
!=
NULL
||
wimp_KEY_PRESSED
,
main_w
,
cmyk
->
first_i
+
cmyk_CMYK_MPERCENT
,
wimp_KEY_RETURN
))
!=
NULL
||
(
error
=
callback_register
(
cmyk
->
list
,
&
Return
,
colour
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
main_w
,
cmyk
->
first_i
+
cmyk_CMYK_YPERCENT
))
!=
NULL
||
wimp_KEY_PRESSED
,
main_w
,
cmyk
->
first_i
+
cmyk_CMYK_YPERCENT
,
wimp_KEY_RETURN
))
!=
NULL
||
(
error
=
callback_register
(
cmyk
->
list
,
&
Return
,
colour
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
main_w
,
cmyk
->
first_i
+
cmyk_CMYK_KPERCENT
))
!=
NULL
||
wimp_KEY_PRESSED
,
main_w
,
cmyk
->
first_i
+
cmyk_CMYK_KPERCENT
,
wimp_KEY_RETURN
))
!=
NULL
||
/*Other keypresses are passed on.*/
(
error
=
callback_register
(
cmyk
->
list
,
&
Pass
,
colour
,
1
,
...
...
@@ -753,8 +753,8 @@ static os_error *Dialogue_Starting (task_r r, wimp_w main_w,
/*Clicks on all the desktop colour icons.*/
for
(
c
=
0
;
c
<
16
;
c
++
)
if
((
error
=
callback_register
(
cmyk
->
list
,
&
Desktop
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NONE
,
main_w
,
cmyk
->
first_i
+
Desktop_Colours
[
c
]
))
!=
NULL
)
wimp_MOUSE_CLICK
,
main_w
,
cmyk
->
first_i
+
Desktop_Colours
[
c
]
,
wimp_CLICK_SELECT
,
NONE
))
!=
NULL
)
goto
finish
;
if
(
colour_out
!=
NULL
)
*
colour_out
=
colour
;
...
...
c/dialogue
View file @
36dee2ea
...
...
@@ -39,7 +39,7 @@
#include "riscos.h"
#include "task.h"
#include "trace.h"
#include "win.h"
#include "win
dow
.h"
/*Local*/
#include "colourpicker.h"
...
...
@@ -1070,22 +1070,22 @@ static os_error *New (colourpicker_dialogue *dialogue,
/*Click SELECT or ADJUST on None.*/
(
error
=
callback_register
(
list
,
&
None
,
l
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NONE
,
l
->
main_w
,
dialogue_PICKER_NONE
))
!=
l
->
main_w
,
dialogue_PICKER_
NONE
,
wimp_CLICK_SELECT
,
NONE
))
!=
NULL
||
(
error
=
callback_register
(
list
,
&
None
,
l
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_ADJUST
,
NONE
,
l
->
main_w
,
dialogue_PICKER_NONE
))
!=
l
->
main_w
,
dialogue_PICKER_
NONE
,
wimp_CLICK_ADJUST
,
NONE
))
!=
NULL
||
/*Click SELECT on the model icons.*/
(
error
=
callback_register
(
list
,
&
Model
,
l
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NONE
,
l
->
main_w
,
dialogue_PICKER_RGB
))
!=
NULL
||
wimp_MOUSE_CLICK
,
l
->
main_w
,
dialogue_PICKER_RGB
,
wimp_CLICK_SELECT
,
NONE
))
!=
NULL
||
(
error
=
callback_register
(
list
,
&
Model
,
l
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NONE
,
l
->
main_w
,
dialogue_PICKER_CMYK
))
!=
NULL
||
wimp_MOUSE_CLICK
,
l
->
main_w
,
dialogue_PICKER_CMYK
,
wimp_CLICK_SELECT
,
NONE
))
!=
NULL
||
(
error
=
callback_register
(
list
,
&
Model
,
l
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NONE
,
l
->
main_w
,
dialogue_PICKER_HSV
))
!=
NULL
||
wimp_MOUSE_CLICK
,
l
->
main_w
,
dialogue_PICKER_HSV
,
wimp_CLICK_SELECT
,
NONE
))
!=
NULL
||
/*Respond to help request events.*/
(
error
=
callback_register
(
list
,
&
Help
,
l
,
3
,
...
...
@@ -1119,22 +1119,22 @@ static os_error *New (colourpicker_dialogue *dialogue,
if
(
/*Click SELECT on OK*/
(
error
=
callback_register
(
list
,
&
Choice
,
l
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NONE
,
l
->
main_w
,
dialogue_PICKER_OK
))
!=
l
->
main_w
,
dialogue_PICKER_OK
,
wimp_CLICK_SELECT
,
NONE
))
!=
NULL
||
/*Click ADJUST on OK.*/
(
error
=
callback_register
(
list
,
&
Choice
,
l
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_ADJUST
,
NONE
,
l
->
main_w
,
dialogue_PICKER_OK
))
!=
l
->
main_w
,
dialogue_PICKER_OK
,
wimp_CLICK_ADJUST
,
NONE
))
!=
NULL
||
/*Click ADJUST on Cancel.*/
(
error
=
callback_register
(
list
,
&
Reset
,
l
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_ADJUST
,
NONE
,
l
->
main_w
,
dialogue_PICKER_CANCEL
))
l
->
main_w
,
dialogue_PICKER_CANCEL
,
wimp_CLICK_ADJUST
,
NONE
))
!=
NULL
||
/*Press Return (invoked only via ColourPickerModelSWI_ProcessKey).*/
(
error
=
callback_register
(
list
,
&
Choice
,
l
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
l
->
main_w
,
wimp_ICON_WINDOW
))
!=
NULL
l
->
main_w
,
wimp_ICON_WINDOW
,
wimp_KEY_RETURN
))
!=
NULL
)
goto
finish
;
...
...
@@ -1152,20 +1152,20 @@ static os_error *New (colourpicker_dialogue *dialogue,
/*And also when it is dismissed.*/
(
error
=
callback_register
(
list
,
&
Dismiss
,
l
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NONE
,
l
->
main_w
,
dialogue_PICKER_OK
))
!=
NULL
||
wimp_MOUSE_CLICK
,
l
->
main_w
,
dialogue_PICKER_OK
,
wimp_CLICK_SELECT
,
NONE
))
!=
NULL
||
(
error
=
callback_register
(
list
,
&
Dismiss
,
l
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NONE
,
l
->
main_w
,
dialogue_PICKER_CANCEL
))
!=
NULL
||
wimp_MOUSE_CLICK
,
l
->
main_w
,
dialogue_PICKER_CANCEL
,
wimp_CLICK_SELECT
,
NONE
))
!=
NULL
||
(
error
=
callback_register
(
list
,
&
Dismiss
,
l
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
l
->
main_w
,
wimp_ICON_WINDOW
))
!=
NULL
||
wimp_KEY_PRESSED
,
l
->
main_w
,
wimp_ICON_WINDOW
,
wimp_KEY_RETURN
))
!=
NULL
||
(
error
=
callback_register
(
list
,
&
Dismiss
,
l
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_ESCAPE
,
l
->
main_w
,
wimp_ICON_WINDOW
))
!=
NULL
wimp_KEY_PRESSED
,
l
->
main_w
,
wimp_ICON_WINDOW
,
wimp_KEY_ESCAPE
))
!=
NULL
)
goto
finish
;
}
...
...
@@ -1175,23 +1175,23 @@ static os_error *New (colourpicker_dialogue *dialogue,
if
(
/*Click SELECT on OK.*/
(
error
=
callback_register
(
list
,
&
Close
,
l
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NONE
,
l
->
main_w
,
dialogue_PICKER_OK
))
!=
NULL
||
wimp_MOUSE_CLICK
,
l
->
main_w
,
dialogue_PICKER_OK
,
wimp_CLICK_SELECT
,
NONE
))
!=
NULL
||
/*Click SELECT on Cancel.*/
(
error
=
callback_register
(
list
,
&
Close
,
l
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NONE
,
l
->
main_w
,
dialogue_PICKER_CANCEL
))
!=
NULL
||
wimp_MOUSE_CLICK
,
l
->
main_w
,
dialogue_PICKER_CANCEL
,
wimp_CLICK_SELECT
,
NONE
))
!=
NULL
||
/*Press Return (invoked via ColourPickerModelSWI_ProcessKey).*/
(
error
=
callback_register
(
list
,
&
Close
,
l
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
l
->
main_w
,
wimp_ICON_WINDOW
))
!=
NULL
||
wimp_KEY_PRESSED
,
l
->
main_w
,
wimp_ICON_WINDOW
,
wimp_KEY_RETURN
))
!=
NULL
||
/*Press Escape (ditto).*/
(
error
=
callback_register
(
list
,
&
Close
,
l
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_ESCAPE
,
l
->
main_w
,
wimp_ICON_WINDOW
))
!=
NULL
wimp_KEY_PRESSED
,
l
->
main_w
,
wimp_ICON_WINDOW
,
wimp_KEY_ESCAPE
))
!=
NULL
)
goto
finish
;
}
}
...
...
@@ -1759,7 +1759,7 @@ os_error *dialogue_update (bits flags, colourpicker_d d,
goto
finish
;
}
if
((
error
=
win_set_title
(
l
->
main_w
,
title
))
!=
NULL
)
if
((
error
=
win
dow
_set_title
(
l
->
main_w
,
title
))
!=
NULL
)
goto
finish
;
}
#endif
...
...
@@ -2040,7 +2040,7 @@ break2:;
the key was pressed.*/
if
((
error
=
callback
(
task_list
(
l
->
parent
->
r
),
l
,
&
unclaimed
,
4
,
wimp_KEY_PRESSED
,
c
,
l
->
main_w
,
wimp_ICON_WINDOW
))
!=
NULL
)
wimp_KEY_PRESSED
,
l
->
main_w
,
wimp_ICON_WINDOW
,
c
))
!=
NULL
)
goto
finish
;
if
(
unclaimed
)
...
...
c/hsv
View file @
36dee2ea
...
...
@@ -1600,24 +1600,24 @@ static os_error *Dialogue_Starting (task_r r, wimp_w main_w,
/*Clicks on the slice icons.*/
(
error
=
callback_register
(
hsv
->
list
,
&
Slice
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NON
E
,
main_w
,
first_i
+
hsv_HSV_HUESLIC
E
))
!=
NULL
||
wimp_MOUSE_CLICK
,
main_w
,
first_i
+
hsv_HSV_HUESLIC
E
,
wimp_CLICK_SELECT
,
NON
E
))
!=
NULL
||
(
error
=
callback_register
(
hsv
->
list
,
&
Slice
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NON
E
,
main_w
,
first_i
+
hsv_HSV_SATURATIONSLIC
E
))
!=
NULL
||
wimp_MOUSE_CLICK
,
main_w
,
first_i
+
hsv_HSV_SATURATIONSLIC
E
,
wimp_CLICK_SELECT
,
NON
E
))
!=
NULL
||
(
error
=
callback_register
(
hsv
->
list
,
&
Slice
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NON
E
,
main_w
,
first_i
+
hsv_HSV_VALUESLIC
E
))
!=
NULL
||
wimp_MOUSE_CLICK
,
main_w
,
first_i
+
hsv_HSV_VALUESLIC
E
,
wimp_CLICK_SELECT
,
NON
E
))
!=
NULL
||
/*Click on the slice itself gives a 2-way selection.*/
(
error
=
callback_register
(
hsv
->
list
,
&
Two_Way
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NON
E
,
main_w
,
first_i
+
hsv_HSV_SLIC
E
))
!=
NULL
||
wimp_MOUSE_CLICK
,
main_w
,
first_i
+
hsv_HSV_SLIC
E
,
wimp_CLICK_SELECT
,
NON
E
))
!=
NULL
||
/*Drag starts a drag. JRC 9th Dec 1994*/
(
error
=
callback_register
(
hsv
->
list
,
&
Start_Drag
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_DRAG_SELECT
,
NON
E
,
main_w
,
first_i
+
hsv_HSV_SLIC
E
))
!=
NULL
||
wimp_MOUSE_CLICK
,
main_w
,
first_i
+
hsv_HSV_SLIC
E
,
wimp_DRAG_SELECT
,
NON
E
))
!=
NULL
||
(
error
=
callback_register
(
hsv
->
list
,
&
Dragging
,
colour
,
1
,
wimp_NULL_REASON_CODE
))
!=
NULL
||
(
error
=
callback_register
(
hsv
->
list
,
&
End_Drag
,
colour
,
1
,
...
...
@@ -1626,14 +1626,14 @@ static os_error *Dialogue_Starting (task_r r, wimp_w main_w,
/*Returns are watched so we can update the steppables from the values
in their respective icons.*/
(
error
=
callback_register
(
hsv
->
list
,
&
Return
,
colour
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
main_w
,
first_i
+
hsv_HSV_HUEDEGREES
))
!=
NULL
||
wimp_KEY_PRESSED
,
main_w
,
first_i
+
hsv_HSV_HUEDEGREES
,
wimp_KEY_RETURN
))
!=
NULL
||
(
error
=
callback_register
(
hsv
->
list
,
&
Return
,
colour
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
main_w
,
first_i
+
hsv_HSV_SATURATIONPERCENT
))
!=
NULL
||
wimp_KEY_PRESSED
,
main_w
,
first_i
+
hsv_HSV_SATURATIONPERCENT
,
wimp_KEY_RETURN
))
!=
NULL
||
(
error
=
callback_register
(
hsv
->
list
,
&
Return
,
colour
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
main_w
,
first_i
+
hsv_HSV_VALUEPERCENT
))
!=
NULL
||
wimp_KEY_PRESSED
,
main_w
,
first_i
+
hsv_HSV_VALUEPERCENT
,
wimp_KEY_RETURN
))
!=
NULL
||
/*Other keypresses are passed on.*/
(
error
=
callback_register
(
hsv
->
list
,
&
Pass
,
colour
,
1
,
...
...
@@ -1655,8 +1655,8 @@ static os_error *Dialogue_Starting (task_r r, wimp_w main_w,
/*Clicks on all the desktop colour icons.*/
for
(
c
=
0
;
c
<
16
;
c
++
)
if
((
error
=
callback_register
(
hsv
->
list
,
&
Desktop
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NONE
,
main_w
,
first_i
+
Desktop_Colours
[
c
]
))
!=
NULL
)
wimp_MOUSE_CLICK
,
main_w
,
first_i
+
Desktop_Colours
[
c
]
,
wimp_CLICK_SELECT
,
NONE
))
!=
NULL
)
goto
finish
;
if
(
colour_out
!=
NULL
)
*
colour_out
=
colour
;
...
...
c/rgb
View file @
36dee2ea
...
...
@@ -1513,24 +1513,24 @@ static os_error *Dialogue_Starting (task_r r, wimp_w main_w,
/*Clicks on the slice icons.*/
(
error
=
callback_register
(
rgb
->
list
,
&
Slice
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NON
E
,
main_w
,
first_i
+
rgb_RGB_REDSLIC
E
))
!=
NULL
||
wimp_MOUSE_CLICK
,
main_w
,
first_i
+
rgb_RGB_REDSLIC
E
,
wimp_CLICK_SELECT
,
NON
E
))
!=
NULL
||
(
error
=
callback_register
(
rgb
->
list
,
&
Slice
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NON
E
,
main_w
,
first_i
+
rgb_RGB_GREENSLIC
E
))
!=
NULL
||
wimp_MOUSE_CLICK
,
main_w
,
first_i
+
rgb_RGB_GREENSLIC
E
,
wimp_CLICK_SELECT
,
NON
E
))
!=
NULL
||
(
error
=
callback_register
(
rgb
->
list
,
&
Slice
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NON
E
,
main_w
,
first_i
+
rgb_RGB_BLUESLIC
E
))
!=
NULL
||
wimp_MOUSE_CLICK
,
main_w
,
first_i
+
rgb_RGB_BLUESLIC
E
,
wimp_CLICK_SELECT
,
NON
E
))
!=
NULL
||
/*Click on the slice itself gives a 2-way selection.*/
(
error
=
callback_register
(
rgb
->
list
,
&
Two_Way
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NON
E
,
main_w
,
first_i
+
rgb_RGB_SLIC
E
))
!=
NULL
||
wimp_MOUSE_CLICK
,
main_w
,
first_i
+
rgb_RGB_SLIC
E
,
wimp_CLICK_SELECT
,
NON
E
))
!=
NULL
||
/*Drag starts a drag. JRC 9th Dec 1994*/
(
error
=
callback_register
(
rgb
->
list
,
&
Start_Drag
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_DRAG_SELECT
,
NON
E
,
main_w
,
first_i
+
rgb_RGB_SLIC
E
))
!=
NULL
||
wimp_MOUSE_CLICK
,
main_w
,
first_i
+
rgb_RGB_SLIC
E
,
wimp_DRAG_SELECT
,
NON
E
))
!=
NULL
||
(
error
=
callback_register
(
rgb
->
list
,
&
Dragging
,
colour
,
1
,
wimp_NULL_REASON_CODE
))
!=
NULL
||
(
error
=
callback_register
(
rgb
->
list
,
&
End_Drag
,
colour
,
1
,
...
...
@@ -1539,14 +1539,14 @@ static os_error *Dialogue_Starting (task_r r, wimp_w main_w,
/*Returns are watched so we can update the steppables from the values
in their respective icons.*/
(
error
=
callback_register
(
rgb
->
list
,
&
Return
,
colour
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
main_w
,
first_i
+
rgb_RGB_REDPERCENT
))
!=
NULL
||
wimp_KEY_PRESSED
,
main_w
,
first_i
+
rgb_RGB_REDPERCENT
,
wimp_KEY_RETURN
))
!=
NULL
||
(
error
=
callback_register
(
rgb
->
list
,
&
Return
,
colour
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
main_w
,
first_i
+
rgb_RGB_GREENPERCENT
))
!=
NULL
||
wimp_KEY_PRESSED
,
main_w
,
first_i
+
rgb_RGB_GREENPERCENT
,
wimp_KEY_RETURN
))
!=
NULL
||
(
error
=
callback_register
(
rgb
->
list
,
&
Return
,
colour
,
4
,
wimp_KEY_PRESSED
,
wimp_KEY_RETURN
,
main_w
,
first_i
+
rgb_RGB_BLUEPERCENT
))
!=
NULL
||
wimp_KEY_PRESSED
,
main_w
,
first_i
+
rgb_RGB_BLUEPERCENT
,
wimp_KEY_RETURN
))
!=
NULL
||
/*Other keypresses are passed on.*/
(
error
=
callback_register
(
rgb
->
list
,
&
Pass
,
colour
,
1
,
...
...
@@ -1568,8 +1568,8 @@ static os_error *Dialogue_Starting (task_r r, wimp_w main_w,
/*Clicks on all the desktop colour icons.*/
for
(
c
=
0
;
c
<
16
;
c
++
)
if
((
error
=
callback_register
(
rgb
->
list
,
&
Desktop
,
colour
,
5
,
wimp_MOUSE_CLICK
,
wimp_CLICK_SELECT
,
NONE
,
main_w
,
first_i
+
Desktop_Colours
[
c
]
))
!=
NULL
)
wimp_MOUSE_CLICK
,
main_w
,
first_i
+
Desktop_Colours
[
c
]
,
wimp_CLICK_SELECT
,
NONE
))
!=
NULL
)
goto
finish
;
if
(
colour_out
!=
NULL
)
*
colour_out
=
colour
;
...
...
cmhg/header310
View file @
36dee2ea
...
...
@@ -14,7 +14,7 @@
;
title-string:
ColourPicker
help-string:
Colour_Picker
0
.
3
8
help-string:
Colour_Picker
0
.
3
6
swi-chunk-base-number:
0x47700
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment