Index: CHUI/Test/MainForm2.cls.xml
===================================================================
diff -u -r1074 -r2578
--- CHUI/Test/MainForm2.cls.xml	(.../MainForm2.cls.xml)	(revision 1074)
+++ CHUI/Test/MainForm2.cls.xml	(.../MainForm2.cls.xml)	(revision 2578)
@@ -2,25 +2,25 @@
 <Export generator="Cache" version="9">
 <Class name="CHUI.Test.MainForm2">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%CHUI.TForm</Super>
+<Super>TCHUI.TForm</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Kader">
-<Type>%CHUI.TControl</Type>
+<Type>TCHUI.TControl</Type>
 </Property>
 
 <Property name="Timer">
-<Type>%CHUI.TTimer</Type>
+<Type>TCHUI.TTimer</Type>
 </Property>
 
 <Property name="mmoTest">
-<Type>%CHUI.TMemo</Type>
+<Type>TCHUI.TMemo</Type>
 </Property>
 
 <Method name="CreateControls">
 <Description>
-Property CheckBox As %CHUI.TCheckBox;
-Property ContextMenu As %CHUI.TContextMenu;
+Property CheckBox As TCHUI.TCheckBox;
+Property ContextMenu As TCHUI.TContextMenu;
 In te vullen door de GUI applicatie</Description>
 <Implementation><![CDATA[	Do ..InitControl()
 ]]></Implementation>
@@ -30,46 +30,46 @@
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
 	/*
-	Set ..Timer=##class(%CHUI.TTimer).%New()
+	Set ..Timer=##class(TCHUI.TTimer).%New()
 	Set ..Timer.MaxCount=5
 	Do ..Timer.Start()
 	Set ..Timer.OnTimer=$LB(%this,"OnTimer")
 
-	Set Timer2=##class(%CHUI.TTimer).%New()
+	Set Timer2=##class(TCHUI.TTimer).%New()
 	Set Timer2.Interval=2
 	Set Timer2.MaxCount=2
 	Do Timer2.Start()
 	Set Timer2.OnTimer=$LB(%this,"OnTimer")
 
-	Set Timer3=##class(%CHUI.TTimer).%New()
+	Set Timer3=##class(TCHUI.TTimer).%New()
 	Set Timer3.Interval=3
 	Set Timer3.MaxCount=4
 	Do Timer3.Start()
 	Set Timer3.OnTimer=$LB(%this,"OnTimer")
 	*/
-	/*Set ContextMenu=##class(%CHUI.TContextMenu).Create(%this,"Context")
+	/*Set ContextMenu=##class(TCHUI.TContextMenu).Create(%this,"Context")
 	; Menu File
 	Do ContextMenu.AddItem(%this,"TestOpen","Test1",1,"O",$LB(%this,"OnBtnClick"))
 	Do ContextMenu.AddItem(%this,,"-",1) ; separator
 	Do ContextMenu.AddItem(%this,"TestSluit","Test2",1,"S",$LB(%this,"OnBtnClick"))
-	//Set ..Kader=##class(%CHUI.TKader).Create(%this,"Kader","Toffe kader",4,3,..Height-7,..Width-5,1,,,$LB("YELLOW","LBLUE"))
+	//Set ..Kader=##class(TCHUI.TKader).Create(%this,"Kader","Toffe kader",4,3,..Height-7,..Width-5,1,,,$LB("YELLOW","LBLUE"))
 	
 	For Loop=1:1:5 Do
-	. Set tmpLbl=##class(%CHUI.TLabel).Create(%this,"Label"_Loop,"Label "_Loop,Loop,40,1,20,2)
-	. Set tmpTxt=##class(%CHUI.TEdit).Create(%this,"Edit"_Loop,"Edit "_Loop,Loop,25,1,10,2,1,,$LB(,"BROWN"),"C")
-	. Set tmpChk=##class(%CHUI.TCheckBox).Create(%this,"CheckBox"_Loop,"Show PolyKader "_Loop,Loop,1,1,20,1,1,,$LB("BLACK"))
+	. Set tmpLbl=##class(TCHUI.TLabel).Create(%this,"Label"_Loop,"Label "_Loop,Loop,40,1,20,2)
+	. Set tmpTxt=##class(TCHUI.TEdit).Create(%this,"Edit"_Loop,"Edit "_Loop,Loop,25,1,10,2,1,,$LB(,"BROWN"),"C")
+	. Set tmpChk=##class(TCHUI.TCheckBox).Create(%this,"CheckBox"_Loop,"Show PolyKader "_Loop,Loop,1,1,20,1,1,,$LB("BLACK"))
 	. ;Set tmpChk.GroupIndex="Test"
 	. Set tmpChk.OnChanged=$LB(%this,"OnChanged")*/
 
