diff --git a/components/jujiboutils/changes.txt b/components/jujiboutils/changes.txt
index ddfa62113..648ee65ac 100644
--- a/components/jujiboutils/changes.txt
+++ b/components/jujiboutils/changes.txt
@@ -5,4 +5,5 @@ JUJIBOUTILS
 
 Version pre-1.0
 --------------------------------------------------
+2011-09-14  Add Non Database input controls example
 2011-09-13  Initial commit to lazarus-ccr
diff --git a/components/jujiboutils/examples/testmemdataset/jdbutils.pas b/components/jujiboutils/examples/testmemdataset/jdbutils.pas
index 324562790..650abc4f1 100644
--- a/components/jujiboutils/examples/testmemdataset/jdbutils.pas
+++ b/components/jujiboutils/examples/testmemdataset/jdbutils.pas
@@ -34,7 +34,6 @@ type
     theValue: currency;
     fDecimales: integer;
     function getDecimales: integer;
-    procedure myEditOnEnter(Sender: TObject);
     procedure myEditOnEditingDone(Sender: TObject);
     procedure setDecimales(const AValue: integer);
     procedure OnKeyPress(Sender: TObject; var key: char);
@@ -96,11 +95,6 @@ begin
   Result := fDecimales;
 end;
 
-procedure TJDBCurrencyCtrl.myEditOnEnter(Sender: TObject);
-begin
-
-end;
-
 procedure TJDBCurrencyCtrl.myEditOnEditingDone(Sender: TObject);
 var
   bufCaption: string;
@@ -159,11 +153,19 @@ end;
 procedure TJDBCurrencyCtrl.Enter(widget: TDBEdit);
 begin
   myEdit := widget;
-  myEdit.OnEditingDone := @myEditOnEditingDone;
-  myEdit.OnKeyPress := @OnKeyPress;
-  fDecimales := 2; // default 2 decimals
-  theValue := myEdit.Field.AsCurrency;
-  myEdit.SelectAll;
+  if myEdit.DataSource.DataSet.Active then
+  begin
+    myEdit.OnEditingDone := @myEditOnEditingDone;
+    myEdit.OnKeyPress := @OnKeyPress;
+    fDecimales := 2; // default 2 decimals
+    theValue := myEdit.Field.AsCurrency;
+    myEdit.SelectAll;
+  end
+  else
+  begin
+    myEdit.OnEditingDone := nil;
+    myEdit.OnKeyPress := nil;
+  end;
 end;
 
 
@@ -204,10 +206,18 @@ end;
 procedure TJDBIntegerCtrl.Enter(widget: TDBEdit);
 begin
   myEdit := widget;
-  myEdit.OnEditingDone := @myEditOnEditingDone;
-  myEdit.OnKeyPress := @OnKeyPress;
-  theValue := myEdit.Field.AsInteger;
-  myEdit.SelectAll;
+  if myEdit.DataSource.DataSet.Active then
+  begin
+    myEdit.OnEditingDone := @myEditOnEditingDone;
+    myEdit.OnKeyPress := @OnKeyPress;
+    theValue := myEdit.Field.AsInteger;
+    myEdit.SelectAll;
+  end
+  else
+  begin
+    myEdit.OnEditingDone := nil;
+    myEdit.OnKeyPress := nil;
+  end;
 end;
 
 { TJDBDateCtrl }
@@ -274,11 +284,19 @@ end;
 procedure TJDBDateCtrl.Enter(widget: TDBEdit);
 begin
   myEdit := widget;
-  myEdit.OnEditingDone := @myEditOnEditingDone;
-  myEdit.OnKeyPress := @OnKeyPress;
-  format := 'dd/mm/yyyy';
-  theValue := myEdit.Field.AsDateTime;
-  myEdit.SelectAll;
+  if myEdit.DataSource.DataSet.Active then
+  begin
+    myEdit.OnEditingDone := @myEditOnEditingDone;
+    myEdit.OnKeyPress := @OnKeyPress;
+    format := ShortDateFormat;
+    theValue := myEdit.Field.AsDateTime;
+    myEdit.SelectAll;
+  end
+  else
+  begin
+    myEdit.OnEditingDone := nil;
+    myEdit.OnKeyPress := nil;
+  end;
 end;
 
 procedure CreateResources;
diff --git a/components/jujiboutils/examples/testmemdataset/testmemdataset.lpi b/components/jujiboutils/examples/testmemdataset/testmemdataset.lpi
index 3dac0882e..4db34c344 100644
--- a/components/jujiboutils/examples/testmemdataset/testmemdataset.lpi
+++ b/components/jujiboutils/examples/testmemdataset/testmemdataset.lpi
@@ -6,7 +6,6 @@
       <MainUnit Value="0"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
-      <Icon Value="0"/>
     </General>
     <i18n>
       <EnableI18N LFM="False"/>