From: Carlo B. <car...@us...> - 2005-02-10 23:07:23
|
Update of /cvsroot/instantobjects/Source/Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv436/Source/Core Modified Files: InstantClasses.pas InstantConnectionManager.dfm InstantConnectionManager.pas InstantDefines.inc InstantImageUtils.pas InstantPresentation.pas Removed Files: iorun50.dpk Log Message: Porting to Delphi 5 Index: InstantConnectionManager.dfm =================================================================== RCS file: /cvsroot/instantobjects/Source/Core/InstantConnectionManager.dfm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** InstantConnectionManager.dfm 5 Aug 2004 12:27:43 -0000 1.5 --- InstantConnectionManager.dfm 10 Feb 2005 23:06:28 -0000 1.6 *************** *** 2,6 **** Left = 327 Top = 305 ! Width = 393 Height = 281 BorderIcons = [biSystemMenu] --- 2,6 ---- Left = 327 Top = 305 ! Width = 350 Height = 281 BorderIcons = [biSystemMenu] *************** *** 33,37 **** Left = 0 Top = 0 ! Width = 385 Height = 215 Align = alClient --- 33,37 ---- Left = 0 Top = 0 ! Width = 342 Height = 215 Align = alClient *************** *** 44,51 **** Caption = 'Type' Width = 80 - end - item - Caption = 'Blob format' - Width = 80 end> PopupMenu = ConnectionMenu --- 44,47 ---- *************** *** 57,61 **** Left = 0 Top = 215 ! Width = 385 Height = 32 Align = alBottom --- 53,57 ---- Left = 0 Top = 215 ! Width = 342 Height = 32 Align = alBottom *************** *** 70,74 **** end object ButtonsPanel: TPanel ! Left = 223 Top = 1 Width = 161 --- 66,70 ---- end object ButtonsPanel: TPanel ! Left = 180 Top = 1 Width = 161 --- iorun50.dpk DELETED --- Index: InstantConnectionManager.pas =================================================================== RCS file: /cvsroot/instantobjects/Source/Core/InstantConnectionManager.pas,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** InstantConnectionManager.pas 7 Dec 2004 08:52:44 -0000 1.8 --- InstantConnectionManager.pas 10 Feb 2005 23:06:28 -0000 1.9 *************** *** 484,488 **** ConnectionView.Columns[0].Width := 225; ConnectionView.Columns[1].Width := 80; - ConnectionView.Columns[2].Width := 80; UpdateMenu; end; --- 484,487 ---- Index: InstantImageUtils.pas =================================================================== RCS file: /cvsroot/instantobjects/Source/Core/InstantImageUtils.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InstantImageUtils.pas 4 Aug 2004 22:43:39 -0000 1.3 --- InstantImageUtils.pas 10 Feb 2005 23:06:28 -0000 1.4 *************** *** 30,33 **** --- 30,35 ---- interface + {$I InstantDefines.inc} + uses SysUtils, Index: InstantDefines.inc =================================================================== RCS file: /cvsroot/instantobjects/Source/Core/InstantDefines.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InstantDefines.inc 2 Feb 2004 20:52:15 -0000 1.1 --- InstantDefines.inc 10 Feb 2005 23:06:28 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- {$IFDEF VER130} {$DEFINE D5} + {$DEFINE MSWINDOWS} {$ENDIF} Index: InstantPresentation.pas =================================================================== RCS file: /cvsroot/instantobjects/Source/Core/InstantPresentation.pas,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** InstantPresentation.pas 19 Oct 2004 07:46:38 -0000 1.8 --- InstantPresentation.pas 10 Feb 2005 23:06:29 -0000 1.9 *************** *** 648,654 **** QControls, QMask, QForms, {$ENDIF} ! {$IFDEF D6+}Variants, MaskUtils,{$ENDIF} InstantClasses, InstantConsts, InstantRtti, InstantDesignHook, InstantAccessors, ! DbConsts, FmtBcd; const --- 648,654 ---- QControls, QMask, QForms, {$ENDIF} ! {$IFDEF D6+}Variants, MaskUtils, FmtBcd,{$ENDIF} InstantClasses, InstantConsts, InstantRtti, InstantDesignHook, InstantAccessors, ! DbConsts; const *************** *** 2745,2748 **** --- 2745,2750 ---- FNewObject := AddNewObject(ActiveBuffer, GetBookmarkFlag(ActiveBuffer) = bfEOF); + if (FNewObject is TInstantObject) and (TInstantObject(FNewObject).RefCount > 1) then + TInstantObject(FNewObject).Release; end; Index: InstantClasses.pas =================================================================== RCS file: /cvsroot/instantobjects/Source/Core/InstantClasses.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InstantClasses.pas 29 Jul 2004 20:43:14 -0000 1.3 --- InstantClasses.pas 10 Feb 2005 23:06:28 -0000 1.4 *************** *** 44,47 **** --- 44,48 ---- uses + {$IFDEF D5}Windows,{$ENDIF} Classes, InstantConsts, SysUtils; *************** *** 373,376 **** --- 374,381 ---- 'XML format'); + {$IFDEF D5} + sLineBreak = #13#10; + {$ENDIF} + function InstantBuildEndTag(const TagName: string): string; function InstantBuildStartTag(const TagName: string): string; *************** *** 406,410 **** ExceptObject: TObject; {$IFDEF MSWINDOWS} ! ExceptionRecord: PExceptionRecord platform; {$ENDIF} {$IFDEF LINUX} --- 411,415 ---- ExceptObject: TObject; {$IFDEF MSWINDOWS} ! ExceptionRecord: PExceptionRecord {$IFNDEF VER130}platform{$ENDIF}; {$ENDIF} {$IFDEF LINUX} |