From 7d0fc1cbc9f61d480f4af2a0a75d5e64ecd22d97 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Fri, 13 Jul 2018 07:31:20 +0000
Subject: [PATCH] * Test bug #32348, change button to menu item

git-svn-id: trunk@39445 -
---
 packages/fcl-db/tests/dbguitestrunner.pas     | 23 +++++++------------
 packages/fcl-db/tests/dbtestframework_gui.lpi | 17 +++++++-------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/packages/fcl-db/tests/dbguitestrunner.pas b/packages/fcl-db/tests/dbguitestrunner.pas
index eeb426970b..9bcb853f3d 100644
--- a/packages/fcl-db/tests/dbguitestrunner.pas
+++ b/packages/fcl-db/tests/dbguitestrunner.pas
@@ -6,10 +6,7 @@ unit DBGuiTestRunner;
 interface
 
 uses
-  Classes, SysUtils,
-  Interfaces, Forms,
-  StdCtrls,
-  GuiTestRunner, inieditor;
+  Classes, SysUtils, Interfaces, Forms, StdCtrls, GuiTestRunner, Menus,inieditor;
 
 type
 
@@ -17,7 +14,7 @@ type
 
   TDBGuiTestRunnerForm=class(TGUITestRunner)
   private
-    DBEditButton: TButton;
+    MEditIni: TMenuItem;
   public
     procedure DBEditButtonClick(ASender: TObject);
     constructor Create(AOwner: TComponent); override;
@@ -50,18 +47,14 @@ end;
 
 constructor TDBGuiTestRunnerForm.Create(AOwner: TComponent);
 // Add our database.ini edit button to the existing GUI
+
 begin
   inherited Create(AOwner);
-  DBEditButton:=TButton.Create(Self);
-  DBEditButton.Top:=7;
-  DBEditButton.Left:=340; //to the left of the close button
-  DBEditButton.Height:=32;
-  DBEditButton.Width:=100;
-  DBEditButton.Caption:='Edit database.ini...';
-  DBEditButton.Hint:='Edit database selection settings (effective for next start)';
-  DBEditButton.OnClick:=@DBEditButtonClick;
-  // Set this last; now all properties take effect
-  DBEditButton.Parent:=Self.Panel1;
+  MEditIni:=TMenuItem.Create(Self);
+  MEditIni.Caption:='Edit database.ini...';
+  MEditIni.Hint:='Edit database selection settings (effective for next start)';
+  MEditIni.OnClick:=@DBEditButtonClick;
+  MenuItemEdit.Add(MEditIni);
 end;
 
 end.
diff --git a/packages/fcl-db/tests/dbtestframework_gui.lpi b/packages/fcl-db/tests/dbtestframework_gui.lpi
index 684bee4c25..856a8abfa7 100644
--- a/packages/fcl-db/tests/dbtestframework_gui.lpi
+++ b/packages/fcl-db/tests/dbtestframework_gui.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="11"/>
     <General>
       <Flags>
         <MainUnitHasCreateFormStatements Value="False"/>
@@ -15,9 +15,6 @@
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="5">
       <Item1 Name="Default" Default="True"/>
       <Item2 Name="debug">
@@ -66,7 +63,7 @@
             <CustomOptions Value="-dTEST_SQLITE3DS"/>
           </Other>
         </CompilerOptions>
-      </Item5> 
+      </Item5>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
@@ -74,9 +71,10 @@
       <ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="4">
       <Item1>
@@ -96,11 +94,12 @@
       <Unit0>
         <Filename Value="dbtestframework_gui.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="DBGuiTestRunner"/> 
+        <UnitName Value="DBGuiTestRunner"/>
       </Unit0>
       <Unit1>
         <Filename Value="dbguitestrunner.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="DBGuiTestRunner"/>
       </Unit1>
       <Unit2>
         <Filename Value="tccsvdataset.pp"/>