-	Set ..mmoTest=##class(%CHUI.TMemo).Create(%this,"mmoTest","",1,1,4,40,2,1,,$LB(,$$$clDark),"C")
+	Set ..mmoTest=##class(TCHUI.TMemo).Create(%this,"mmoTest","",1,1,4,40,2,1,,$LB(,$$$clDark),"C")
 	Set ..mmoTest.Paragraphs=0
 
 	/*
-	Set HLijnT=##class(%CHUI.TLijn).CreateLijn("H",%this,"HLijnT",6,6,60,2,,$LB("R"),$LB($LB(20,"TM")))
-	Set VLijnL=##class(%CHUI.TLijn).CreateLijn("V",%this,"VLijnL",6,5,10,3,,$LB("R"),$LB($LB(1,"TL"),$LB(,"BL")))
-	Set VLijnM=##class(%CHUI.TLijn).CreateLijn("V",%this,"VLijnM",7,25,8,5,,$LB("R"))
-	Set VLijnR=##class(%CHUI.TLijn).CreateLijn("V",%this,"VLijnR",6,66,10,6,,$LB("R"),$LB($LB(1,"TR"),$LB(,"BR")))
-	Set HLijnB=##class(%CHUI.TLijn).CreateLijn("H",%this,"HLijnB",15,6,60,2,,$LB("R"),$LB($LB(20,"BM")))
+	Set HLijnT=##class(TCHUI.TLijn).CreateLijn("H",%this,"HLijnT",6,6,60,2,,$LB("R"),$LB($LB(20,"TM")))
+	Set VLijnL=##class(TCHUI.TLijn).CreateLijn("V",%this,"VLijnL",6,5,10,3,,$LB("R"),$LB($LB(1,"TL"),$LB(,"BL")))
+	Set VLijnM=##class(TCHUI.TLijn).CreateLijn("V",%this,"VLijnM",7,25,8,5,,$LB("R"))
+	Set VLijnR=##class(TCHUI.TLijn).CreateLijn("V",%this,"VLijnR",6,66,10,6,,$LB("R"),$LB($LB(1,"TR"),$LB(,"BR")))
+	Set HLijnB=##class(TCHUI.TLijn).CreateLijn("H",%this,"HLijnB",15,6,60,2,,$LB("R"),$LB($LB(20,"BM")))
 	*/
 	//Set CtrlName=""
 	//For  Set CtrlName=$O(..Controls(CtrlName)) Quit:(CtrlName="")  Do
@@ -85,7 +85,7 @@
 </Method>
 
 <Method name="OnKey">
-<FormalSpec>Sender:%CHUI.TControlBasis,KeyCode:%String</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis,KeyCode:%String</FormalSpec>
 <Implementation><![CDATA[
 	If KeyCode="S" Do
 	. Do ..Timer.Start()
@@ -115,7 +115,7 @@
 </Method>
 
 <Method name="OnTimer">
-<FormalSpec>Sender:%CHUI.TTimer</FormalSpec>
+<FormalSpec>Sender:TCHUI.TTimer</FormalSpec>
 <Implementation><![CDATA[	;Do WL^vhDBG("Event triggered")
 ]]></Implementation>
 </Method>