[JVCL-Checkins] CVS: jvcl/source JvConst.pas,1.6,1.7 JvDBUtils.pas,1.9,1.10

[Peter T. <pe...@us...>]

Update of /cvsroot/jvcl/jvcl/source
In directory sc8-pr-cvs1:/tmp/cvs-serv31252/source

Modified Files:
	JvConst.pas JvDBUtils.pas 
Log Message:
Fixes for BCB5 (Ben Hayes)

Index: JvConst.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvConst.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JvConst.pas	18 Feb 2003 15:48:03 -0000	1.6
--- JvConst.pas	26 Feb 2003 00:44:50 -0000	1.7
***************
*** 74,80 ****
--- 74,86 ----
    SDelphiKey = 'Software\Borland\Delphi\5.0';
    {$ENDIF}
+   {$IFDEF BCB5}
+   SDelphiKey = 'Software\Borland\C++Builder\5.0';
+   {$ENDIF}
    {$IFDEF DELPHI6}
    SDelphiKey = 'Software\Borland\Delphi\6.0';
    {$ENDIF}
+   {$IFDEF BCB6}
+   SDelphiKey = 'Software\Borland\C++Builder\6.0';
+   {$ENDIF}
    {$IFDEF DELPHI7}
    SDelphiKey = 'Software\Borland\Delphi\7.0';
***************
*** 84,99 ****
  
  uses
-   {$IFDEF WIN32}
    Windows,
-   {$ELSE}
-   WinProcs,
-   {$ENDIF}
    Forms;
  
! {$IFDEF WIN32}
!  {$R *.Res}
! {$ELSE}
!  {$R *.R16}
! {$ENDIF}
  
  initialization
--- 90,97 ----
  
  uses
    Windows,
    Forms;
  
! {$R *.Res}
  
  initialization

Index: JvDBUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvDBUtils.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** JvDBUtils.pas	25 Feb 2003 08:10:15 -0000	1.9
--- JvDBUtils.pas	26 Feb 2003 00:44:50 -0000	1.10
***************
*** 129,139 ****
  const
    ServerDateFmt: string[50] = sdfStandard16;
-   ftBlobTypes = [Low(TBlobType)..High(TBlobType)];
-   {$IFDEF COMPILER35_UP}
-   {$NODEFINE ftBlobTypes}
-   {$ENDIF}
  
    {$IFDEF BCB3_UP} { C++ Builder 3 or higher }
!   {$NODEFINE ftNonTextTypes}
    (*$HPPEMIT 'namespace JvDBUtils'*)
    (*$HPPEMIT '{'*)
--- 129,135 ----
  const
    ServerDateFmt: string[50] = sdfStandard16;
  
    {$IFDEF BCB3_UP} { C++ Builder 3 or higher }
!   {.$NODEFINE ftNonTextTypes}
    (*$HPPEMIT 'namespace JvDBUtils'*)
    (*$HPPEMIT '{'*)
***************
*** 467,472 ****
          end;
        finally
!         if not Result {$IFDEF COMPILER3_UP} and
!         DataSet.BookmarkValid(PChar(Bookmark)) {$ENDIF} then
            DataSet.Bookmark := Bookmark;
        end;
--- 463,467 ----
          end;
        finally
!         if not Result and DataSet.BookmarkValid(PChar(Bookmark)) then
            DataSet.Bookmark := Bookmark;
        end;