From c7d6f785aa787adb635658d3645f9238d4d2c366 Mon Sep 17 00:00:00 2001 From: NicJA Date: Thu, 11 Apr 2019 17:12:06 +0000 Subject: [PATCH] _screen is only valid between show/hide. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@56205 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/classes/zune/clock/clock.c | 12 ++++++++++-- workbench/classes/zune/clock/clock.conf | 5 +++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/workbench/classes/zune/clock/clock.c b/workbench/classes/zune/clock/clock.c index c97d4c12ac..452f0b4488 100644 --- a/workbench/classes/zune/clock/clock.c +++ b/workbench/classes/zune/clock/clock.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2019, The AROS Development Team. All rights reserved. $Id$ */ @@ -183,7 +183,16 @@ IPTR Clock__MUIM_Setup(Class *cl, Object *obj, struct MUIP_Setup *msg) if (!DoSuperMethodA(cl, obj, (Msg)msg)) return FALSE; DoMethod(_app(obj), MUIM_Application_AddInputHandler, (IPTR) &data->ihn); + + return TRUE; +} + +IPTR Clock__MUIM_Show(Class *cl, Object *obj, struct MUIP_Setup *msg) +{ + struct Clock_DATA *data = INST_DATA(cl, obj); + if (!DoSuperMethodA(cl, obj, (Msg)msg)) return FALSE; + data->editpen = ObtainBestPen(_screen(obj)->ViewPort.ColorMap, 0xFFFFFFFF, 0xD8D8D8D8, @@ -194,7 +203,6 @@ IPTR Clock__MUIM_Setup(Class *cl, Object *obj, struct MUIP_Setup *msg) return TRUE; } - IPTR Clock__MUIM_Cleanup(Class *cl, Object *obj, struct MUIP_Cleanup *msg) { struct Clock_DATA *data = INST_DATA(cl, obj); diff --git a/workbench/classes/zune/clock/clock.conf b/workbench/classes/zune/clock/clock.conf index a180cdae9e..eac65c4b70 100644 --- a/workbench/classes/zune/clock/clock.conf +++ b/workbench/classes/zune/clock/clock.conf @@ -1,7 +1,7 @@ ##begin config basename Clock -version 1.0 -date 27.05.2003 +version 1.1 +date 11.04.2019 superclass MUIC_Area classdatatype struct Clock_DATA ##end config @@ -26,4 +26,5 @@ MUIM_Cleanup MUIM_Clock_Timer MUIM_Draw MUIM_Setup +MUIM_Show ##end methodlist -- 2.11.4.GIT