Index: CHUI/Test/Form.cls.xml
===================================================================
diff -u -r1074 -r2578
--- CHUI/Test/Form.cls.xml	(.../Form.cls.xml)	(revision 1074)
+++ CHUI/Test/Form.cls.xml	(.../Form.cls.xml)	(revision 2578)
@@ -4,115 +4,114 @@
 <Description>
 D ##class(CHUI.Test.Form).Run()</Description>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%CHUI.TForm</Super>
-<ClassDefinitionError>0</ClassDefinitionError>
+<Super>TCHUI.TForm</Super>
 
 <Property name="Frame">
-<Type>%CHUI.TFrame</Type>
+<Type>TCHUI.TFrame</Type>
 </Property>
 
 <Property name="Lijst">
-<Type>%CHUI.TLijst</Type>
+<Type>TCHUI.TLijst</Type>
 </Property>
 
 <Property name="acNieuw">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acOpen">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acRaadplegenKlant">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acSluit">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acVerwijder">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acVerwijderAlles">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acWijzig">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="lblKortTekst">
-<Type>%CHUI.TLabel</Type>
+<Type>TCHUI.TLabel</Type>
 </Property>
 
 <Property name="lblPRNr">
-<Type>%CHUI.TLabel</Type>
+<Type>TCHUI.TLabel</Type>
 </Property>
 
 <Property name="miNieuw">
-<Type>%CHUI.TMenuItem</Type>
+<Type>TCHUI.TMenuItem</Type>
 </Property>
 
 <Property name="miOpen">
-<Type>%CHUI.TMenuItem</Type>
+<Type>TCHUI.TMenuItem</Type>
 </Property>
 
 <Property name="miRaadplegenKlant">
-<Type>%CHUI.TMenuItem</Type>
+<Type>TCHUI.TMenuItem</Type>
 </Property>
 
 <Property name="miSeparAlles">
-<Type>%CHUI.TMenuItem</Type>
+<Type>TCHUI.TMenuItem</Type>
 </Property>
 
 <Property name="miSluit">
-<Type>%CHUI.TMenuItem</Type>
+<Type>TCHUI.TMenuItem</Type>
 </Property>
 
 <Property name="miVerwijder">
-<Type>%CHUI.TMenuItem</Type>
+<Type>TCHUI.TMenuItem</Type>
 </Property>
 
 <Property name="miVerwijderAlles">
-<Type>%CHUI.TMenuItem</Type>
+<Type>TCHUI.TMenuItem</Type>
 </Property>
 
 <Property name="miWijzig">
-<Type>%CHUI.TMenuItem</Type>
+<Type>TCHUI.TMenuItem</Type>
 </Property>
 
 <Property name="mnEdit">
-<Type>%CHUI.TMenuItem</Type>
+<Type>TCHUI.TMenuItem</Type>
 </Property>
 
 <Property name="mnFile">
-<Type>%CHUI.TMenuItem</Type>
+<Type>TCHUI.TMenuItem</Type>
 </Property>
 
 <Property name="mnLink">
-<Type>%CHUI.TMenuItem</Type>
+<Type>TCHUI.TMenuItem</Type>
 </Property>
 
 <Property name="txtKortTekst">
-<Type>%CHUI.TEdit</Type>
+<Type>TCHUI.TEdit</Type>
 </Property>
 
 <Property name="txtPRNr">
-<Type>%CHUI.TEdit</Type>
+<Type>TCHUI.TEdit</Type>
 </Property>
 
 <Property name="btnSave">
-<Type>%CHUI.TButton</Type>
+<Type>TCHUI.TButton</Type>
 </Property>
 
 <Property name="btnCancel">
-<Type>%CHUI.TButton</Type>
+<Type>TCHUI.TButton</Type>
 </Property>
 
 <Property name="Kader">
-<Type>%CHUI.TKader</Type>
+<Type>TCHUI.TKader</Type>
 </Property>
 
 <Property name="CancelTerminated">
@@ -123,7 +122,6 @@
 <Method name="CreateControls">
 <Description>
 In te vullen door de GUI applicatie</Description>
