From 206ca1c87e7be48e1100f8cb4b9509d1ecbf480d Mon Sep 17 00:00:00 2001 From: sszymczy Date: Sat, 14 Feb 2009 21:05:08 +0000 Subject: [PATCH] Reworked MUIM_Import / MUIM_Export to make them use MUIM_Dataspace_Find / MUIM_Dataspace_Add instead of non-existing MUIM_Dataspace_FindInt / MUIM_Dataspace_AddInt. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@30498 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/libs/muimaster/classes/numeric.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/workbench/libs/muimaster/classes/numeric.c b/workbench/libs/muimaster/classes/numeric.c index 17c180be9e..e99b9e1dea 100644 --- a/workbench/libs/muimaster/classes/numeric.c +++ b/workbench/libs/muimaster/classes/numeric.c @@ -496,16 +496,17 @@ IPTR Numeric__MUIM_ValueToScaleExt(struct IClass *cl, Object * obj, struct MUIP_ **************************************************************************/ IPTR Numeric__MUIM_Export(struct IClass *cl, Object *obj, struct MUIP_Export *msg) { -#if 0 struct MUI_NumericData *data = INST_DATA(cl, obj); - STRPTR id; + ULONG id; if ((id = muiNotifyData(obj)->mnd_ObjectID)) { - DoMethod(msg->dataspace, MUIM_Dataspace_AddInt, - _U(id), _U("value"), _U(&data->value)); + LONG value = data->value; + DoMethod(msg->dataspace, MUIM_Dataspace_Add, + (IPTR) &value, + sizeof(value), + (IPTR) id); } -#endif return 0; } @@ -514,21 +515,17 @@ IPTR Numeric__MUIM_Export(struct IClass *cl, Object *obj, struct MUIP_Export *ms **************************************************************************/ IPTR Numeric__MUIM_Import(struct IClass *cl, Object *obj, struct MUIP_Import *msg) { -#if 0 struct MUI_NumericData *data = INST_DATA(cl, obj); - STRPTR id; - LONG val; + ULONG id; + LONG *s; if ((id = muiNotifyData(obj)->mnd_ObjectID)) { - if (DoMethod(msg->dataspace, MUIM_Dataspace_FindString, _U(id), _U("value"))) + if ((s = (LONG*) DoMethod(msg->dataspace, MUIM_Dataspace_Find, (IPTR) id))) { - DoMethod(msg->dataspace, MUIM_Dataspace_FindInt, - _U(id), _U("value"), _U(&val)); - set(obj, MUIA_Numeric_Value, val); + set(obj, MUIA_Numeric_Value, *s); } } -#endif return 0; } -- 2.11.4.GIT