--- rpl/modules/motif/XtCreateWidget.rplc	2017/07/11 16:04:53	1.6
+++ rpl/modules/motif/XtCreateWidget.rplc	2017/07/30 21:59:40	1.7
@@ -168,7 +168,7 @@ declareExternalFunction(XtCreateWidget)
 							(strcmp(command, "XmNleftWidget") eq 0) or
 							(strcmp(command, "XmNrightWidget") eq 0)) then
 						XtSetArg(args[argNum], argument,
-								(XtArgVal) target((Widget *) objectContainer(
+								(XtArgVal) target(objectContainer(Widget,
 								fetchElementFromDaisyChain(current2))));
 					orElse
 						executionError("Wait for XmN*Widget");
@@ -196,7 +196,7 @@ declareExternalFunction(XtCreateWidget)
 								(strcmp(command, "XmNleftWidget") eq 0) or
 								(strcmp(command, "XmNrightWidget") eq 0)) then
 						XtSetArg(args[argNum], argument,
-								(XtArgVal) target((Widget *) objectContainer(
+								(XtArgVal) target(objectContainer(Widget,
 								directive)));
 						orElse
 							executionError("Wait for XmN*Widget");
@@ -221,12 +221,12 @@ declareExternalFunction(XtCreateWidget)
 			endWhile
 
 			createExternalObject(widget, WIDGET);
-			objectContainer(widget) = allocate(size(Widget));
+			objectOf(widget) = allocate(size(Widget));
 
-			target((Widget *) objectContainer(widget)) =
-					XtCreateWidget(name, wc, target((Widget *)
-					objectContainer(parentObject)), args, argNum);
-			XtManageChild(target((Widget *) objectContainer(widget)));
+			target(objectContainer(Widget, widget)) =
+					XtCreateWidget(name, wc, target(
+					objectContainer(Widget, parentObject)), args, argNum);
+			XtManageChild(target(objectContainer(Widget, widget)));
 
 			pushOnStack(widget);
 			deallocate(args);