-<CodeMode>code</CodeMode>
 <Implementation><![CDATA[
 	Do ..InitControl()
 	;Do ..InitMemo()
@@ -136,24 +134,24 @@
 <Implementation><![CDATA[
  ;Control creation en basisdefinitie
 
-	Set ..Kader=##class(%CHUI.TKader).Create(%this,"Kader","Titel",1,1,..Height,..Width,1,,,)
+	Set ..Kader=##class(TCHUI.TKader).Create(%this,"Kader","Titel",1,1,..Height,..Width,1,,,)
 	
-	Set ..btnSave=##class(%CHUI.TButton).Create(%this,"btnSave","Start",2,60,1,10,10,9,,,"C")
+	Set ..btnSave=##class(TCHUI.TButton).Create(%this,"btnSave","Start",2,60,1,10,10,9,,,"C")
 	Set ..btnSave.OnClick=$LB(%this,"onClickOK")
-	Set ..btnCancel=##class(%CHUI.TButton).Create(%this,"btnCancel","Annuleer",3,60,1,10,10,10,,,"C")
+	Set ..btnCancel=##class(TCHUI.TButton).Create(%this,"btnCancel","Annuleer",3,60,1,10,10,10,,,"C")
 	Set ..btnCancel.OnClick=$LB(%this,"onClickCancel")
-	Set ..lblPRNr=##class(%CHUI.TLabel).Create(%this,"lblPRNr","PRNr",2,2,1,10,2,,,$LB(,,"U"),"R")
-	Set ..lblKortTekst=##class(%CHUI.TLabel).Create(%this,"lblKortTekst","KortTekst",3,2,1,10,2,,,$LB(,,"U"),"R")
+	Set ..lblPRNr=##class(TCHUI.TLabel).Create(%this,"lblPRNr","PRNr",2,2,1,10,2,,,$LB(,,"U"),"R")
+	Set ..lblKortTekst=##class(TCHUI.TLabel).Create(%this,"lblKortTekst","KortTekst",3,2,1,10,2,,,$LB(,,"U"),"R")
 
 
-	Set ..txtPRNr=##class(%CHUI.TEdit).Create(%this,"txtKPRNr","",2,20,1,10,2,1,,,"C")
-	Set ..txtKortTekst=##class(%CHUI.TEdit).Create(%this,"txtKortTekst","",3,20,1,25,2,1,,,"L")
+	Set ..txtPRNr=##class(TCHUI.TEdit).Create(%this,"txtKPRNr","",2,20,1,10,2,1,,,"C")
+	Set ..txtKortTekst=##class(TCHUI.TEdit).Create(%this,"txtKortTekst","",3,20,1,25,2,1,,,"L")
  	; Control afhankelijke Definitie
 	Do ..txtPRNr.InitSpec(1128)
 	Set ..txtKortTekst.OnDisplay=$LB(%this,"txtKortTekstToDisplay")
 	Do ..txtKortTekst.InitSpec(..txtPRNr.Value)
 	; Memo
-	Set Memo=##class(%CHUI.TMemo).Create(%this,"Kader","Titel",5,5,5,50,3,3)
+	Set Memo=##class(TCHUI.TMemo).Create(%this,"Kader","Titel",5,5,5,50,3,3)
 	set Txt(1)="dlljf lkjf lsdflkjd lfsljf lfjdlf djslf1"
 	set Txt(2)="dlljf lkjf lsdflkjd lfsljf lfjdlf djslf2"
 	set Txt(3)="dlljf lkjf lsdflkjd lfsljf lfjdlf djslf3"
@@ -168,22 +166,21 @@
 </Method>
 
 <Method name="InitControl">
-<CodeMode>code</CodeMode>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
  	;Control creation en basisdefinitie
 
-	Set ..Kader=##class(%CHUI.TKader).Create(%this,"Kader","Titel",1,1,..Height,..Width,1,,,)
+	Set ..Kader=##class(TCHUI.TKader).Create(%this,"Kader","Titel",1,1,..Height,..Width,1,,,)
 	
-	Set ..btnSave=##class(%CHUI.TButton).Create(%this,"btnSave","Start",2,60,1,10,10,9,,,"C")
+	Set ..btnSave=##class(TCHUI.TButton).Create(%this,"btnSave","Start",2,60,1,10,10,9,,,"C")
 	Set ..btnSave.OnClick=$LB(%this,"onClickOK")
-	Set ..btnCancel=##class(%CHUI.TButton).Create(%this,"btnCancel","Annuleer",3,60,1,10,10,10,,,"C")
+	Set ..btnCancel=##class(TCHUI.TButton).Create(%this,"btnCancel","Annuleer",3,60,1,10,10,10,,,"C")
 	Set ..btnCancel.OnClick=$LB(%this,"onClickCancel")
-	Set ..lblPRNr=##class(%CHUI.TLabel).Create(%this,"lblPRNr","PRNr",2,2,1,10,2,,,$LB(,,"U"),"R")
-	Set ..lblKortTekst=##class(%CHUI.TLabel).Create(%this,"lblKortTekst","KortTekst",3,2,1,10,2,,,$LB(,,"U"),"R")
+	Set ..lblPRNr=##class(TCHUI.TLabel).Create(%this,"lblPRNr","PRNr",2,2,1,10,2,,,$LB(,,"U"),"R")
+	Set ..lblKortTekst=##class(TCHUI.TLabel).Create(%this,"lblKortTekst","KortTekst",3,2,1,10,2,,,$LB(,,"U"),"R")
 
-	Set ..txtPRNr=##class(%CHUI.TEdit).Create(%this,"txtKPRNr","",2,20,1,10,2,1,,,"C")
-	Set ..txtKortTekst=##class(%CHUI.TEdit).Create(%this,"txtKortTekst","",3,20,1,25,2,1,,,"L")
+	Set ..txtPRNr=##class(TCHUI.TEdit).Create(%this,"txtKPRNr","",2,20,1,10,2,1,,,"C")
+	Set ..txtKortTekst=##class(TCHUI.TEdit).Create(%this,"txtKortTekst","",3,20,1,25,2,1,,,"L")
  	; Control afhankelijke Definitie
 	Do ..txtPRNr.InitSpec(1128)
 	Set ..txtKortTekst.OnDisplay=$LB(%this,"txtKortTekstToDisplay")
@@ -193,20 +190,20 @@
 	Set ..Frame=##class(CHUI.Test.Frame).Create(%this,"Frame","Frame",..Height-3,3,3,..Width-6,3,1,,$LB(),"R")
  	; Lijst
 	
-	Set ..Lijst= ##class(%CHUI.TLijst).Create(%this,"Lijst","Lijst",5,2,..Height-9,58,3,3,,$LB(),"R")
+	Set ..Lijst= ##class(TCHUI.TLijst).Create(%this,"Lijst","Lijst",5,2,..Height-9,58,3,3,,$LB(),"R")
 	Set Frame=..Lijst.CreateRowDef("DEFAULT",$LB($LB("EDITDB","Qty",8,"I","#.##0",,"R"),$LB("LABEL"," "_$$$chVertBar_" ",3),$LB("EDITDB","Datum",8,"D","dd'.'mm'.'jj",,"L"),$LB("LABEL"," "_$$$chVertBar_" ",3),$LB("EDITDB","Actie",1,,,,"L"),$LB("LABEL"," "_$$$chVertBar_" ",3),$LB("EDITDB","Mag",1,,,,"L")))
 	
 	;Set Frame=##class(CHUI.Test.LijstFrame).Create(..Lijst,"LijstFrame","LijstFrame",1,1,1,58,3,3,,$LB(),"R")
 	
-	Set DataSet=##class(%CHUI.TDataSetList).Create(..Lijst,"ADO",$NA(^PRHIST(..txtPRNr.Value)),$LB($LB("Datum",,"P","\",1),$LB("Qty",,"P","\",2),$LB("Actie",,"P","\",4),$LB("Mag",,"P","\",5)))
+	Set DataSet=##class(TCHUI.TDataSetList).Create(..Lijst,"ADO",$NA(^PRHIST(..txtPRNr.Value)),$LB($LB("Datum",,"P","\",1),$LB("Qty",,"P","\",2),$LB("Actie",,"P","\",4),$LB("Mag",,"P","\",5)))
 	Do ..Lijst.InitSpec(DataSet,Frame,Frame,,,,0)
 	Set ..Lijst.Controls("NEGATIVE")=..Lijst.CreateRowDef("NEGATIVE",$LB($LB("EDITDB","Qty",8,"I","#.##0",,"R"),$LB("LABEL"," "_$$$chVertBar_" ",3),$LB("EDITDB","Datum",8,"D","dd'.'mm'.'jj",,"L"),$LB("LABEL"," "_$$$chVertBar_" ",3),$LB("EDITDB","Actie",1,,,,"L"),$LB("LABEL"," "_$$$chVertBar_" ",3),$LB("EDITDB","Mag",1,,,,"L"),$LB("LABEL","Negatief",8,,,,"L")))
 	Set ..Lijst.OnRow=$LB(%this,"OnPositive")
 
 	Do ..Lijst.MoveFirst()
 
 	; Context sensitive menu
-	Set ..Lijst.ContextMenu=##class(%CHUI.TContextMenu).Create(%this,"Context")
+	Set ..Lijst.ContextMenu=##class(TCHUI.TContextMenu).Create(%this,"Context")
 	; Menu File
 	Do ..Lijst.ContextMenu.AddItem(%this,"TestOpen","Test1",1,"O",,..acOpen)
 	Do ..Lijst.ContextMenu.AddItem(%this,,"-",1) ; separator
@@ -230,15 +227,15 @@
 <Implementation><![CDATA[
 	; Actions
 	
-	Set ..acOpen=##class(%CHUI.TAction).Create(%this,"acOpen","Open",1,$LB("O"))
-	Set ..acSluit=##class(%CHUI.TAction).Create(%this,"acSluit","Sluit",1,$LB("ALT+Z"),$LB(%this,"onClickCancel"))
-	Set ..acNieuw=##class(%CHUI.TAction).Create(%this,"acNieuw","Nieuw",1,$LB("N"))
-	Set ..acWijzig=##class(%CHUI.TAction).Create(%this,"acWijzig","Wijzig",1,$LB("W"))
-	Set ..acVerwijder=##class(%CHUI.TAction).Create(%this,"acVerwijder","Verwijder",1,$LB("V"))
-	Set ..acVerwijderAlles=##class(%CHUI.TAction).Create(%this,"acVerwijderAlles","VerwijderAlles",1,$LB("A"))
-	Set ..acRaadplegenKlant=##class(%CHUI.TAction).Create(%this,"acRaadplegenKlant","RaadplegenKlant",1,$LB("K"))
+	Set ..acOpen=##class(TCHUI.TAction).Create(%this,"acOpen","Open",1,$LB("O"))
+	Set ..acSluit=##class(TCHUI.TAction).Create(%this,"acSluit","Sluit",1,$LB("ALT+Z"),$LB(%this,"onClickCancel"))
+	Set ..acNieuw=##class(TCHUI.TAction).Create(%this,"acNieuw","Nieuw",1,$LB("N"))
+	Set ..acWijzig=##class(TCHUI.TAction).Create(%this,"acWijzig","Wijzig",1,$LB("W"))
+	Set ..acVerwijder=##class(TCHUI.TAction).Create(%this,"acVerwijder","Verwijder",1,$LB("V"))
+	Set ..acVerwijderAlles=##class(TCHUI.TAction).Create(%this,"acVerwijderAlles","VerwijderAlles",1,$LB("A"))
+	Set ..acRaadplegenKlant=##class(TCHUI.TAction).Create(%this,"acRaadplegenKlant","RaadplegenKlant",1,$LB("K"))
 	; Main
-	Set ..MainMenu=##class(%CHUI.TMainMenu).Create(%this,"Main")
+	Set ..MainMenu=##class(TCHUI.TMainMenu).Create(%this,"Main")
 	Set ..mnFile=..MainMenu.AddItem(%this,"mnFile","File",1)
 	Set ..mnEdit=..MainMenu.AddItem(%this,"mnEdit","Edit",1)
 	Set ..mnLink=..MainMenu.AddItem(%this,"mnLink","Lin$k",1)
@@ -261,14 +258,13 @@
 <Description>
 D ##class(CHUI.Test.Form).Run()</Description>
 <ClassMethod>1</ClassMethod>
-<CodeMode>code</CodeMode>
 <FormalSpec>IP</FormalSpec>
 <Implementation><![CDATA[
 	;Set %Debug=1
-	Set %Application=##class(%CHUI.TApplication).Create()
+	Set %Application=##class(TCHUI.TApplication).Create()
 	Do %Application.AttachDebugEvents()
-	Set %Screen=##class(%CHUI.TScreen).Create()
-	Set %Input=##class(%CHUI.TInput).Create()
+	Set %Screen=##class(TCHUI.TScreen).Create()
+	Set %Input=##class(TCHUI.TInput).Create()
 	Do %Screen.Clear()
 
 	Set Form=%Application.CreateForm("CHUI.Test.Form","frmMain","Titeltje",1,1,20,80,,$$$ftMain)
@@ -304,7 +300,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 %Screen.Clear()