3 files changed, 28 insertions, 21 deletions
diff --git a/examples/gui/dbtest/dbtest.lpi b/examples/gui/dbtest/dbtest.lpi
index 9bab5c05..847b0588 100644
--- a/examples/gui/dbtest/dbtest.lpi
+++ b/examples/gui/dbtest/dbtest.lpi
@@ -30,8 +30,7 @@
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
-        <PackageName Value="fpgui_package"/>
-        <MinVersion Minor="5" Release="1" Valid="True"/>
+        <PackageName Value="fpgui_toolkit"/>
       </Item1>
     </RequiredPackages>
     <Units Count="2">
@@ -59,7 +58,8 @@
       <Generate Value="Faster"/>
     </CodeGeneration>
     <Other>
-      <CustomOptions Value="-FUunits"/>
+      <CustomOptions Value="-FUunits
+"/>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
diff --git a/examples/gui/dbtest/dbtest.lpr b/examples/gui/dbtest/dbtest.lpr
index 28d2bd2b..3a30a10a 100644
--- a/examples/gui/dbtest/dbtest.lpr
+++ b/examples/gui/dbtest/dbtest.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frm_main;
+  Classes, fpgfx, frm_main, fpgui_toolkit;
 
 
 procedure MainProc;
diff --git a/examples/gui/dbtest/frm_main.pas b/examples/gui/dbtest/frm_main.pas
index 83b25f7e..b361ff92 100644
--- a/examples/gui/dbtest/frm_main.pas
+++ b/examples/gui/dbtest/frm_main.pas
@@ -22,6 +22,7 @@ type
     procedure   btnLastClick(Sender: TObject);
     procedure   ButtonEnter(Sender: TObject);
     procedure   ButtonExit(Sender: TObject);
+    procedure   FormShow(Sender: TObject);
   public
     {@VFD_HEAD_BEGIN: MainForm}
     btnQuit: TfpgButton;
@@ -85,10 +86,31 @@ begin
   lblStatusBar.Text := '';
 end;
 
-constructor TMainForm.Create(AOwner: TComponent);
+procedure TMainForm.FormShow(Sender: TObject);
 var
   x: Integer;
   s: string;
+begin
+  dblblName.DataSource    := DataSource;
+  dblblName.DataField     := 'Name';
+  dblblEMail.DataSource   := DataSource;
+  dblblEMail.DataField    := 'Address';
+
+  DataSet.Open;
+  while not DataSet.EOF do
+  begin
+    SetLength(s, 0);
+    for x := 0 to DataSet.FieldCount - 2 do
+      s := s + DataSet.Fields[x].AsString + ', ';
+    s := s + DataSet.Fields[DataSet.FieldCount - 1].AsString;
+    lstName1.Items.Add(s);
+    DataSet.Next;
+  end;
+  DataSet.First;
+end;
+
+constructor TMainForm.Create(AOwner: TComponent);
+//var
 //  fields: TDbfFieldDefs;
 begin
   inherited Create(AOwner);
@@ -113,22 +135,7 @@ begin
   DataSource          := TDataSource.Create(Self);
   DataSource.DataSet  := DataSet;
 
-  dblblName.DataSource    := DataSource;
-  dblblName.DataField     := 'Name';
-  dblblEMail.DataSource   := DataSource;
-  dblblEMail.DataField    := 'Address';
-
-  DataSet.Open;
-  while not DataSet.EOF do
-  begin
-    SetLength(s, 0);
-    for x := 0 to DataSet.FieldCount - 2 do
-      s := s + DataSet.Fields[x].AsString + ', ';
-    s := s + DataSet.Fields[DataSet.FieldCount - 1].AsString;
-    lstName1.Items.Add(s);
-    DataSet.Next;
-  end;
-  DataSet.First;
+  OnShow :=@FormShow;
 end;
 
 destructor TMainForm.Destroy;