[Instantobjects-cvscommit] Demos/PrimerCross ContactView.pas,1.6,1.7 DemoData.pas,1.4,1.5 Main.pas,1.9,1.10 PerformanceView.pas,1.8,1.9 PrimerK3.dpr,1.3,1.4 QueryView.pas,1.4,1.5

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Demos/PrimerCross
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18385/Demos/PrimerCross

Modified Files:
	ContactView.pas DemoData.pas Main.pas PerformanceView.pas 
	PrimerK3.dpr QueryView.pas 
Log Message:
Changes for compatibility with Kylix3.

Index: QueryView.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/QueryView.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** QueryView.pas	18 Feb 2005 09:10:40 -0000	1.4
--- QueryView.pas	21 Mar 2005 16:48:04 -0000	1.5
***************
*** 6,17 ****
    SysUtils, Classes,
  {$IFDEF MSWINDOWS}
!   Windows, Messages, Graphics, Controls, Forms, Dialogs,
    Grids, DBGrids, StdCtrls, ExtCtrls, ActnList, Menus, Buttons,
  {$ENDIF}
  {$IFDEF LINUX}
!   QGraphics, QControls, QForms, QDialogs,
    QGrids, QDBGrids, QStdCtrls, QExtCtrls, QActnList, QMenus, QButtons,
  {$ENDIF}
!   BasicView, Db, InstantPresentation, Mask;
  
  type
--- 6,17 ----
    SysUtils, Classes,
  {$IFDEF MSWINDOWS}
!   Windows, Messages, Graphics, Controls, Forms, Dialogs, Mask,
    Grids, DBGrids, StdCtrls, ExtCtrls, ActnList, Menus, Buttons,
  {$ENDIF}
  {$IFDEF LINUX}
!   QGraphics, QControls, QForms, QDialogs, QMask,
    QGrids, QDBGrids, QStdCtrls, QExtCtrls, QActnList, QMenus, QButtons,
  {$ENDIF}
!   BasicView, Db, InstantPresentation;
  
  type

Index: PerformanceView.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PerformanceView.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PerformanceView.pas	22 Feb 2005 10:40:28 -0000	1.8
--- PerformanceView.pas	21 Mar 2005 16:48:04 -0000	1.9
***************
*** 13,25 ****
  {$IFDEF MSWINDOWS}
    Windows, Messages, Graphics, Controls, Forms, Dialogs, ToolWin, Menus,
!   ExtCtrls, StdCtrls, Contnrs, ComCtrls, TeEngine,
  {$ENDIF}
  {$IFDEF LINUX}
    QGraphics, QControls, QForms, QDialogs, QMenus,
!   QExtCtrls, QStdCtrls, QComCtrls, QTypes,
  {$ENDIF}
    Series, TeeProcs, Chart,
!   InstantPersistence, InstantPresentation, InstantClasses, Stopwatch, DB, BasicView,
!   Mask;
  
  type
--- 13,24 ----
  {$IFDEF MSWINDOWS}
    Windows, Messages, Graphics, Controls, Forms, Dialogs, ToolWin, Menus,
!   ExtCtrls, StdCtrls, Contnrs, ComCtrls, TeEngine, Mask,
  {$ENDIF}
  {$IFDEF LINUX}
    QGraphics, QControls, QForms, QDialogs, QMenus,
!   QExtCtrls, QStdCtrls, QComCtrls, QTypes, QMask,
  {$ENDIF}
    Series, TeeProcs, Chart,
!   InstantPersistence, InstantPresentation, InstantClasses, Stopwatch, DB, BasicView;
  
  type

Index: PrimerK3.dpr
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PrimerK3.dpr,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PrimerK3.dpr	7 Dec 2004 08:55:53 -0000	1.3
--- PrimerK3.dpr	21 Mar 2005 16:48:04 -0000	1.4
***************
*** 1,5 ****
  (*
   *   InstantObjects
!  *   Primer Demo for Kylix 3
   *
   *)
--- 1,5 ----
  (*
   *   InstantObjects
!  *   Primer Demo for Kylix 3 with internal storage Model
   *
   *)
***************
*** 26,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 ***** *)
  
--- 26,30 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta
   * ***** END LICENSE BLOCK ***** *)
  

Index: Main.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Main.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Main.pas	22 Feb 2005 14:56:26 -0000	1.9
--- Main.pas	21 Mar 2005 16:48:04 -0000	1.10
***************
*** 493,497 ****
  begin
    Disconnect;
!   FActiveSubView.FormHide(FActiveSubView);  
  end;
  
--- 493,498 ----
  begin
    Disconnect;
!   if FActiveSubView <> nil then
!     FActiveSubView.FormHide(FActiveSubView);
  end;
  

Index: DemoData.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/DemoData.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DemoData.pas	7 Dec 2004 08:45:33 -0000	1.4
--- DemoData.pas	21 Mar 2005 16:48:03 -0000	1.5
***************
*** 16,20 ****
    SysUtils,
  {$IFDEF MSWINDOWS}
!   Windows, Dialogs,
  {$ENDIF}
  {$IFDEF LINUX}
--- 16,20 ----
    SysUtils,
  {$IFDEF MSWINDOWS}
!   Windows,
  {$ENDIF}
  {$IFDEF LINUX}

Index: ContactView.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/ContactView.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ContactView.pas	10 Feb 2005 23:06:18 -0000	1.6
--- ContactView.pas	21 Mar 2005 16:48:03 -0000	1.7
***************
*** 19,23 ****
    QGraphics, QControls, QForms, QDialogs, QTypes,
    QComCtrls, QGrids, QDBGrids, QExtCtrls, QButtons,
!   QStdCtrls, QActnList, QImgList, QMenus,
  {$ENDIF}
    BasicView, Model, InstantPresentation, InstantExplorer;
--- 19,23 ----
    QGraphics, QControls, QForms, QDialogs, QTypes,
    QComCtrls, QGrids, QDBGrids, QExtCtrls, QButtons,
!   QStdCtrls, QActnList, QImgList, QMenus, Types,
  {$ENDIF}
    BasicView, Model, InstantPresentation, InstantExplorer;