Update of /cvsroot/instantobjects/Demos/PrimerCross In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv436/Demos/PrimerCross Modified Files: BasicBrowse.pas BasicEdit.pas BasicView.pas CompanyEdit.pas ContactEdit.pas ContactFilterEdit.pas ContactSort.pas ContactView.pas DemoDataRequest.pas Main.pas MainData.pas PerformanceView.pas PersonEdit.pas Primer.dpr Primer.xml PrimerExternal.dpr PrimerExternal.xml QueryView.pas Stopwatch.pas Utility.pas Welcome.pas Log Message: Porting to Delphi 5 Index: QueryView.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/QueryView.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** QueryView.pas 29 Jul 2004 20:43:10 -0000 1.2 --- QueryView.pas 10 Feb 2005 23:06:20 -0000 1.3 *************** *** 2,6 **** interface ! uses SysUtils, Classes, --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} uses SysUtils, Classes, Index: PerformanceView.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PerformanceView.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PerformanceView.pas 10 Feb 2005 13:04:25 -0000 1.6 --- PerformanceView.pas 10 Feb 2005 23:06:19 -0000 1.7 *************** *** 2,6 **** interface ! {$IFDEF VER150} {$WARN UNSAFE_TYPE OFF} --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} {$IFDEF VER150} {$WARN UNSAFE_TYPE OFF} Index: Stopwatch.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Stopwatch.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Stopwatch.pas 20 Jul 2004 11:05:15 -0000 1.1 --- Stopwatch.pas 10 Feb 2005 23:06:21 -0000 1.2 *************** *** 3,6 **** --- 3,8 ---- interface + {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} + uses SysUtils, Index: ContactSort.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/ContactSort.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ContactSort.pas 7 Dec 2004 08:45:33 -0000 1.3 --- ContactSort.pas 10 Feb 2005 23:06:18 -0000 1.4 *************** *** 2,6 **** interface ! uses SysUtils, Classes, --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} uses SysUtils, Classes, Index: BasicBrowse.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/BasicBrowse.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BasicBrowse.pas 4 Aug 2004 22:43:38 -0000 1.3 --- BasicBrowse.pas 10 Feb 2005 23:06:16 -0000 1.4 *************** *** 2,6 **** interface ! uses SysUtils, Classes, DB, --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} uses SysUtils, Classes, DB, *************** *** 10,17 **** {$ENDIF} {$IFDEF LINUX} ! Qt, QGraphics, QControls, QForms, QDialogs, QStdCtrls, QGrids, QDBGrids, QExtCtrls, QComCtrls, QImgList, QMenus, QActnList, {$ENDIF} ! InstantPresentation, QTypes; const --- 10,17 ---- {$ENDIF} {$IFDEF LINUX} ! Qt, QGraphics, QControls, QForms, QDialogs, QStdCtrls, QTypes, QGrids, QDBGrids, QExtCtrls, QComCtrls, QImgList, QMenus, QActnList, {$ENDIF} ! InstantPresentation; const Index: ContactFilterEdit.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/ContactFilterEdit.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ContactFilterEdit.pas 7 Dec 2004 08:45:33 -0000 1.3 --- ContactFilterEdit.pas 10 Feb 2005 23:06:18 -0000 1.4 *************** *** 2,6 **** interface ! uses SysUtils, Classes, --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} uses SysUtils, Classes, Index: CompanyEdit.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/CompanyEdit.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CompanyEdit.pas 7 Dec 2004 08:45:33 -0000 1.5 --- CompanyEdit.pas 10 Feb 2005 23:06:18 -0000 1.6 *************** *** 2,6 **** interface ! uses SysUtils, Classes, --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} uses SysUtils, Classes, Index: ContactEdit.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/ContactEdit.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ContactEdit.pas 7 Dec 2004 08:45:33 -0000 1.3 --- ContactEdit.pas 10 Feb 2005 23:06:18 -0000 1.4 *************** *** 2,6 **** interface ! uses SysUtils, Classes, --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} uses SysUtils, Classes, Index: ContactView.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/ContactView.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ContactView.pas 7 Dec 2004 08:45:33 -0000 1.5 --- ContactView.pas 10 Feb 2005 23:06:18 -0000 1.6 *************** *** 2,6 **** interface ! {$IFDEF VER150} {$WARN UNSAFE_TYPE OFF} --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} {$IFDEF VER150} {$WARN UNSAFE_TYPE OFF} *************** *** 10,14 **** uses ! SysUtils, Classes, DB, Types, {$IFDEF MSWINDOWS} Windows, Messages, Graphics, Controls, Forms, Dialogs, --- 10,14 ---- uses ! SysUtils, Classes, DB, {$IFDEF MSWINDOWS} Windows, Messages, Graphics, Controls, Forms, Dialogs, Index: PrimerExternal.xml =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PrimerExternal.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PrimerExternal.xml 10 Feb 2005 13:04:33 -0000 1.1 --- PrimerExternal.xml 10 Feb 2005 23:06:19 -0000 1.2 *************** *** 1,12 **** ! <TInstantConnectionDefs> ! <TInstantIBXConnectionDef> ! <Name>FirebirdDBExternal</Name> ! <IsBuilt>TRUE</IsBuilt> ! <LoginPrompt>FALSE</LoginPrompt> ! <Path>.\FirebirdDB\PRIMERDBEXTERNAL.FDB</Path> ! <NetType>ntLocal</NetType> ! <Options>ibxUseDelimitedIdents</Options> ! <Params>User_Name=SYSDBA ! Password=masterkey</Params> ! </TInstantIBXConnectionDef> ! </TInstantConnectionDefs> --- 1,2 ---- ! <TInstantConnectionDefs><TInstantIBXConnectionDef><Name>FirebirdDBExternal</Name><IsBuilt>TRUE</IsBuilt><LoginPrompt>FALSE</LoginPrompt><Path>.\FirebirdDB\PRIMERDBEXTERNAL.FDB</Path><NetType>ntLocal</NetType><Options>ibxUseDelimitedIdents</Options><Params>User_Name=SYSDBA ! Password=masterkey</Params></TInstantIBXConnectionDef></TInstantConnectionDefs> Index: Utility.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Utility.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Utility.pas 20 Jul 2004 11:05:15 -0000 1.1 --- Utility.pas 10 Feb 2005 23:06:21 -0000 1.2 *************** *** 2,6 **** interface ! procedure BeginBusy; procedure EndBusy; --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} procedure BeginBusy; procedure EndBusy; Index: Primer.dpr =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Primer.dpr,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Primer.dpr 10 Feb 2005 13:04:33 -0000 1.5 --- Primer.dpr 10 Feb 2005 23:06:19 -0000 1.6 *************** *** 28,37 **** * Contributor(s): * Carlo Barazzetta: ! * - cross-platform porting for Delphi & Kilix * - PerformanceView form changed to make tests with UsePreparedQuery * - PerformanceView form changed to make tests with Statement Cache * - PerformanceView form changed to make tests of Queries ! * Salary attribute of type Currency added to Person ! * PersonEdit form and random data form changed to test Graphic support * ***** END LICENSE BLOCK ***** *) --- 28,37 ---- * Contributor(s): * Carlo Barazzetta: ! * - cross-platform porting for Delphi 5,6,7 & Kilix * - PerformanceView form changed to make tests with UsePreparedQuery * - PerformanceView form changed to make tests with Statement Cache * - PerformanceView form changed to make tests of Queries ! * - Salary attribute of type Currency added to Person ! * - PersonEdit form and random data form changed to test Graphic support * ***** END LICENSE BLOCK ***** *) Index: MainData.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/MainData.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MainData.pas 7 Dec 2004 08:45:33 -0000 1.3 --- MainData.pas 10 Feb 2005 23:06:19 -0000 1.4 *************** *** 2,6 **** interface ! uses SysUtils, Classes, --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} uses SysUtils, Classes, Index: PrimerExternal.dpr =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PrimerExternal.dpr,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PrimerExternal.dpr 7 Dec 2004 08:45:33 -0000 1.2 --- PrimerExternal.dpr 10 Feb 2005 23:06:19 -0000 1.3 *************** *** 27,34 **** * Contributor(s): * Carlo Barazzetta: ! * - cross-platform porting for Delphi & Kilix * - PerformanceView form changed to make tests with UsePreparedQuery ! * Salary attribute of type Currency added to Person ! * PersonEdit form and random data form changed to test Graphic support * ***** END LICENSE BLOCK ***** *) --- 27,36 ---- * Contributor(s): * Carlo Barazzetta: ! * - cross-platform porting for Delphi 5,6,7 & Kilix * - PerformanceView form changed to make tests with UsePreparedQuery ! * - PerformanceView form changed to make tests with Statement Cache ! * - PerformanceView form changed to make tests of Queries ! * - Salary attribute of type Currency added to Person ! * - PersonEdit form and random data form changed to test Graphic support * ***** END LICENSE BLOCK ***** *) Index: Main.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Main.pas,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Main.pas 10 Feb 2005 12:55:08 -0000 1.7 --- Main.pas 10 Feb 2005 23:06:18 -0000 1.8 *************** *** 2,6 **** interface ! {$IFDEF VER150} {$WARN UNSAFE_TYPE OFF} --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} {$IFDEF VER150} {$WARN UNSAFE_TYPE OFF} *************** *** 16,24 **** {$ENDIF} {$IFDEF LINUX} ! QGraphics, QControls, QForms, QDialogs, QStdCtrls, QMenus, QExtCtrls, QComCtrls, QGrids, QDBGrids, QImgList, QActnList, {$ENDIF} ! InstantPersistence, BasicView, Stopwatch, InstantConnectionManager, ! QTypes; type --- 16,23 ---- {$ENDIF} {$IFDEF LINUX} ! QGraphics, QControls, QForms, QDialogs, QStdCtrls,QTypes, QMenus, QExtCtrls, QComCtrls, QGrids, QDBGrids, QImgList, QActnList, {$ENDIF} ! InstantPersistence, BasicView, Stopwatch, InstantConnectionManager; type Index: DemoDataRequest.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/DemoDataRequest.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DemoDataRequest.pas 29 Jul 2004 20:43:09 -0000 1.2 --- DemoDataRequest.pas 10 Feb 2005 23:06:18 -0000 1.3 *************** *** 2,6 **** interface ! uses SysUtils, --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} uses SysUtils, Index: Welcome.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Welcome.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Welcome.pas 7 Dec 2004 08:45:34 -0000 1.2 --- Welcome.pas 10 Feb 2005 23:06:21 -0000 1.3 *************** *** 2,6 **** interface ! {$IFDEF VER150} {$WARN UNSAFE_TYPE OFF} --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} {$IFDEF VER150} {$WARN UNSAFE_TYPE OFF} Index: Primer.xml =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Primer.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Primer.xml 10 Feb 2005 13:04:33 -0000 1.1 --- Primer.xml 10 Feb 2005 23:06:19 -0000 1.2 *************** *** 1,24 **** ! <TInstantConnectionDefs> ! <TInstantBDEConnectionDef> ! <Name>ParadoxDB</Name> ! <IsBuilt>TRUE</IsBuilt> ! <BlobStreamFormat>sfXML</BlobStreamFormat> ! <LoginPrompt>FALSE</LoginPrompt> ! <DriverName>STANDARD</DriverName> ! <Parameters>PATH=.\ParadoxDB DEFAULT DRIVER=PARADOX ENABLE BCD=TRUE ! </Parameters> ! </TInstantBDEConnectionDef> ! <TInstantIBXConnectionDef> ! <Name>FirebirdDB</Name> ! <IsBuilt>TRUE</IsBuilt> ! <BlobStreamFormat>sfXML</BlobStreamFormat> ! <LoginPrompt>FALSE</LoginPrompt> ! <Path>.\FirebirdDB\PRIMERDB.FDB</Path> ! <NetType>ntLocal</NetType> ! <Options>ibxUseDelimitedIdents</Options> ! <Params>User_Name=SYSDBA ! Password=masterkey</Params> ! </TInstantIBXConnectionDef> ! </TInstantConnectionDefs> --- 1,5 ---- ! <TInstantConnectionDefs><TInstantBDEConnectionDef><Name>ParadoxDB</Name><IsBuilt>TRUE</IsBuilt><BlobStreamFormat>sfXML</BlobStreamFormat><LoginPrompt>FALSE</LoginPrompt><DriverName>STANDARD</DriverName><Parameters>PATH=.\ParadoxDB DEFAULT DRIVER=PARADOX ENABLE BCD=TRUE ! </Parameters></TInstantBDEConnectionDef><TInstantIBXConnectionDef><Name>FirebirdDB</Name><IsBuilt>TRUE</IsBuilt><BlobStreamFormat>sfXML</BlobStreamFormat><LoginPrompt>FALSE</LoginPrompt><Path>.\FirebirdDB\PRIMERDB.FDB</Path><NetType>ntLocal</NetType><Options>ibxUseDelimitedIdents</Options><Params>User_Name=SYSDBA ! Password=masterkey</Params></TInstantIBXConnectionDef></TInstantConnectionDefs> Index: PersonEdit.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PersonEdit.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PersonEdit.pas 7 Dec 2004 08:45:33 -0000 1.6 --- PersonEdit.pas 10 Feb 2005 23:06:19 -0000 1.7 *************** *** 2,6 **** interface ! uses SysUtils, Classes, --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} uses SysUtils, Classes, *************** *** 172,176 **** --- 172,178 ---- {$IFDEF MSWINDOWS} LoadMultipleImages(EmployerToolImages,'PERSONEMPLOYERTOOLIMAGES',HInstance); + {$IFNDEF VER130} PictureImage.Proportional := True; + {$ENDIF} {$ENDIF} {$IFDEF LINUX} Index: BasicView.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/BasicView.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BasicView.pas 10 Feb 2005 13:04:25 -0000 1.3 --- BasicView.pas 10 Feb 2005 23:06:17 -0000 1.4 *************** *** 3,6 **** --- 3,8 ---- interface + {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} + uses SysUtils, Classes, Index: BasicEdit.pas =================================================================== RCS file: /cvsroot/instantobjects/Demos/PrimerCross/BasicEdit.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BasicEdit.pas 20 Jul 2004 11:05:15 -0000 1.1 --- BasicEdit.pas 10 Feb 2005 23:06:17 -0000 1.2 *************** *** 2,6 **** interface ! uses SysUtils, Classes, DB, --- 2,6 ---- interface ! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF} uses SysUtils, Classes, DB, |