Index: VerpakkingsDefinitie/UI/Subscherm.pas
===================================================================
diff -u -r550 -r551
--- VerpakkingsDefinitie/UI/Subscherm.pas	(.../Subscherm.pas)	(revision 550)
+++ VerpakkingsDefinitie/UI/Subscherm.pas	(.../Subscherm.pas)	(revision 551)
@@ -8,28 +8,30 @@
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ActnList,
   Vcl.ImgList, Vcl.ExtCtrls, Soap.InvokeRegistry, Soap.Rio,
   Soap.SOAPHTTPClient, Data.DB, Datasnap.DBClient, Soap.SOAPConn, Agent,
-  ApplicationContext;
+  Main, ApplicationContext;
 
 type
   TFormSubscherm = class(TForm)
   private
-    fApplicationContext: TApplicationContext;
+    FNavigator: TFormMain;
+    FApplicationContext: TApplicationContext;
+  protected
+    property Navigator: TFormMain Read FNavigator write FNavigator;
+    property ApplicationContextObj: TApplicationContext Read FApplicationContext write FApplicationContext;
   public
-    property ApplicationContext: TApplicationContext Read fApplicationContext
-      write fApplicationContext;
-
-    Constructor Create(AOwner: TComponent; var ApplicationContext: TApplicationContext); overload;
+    Constructor Create(AOwner: TComponent; Navigator: TFormMain; var ApplicationContext: TApplicationContext); overload;
   end;
 
 implementation
 
-constructor TFormSubscherm.Create(AOwner: TComponent; var ApplicationContext: TApplicationContext);
+constructor TFormSubscherm.Create(AOwner: TComponent; Navigator: TFormMain; var ApplicationContext: TApplicationContext);
 begin
   inherited Create(AOwner);
 
-  Self.ApplicationContext := ApplicationContext;
+  Self.Navigator := Navigator;
+  Self.ApplicationContextObj := ApplicationContext;
 
-  BorderStyle := bsNone; // Alle subschermen hebben geen border
+  BorderStyle := bsNone; // Subschermen hebben geen border
 end;
 
 end.