Menu
▾
▴
[JVCL-Checkins] CVS: dev/JVCL3/archive JvBDEReg.pas,1.1,1.2 JvBlinkingLED.pas,1.2,1.3 JvCtlConst.pas,1.1,1.2 JvCtlReg.pas,1.1,1.2 JvIReg.pas,1.1,1.2 JvInterpreter_JvRegAuto.pas,1.1,1.2 JvRegAuto.pas,1.1,1.2 JvRegAutoEditorForm.pas,1.1,1.2 JvStrUtil.pas,1.1,1.2 JvStrUtils.pas,1.1,1.2 JvUtils.pas,1.1,1.2 JvVCLUtils.pas,1.1,1.2 JvaCtlReg.pas,1.1,1.2 JvaDBReg.pas,1.1,1.2 - JEDI.INC IFDEFs applied to all files
|
From: Robert M. <mar...@us...> - 2003-11-23 07:55:47
|
Update of /cvsroot/jvcl/dev/JVCL3/archive
In directory sc8-pr-cvs1:/tmp/cvs-serv18560/JVCL3/archive
Modified Files:
JvBDEReg.pas JvBlinkingLED.pas JvCtlConst.pas JvCtlReg.pas
JvIReg.pas JvInterpreter_JvRegAuto.pas JvRegAuto.pas
JvRegAutoEditorForm.pas JvStrUtil.pas JvStrUtils.pas
JvUtils.pas JvVCLUtils.pas JvaCtlReg.pas JvaDBReg.pas
Log Message:
JEDI.INC IFDEFs applied to all files
Index: JvBDEReg.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvBDEReg.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvBDEReg.pas 22 Jun 2003 06:33:52 -0000 1.1
--- JvBDEReg.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 83,92 ****
RegisterComponents(srJvDataAccessPalette, [TJvBDEItems, TJvDatabaseItems,
TJvTableItems]);
! {$IFNDEF CBUILDER}
{$IFDEF USE_OLD_DBLISTS}
RegisterComponents(srJvDataAccessPalette, [TJvDatabaseList, TJvLangDrivList,
TJvTableList, TJvStoredProcList, TJvFieldList, TJvIndexList]);
{$ENDIF USE_OLD_DBLISTS}
! {$ENDIF CBUILDER}
RegisterNonActiveX([TJvQuery, TJvSQLScript, TJvMemoryTable, TJvQBEQuery,
--- 83,92 ----
RegisterComponents(srJvDataAccessPalette, [TJvBDEItems, TJvDatabaseItems,
TJvTableItems]);
! {$IFNDEF BCB}
{$IFDEF USE_OLD_DBLISTS}
RegisterComponents(srJvDataAccessPalette, [TJvDatabaseList, TJvLangDrivList,
TJvTableList, TJvStoredProcList, TJvFieldList, TJvIndexList]);
{$ENDIF USE_OLD_DBLISTS}
! {$ENDIF BCB}
RegisterNonActiveX([TJvQuery, TJvSQLScript, TJvMemoryTable, TJvQBEQuery,
Index: JvBlinkingLED.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvBlinkingLED.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JvBlinkingLED.pas 28 Oct 2003 22:53:36 -0000 1.2
--- JvBlinkingLED.pas 23 Nov 2003 07:55:43 -0000 1.3
***************
*** 42,49 ****
uses
SysUtils, Classes,
! {$IFDEF COMPLIB_VCL}
Windows, Controls, Graphics, ExtCtrls,
{$ENDIF}
! {$IFDEF COMPLIB_CLX}
QControls, QGraphics, QExtCtrls,
{$ENDIF}
--- 42,49 ----
uses
SysUtils, Classes,
! {$IFDEF VCL}
Windows, Controls, Graphics, ExtCtrls,
{$ENDIF}
! {$IFDEF VisualCLX}
QControls, QGraphics, QExtCtrls,
{$ENDIF}
***************
*** 72,76 ****
destructor Destroy; override;
published
! {$IFDEF COMPLIB_VCL}
property DragCursor;
property DragKind;
--- 72,76 ----
destructor Destroy; override;
published
! {$IFDEF VCL}
property DragCursor;
property DragKind;
Index: JvCtlConst.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvCtlConst.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvCtlConst.pas 20 Jun 2003 14:29:15 -0000 1.1
--- JvCtlConst.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 45,49 ****
{IParser}
! {$IFDEF Delphi}
StIdSymbols = ['_', '0'..'9', 'A'..'Z', 'a'..'z'];
StIdFirstSymbols = ['_', 'A'..'Z', 'a'..'z'];
--- 45,49 ----
{IParser}
! {$IFDEF DELPHI}
StIdSymbols = ['_', '0'..'9', 'A'..'Z', 'a'..'z'];
StIdFirstSymbols = ['_', 'A'..'Z', 'a'..'z'];
***************
*** 51,56 ****
StConstSymbols10 = ['0'..'9'];
StSeparators = ['(', ')', ',', '.', ';'];
! {$ENDIF Delphi}
! {$IFDEF CBUILDER}
StIdSymbols = '_0123456789QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm';
StIdFirstSymbols = '_QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm';
--- 51,56 ----
StConstSymbols10 = ['0'..'9'];
StSeparators = ['(', ')', ',', '.', ';'];
! {$ENDIF DELPHI}
! {$IFDEF LINUX}
StIdSymbols = '_0123456789QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm';
StIdFirstSymbols = '_QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm';
***************
*** 58,62 ****
StConstSymbols10 = '0123456789';
StSeparators = '(),.;';
! {$ENDIF CBUILDER}
{$IFDEF RAINTER}
--- 58,62 ----
StConstSymbols10 = '0123456789';
StSeparators = '(),.;';
! {$ENDIF BCB}
{$IFDEF RAINTER}
Index: JvCtlReg.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvCtlReg.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvCtlReg.pas 22 Jun 2003 06:33:52 -0000 1.1
--- JvCtlReg.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 77,85 ****
TJvSpinButton,
TJvSwitch, TJvDice]);
! {$IFDEF CBUILDER}
RegisterComponents(ResStr(srSamplesPalette), [TScroller]);
{$ELSE}
RegisterComponents(ResStr(srSamplesPalette), [TScroller]);
! {$ENDIF}
RegisterNonActiveX([TJvCustomComboEdit, TJvCustomDateEdit, TJvCustomNumEdit,
--- 77,85 ----
TJvSpinButton,
TJvSwitch, TJvDice]);
! {$IFDEF BCB}
RegisterComponents(ResStr(srSamplesPalette), [TScroller]);
{$ELSE}
RegisterComponents(ResStr(srSamplesPalette), [TScroller]);
! {$ENDIF BCB}
RegisterNonActiveX([TJvCustomComboEdit, TJvCustomDateEdit, TJvCustomNumEdit,
Index: JvIReg.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvIReg.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvIReg.pas 22 Jun 2003 06:33:52 -0000 1.1
--- JvIReg.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 49,55 ****
DsgnIntf,
{$ENDIF COMPILER6_UP}
! {$IFDEF COMPLIB_VCL}
JvInterpreterFm,
! {$ENDIF COMPLIB_VCL}
JvInterpreter, JvxDConst;
--- 49,55 ----
DsgnIntf,
{$ENDIF COMPILER6_UP}
! {$IFDEF VCL}
JvInterpreterFm,
! {$ENDIF VCL}
JvInterpreter, JvxDConst;
***************
*** 178,184 ****
{JvInterpreter unit}
RegisterComponents(srJvInterpreterPalette, [TJvInterpreterProgram]);
! {$IFDEF COMPLIB_VCL}
RegisterComponents(srJvInterpreterPalette, [TJvInterpreterFm]);
! {$ENDIF COMPLIB_VCL}
{$IFDEF JVCL_REGISTER_GLOBAL_DESIGNEDITORS}
{$IFDEF JvInterpreter_INTEGERPROPERTY}
--- 178,184 ----
{JvInterpreter unit}
RegisterComponents(srJvInterpreterPalette, [TJvInterpreterProgram]);
! {$IFDEF VCL}
RegisterComponents(srJvInterpreterPalette, [TJvInterpreterFm]);
! {$ENDIF VCL}
{$IFDEF JVCL_REGISTER_GLOBAL_DESIGNEDITORS}
{$IFDEF JvInterpreter_INTEGERPROPERTY}
Index: JvInterpreter_JvRegAuto.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvInterpreter_JvRegAuto.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvInterpreter_JvRegAuto.pas 26 Jun 2003 21:10:44 -0000 1.1
--- JvInterpreter_JvRegAuto.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 66,70 ****
end;
! {$IFDEF COMPLIB_VCL}
{ function ReadRootString(const Section, Ident, Default: string): string; }
--- 66,70 ----
end;
! {$IFDEF VCL}
{ function ReadRootString(const Section, Ident, Default: string): string; }
***************
*** 96,100 ****
end;
! {$ENDIF COMPLIB_VCL}
{ function ReadString(const Section, Ident, Default: string): string; }
--- 96,100 ----
end;
! {$ENDIF VCL}
{ function ReadString(const Section, Ident, Default: string): string; }
***************
*** 256,265 ****
AddGet(TJvRegAuto, 'Save', TRegAuto_Save, 0, [0], varEmpty);
AddGet(TJvRegAuto, 'Load', TRegAuto_Load, 0, [0], varEmpty);
! {$IFDEF COMPLIB_VCL}
AddGet(TJvRegAuto, 'ReadRootString', TRegAuto_ReadRootString, 3, [varEmpty, varEmpty, varEmpty], varEmpty);
AddGet(TJvRegAuto, 'ReadRootInteger', TRegAuto_ReadRootInteger, 3, [varEmpty, varEmpty, varEmpty], varEmpty);
AddGet(TJvRegAuto, 'WriteRootString', TRegAuto_WriteRootString, 3, [varEmpty, varEmpty, varEmpty], varEmpty);
AddGet(TJvRegAuto, 'WriteRootInteger', TRegAuto_WriteRootInteger, 3, [varEmpty, varEmpty, varEmpty], varEmpty);
! {$ENDIF COMPLIB_VCL}
AddGet(TJvRegAuto, 'ReadString', TRegAuto_ReadString, 3, [varEmpty, varEmpty, varEmpty], varEmpty);
AddGet(TJvRegAuto, 'WriteString', TRegAuto_WriteString, 3, [varEmpty, varEmpty, varEmpty], varEmpty);
--- 256,265 ----
AddGet(TJvRegAuto, 'Save', TRegAuto_Save, 0, [0], varEmpty);
AddGet(TJvRegAuto, 'Load', TRegAuto_Load, 0, [0], varEmpty);
! {$IFDEF VCL}
AddGet(TJvRegAuto, 'ReadRootString', TRegAuto_ReadRootString, 3, [varEmpty, varEmpty, varEmpty], varEmpty);
AddGet(TJvRegAuto, 'ReadRootInteger', TRegAuto_ReadRootInteger, 3, [varEmpty, varEmpty, varEmpty], varEmpty);
AddGet(TJvRegAuto, 'WriteRootString', TRegAuto_WriteRootString, 3, [varEmpty, varEmpty, varEmpty], varEmpty);
AddGet(TJvRegAuto, 'WriteRootInteger', TRegAuto_WriteRootInteger, 3, [varEmpty, varEmpty, varEmpty], varEmpty);
! {$ENDIF VCL}
AddGet(TJvRegAuto, 'ReadString', TRegAuto_ReadString, 3, [varEmpty, varEmpty, varEmpty], varEmpty);
AddGet(TJvRegAuto, 'WriteString', TRegAuto_WriteString, 3, [varEmpty, varEmpty, varEmpty], varEmpty);
Index: JvRegAuto.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvRegAuto.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvRegAuto.pas 26 Jun 2003 21:10:44 -0000 1.1
--- JvRegAuto.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 37,50 ****
uses
! {$IFDEF COMPLIB_VCL}
Windows, SysUtils, Classes, Controls, Forms,
TypInfo, Registry, IniFiles,
JvComponent;
! {$ENDIF COMPLIB_VCL}
! {$IFDEF COMPLIB_CLX}
SysUtils, Classes, QForms,
//Graphics, Controls, Forms,
TypInfo, IniFiles;
! {$ENDIF COMPLIB_CLX}
type
--- 37,50 ----
uses
! {$IFDEF VCL}
Windows, SysUtils, Classes, Controls, Forms,
TypInfo, Registry, IniFiles,
JvComponent;
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
SysUtils, Classes, QForms,
//Graphics, Controls, Forms,
TypInfo, IniFiles;
! {$ENDIF VisualCLX}
type
***************
*** 70,76 ****
CurKey: string;
FStorage: TStorageMedia;
! {$IFDEF COMPLIB_VCL}
FRegPath: string;
! {$ENDIF COMPLIB_VCL}
FIniFile: string;
FIniStrings: TStrings;
--- 70,76 ----
CurKey: string;
FStorage: TStorageMedia;
! {$IFDEF VCL}
FRegPath: string;
! {$ENDIF VCL}
FIniFile: string;
FIniStrings: TStrings;
***************
*** 85,91 ****
FAfterSave: TNotifyEvent;
OldIniFile: string;
! {$IFDEF COMPLIB_VCL}
OldRegPath: string;
! {$ENDIF COMPLIB_VCL}
procedure LoadPropInf(lObjProp: string);
function GetOrdPrp: Longint;
--- 85,91 ----
FAfterSave: TNotifyEvent;
OldIniFile: string;
! {$IFDEF VCL}
OldRegPath: string;
! {$ENDIF VCL}
procedure LoadPropInf(lObjProp: string);
function GetOrdPrp: Longint;
***************
*** 96,102 ****
procedure SetFloatPrp(Value: Extended);
procedure SetFProps(lProps: TStrings);
! {$IFDEF COMPLIB_VCL}
procedure SetSaveWindowPlace(F: Boolean);
! {$ENDIF COMPLIB_VCL}
procedure SetIniStrings(AIniStrings: TStrings);
function GetUse(Index: TStorageMedia): Boolean;
--- 96,102 ----
procedure SetFloatPrp(Value: Extended);
procedure SetFProps(lProps: TStrings);
! {$IFDEF VCL}
procedure SetSaveWindowPlace(F: Boolean);
! {$ENDIF VCL}
procedure SetIniStrings(AIniStrings: TStrings);
function GetUse(Index: TStorageMedia): Boolean;
***************
*** 109,115 ****
procedure ReadUseStrProperty(Reader: TReader);
protected
! {$IFDEF COMPLIB_VCL}
Reg: TRegIniFile;
! {$ENDIF COMPLIB_VCL}
Ini: TJvMyIniFile;
Str: TJvIniStrings;
--- 109,115 ----
procedure ReadUseStrProperty(Reader: TReader);
protected
! {$IFDEF VCL}
Reg: TRegIniFile;
! {$ENDIF VCL}
Ini: TJvMyIniFile;
Str: TJvIniStrings;
***************
*** 123,137 ****
procedure Save;
procedure Load;
! {$IFDEF COMPLIB_VCL}
procedure SaveWindowPlacement;
procedure LoadWindowPlacement;
! {$ENDIF COMPLIB_VCL}
! {$IFDEF COMPLIB_VCL}
function ReadRootString(const Section, Ident, Default: string): string;
function ReadRootInteger(const Section, Ident: string; Default: Longint): Longint;
procedure WriteRootString(const Section, Ident, Value: string);
procedure WriteRootInteger(const Section, Ident: string; Value: Longint);
! {$ENDIF COMPLIB_VCL}
function ReadString(const Section, Ident, Default: string): string;
procedure WriteString(const Section, Ident, Value: string);
--- 123,137 ----
procedure Save;
procedure Load;
! {$IFDEF VCL}
procedure SaveWindowPlacement;
procedure LoadWindowPlacement;
! {$ENDIF VCL}
! {$IFDEF VCL}
function ReadRootString(const Section, Ident, Default: string): string;
function ReadRootInteger(const Section, Ident: string; Default: Longint): Longint;
procedure WriteRootString(const Section, Ident, Value: string);
procedure WriteRootInteger(const Section, Ident: string; Value: Longint);
! {$ENDIF VCL}
function ReadString(const Section, Ident, Default: string): string;
procedure WriteString(const Section, Ident, Value: string);
***************
*** 160,170 ****
published
// Path in the registry [translated]
! {$IFDEF COMPLIB_VCL}
property RegPath: string read FRegPath write FRegPath;
property Storage: TStorageMedia read FStorage write FStorage default raRegistry;
! {$ENDIF COMPLIB_VCL}
! {$IFDEF COMPLIB_CLX}
property Storage: TStorageMedia read FStorage write FStorage default raIniFile;
! {$ENDIF COMPLIB_CLX}
// Name of the ini-file [translated]
property IniFile: string read FIniFile write FIniFile;
--- 160,170 ----
published
// Path in the registry [translated]
! {$IFDEF VCL}
property RegPath: string read FRegPath write FRegPath;
property Storage: TStorageMedia read FStorage write FStorage default raRegistry;
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
property Storage: TStorageMedia read FStorage write FStorage default raIniFile;
! {$ENDIF VisualCLX}
// Name of the ini-file [translated]
property IniFile: string read FIniFile write FIniFile;
***************
*** 174,180 ****
property AutoMode: Boolean read FAutoMode write FAutoMode default True;
// To save a size and position of the window [translated]
! {$IFDEF COMPLIB_VCL}
property SaveWindowPlace: Boolean read FSaveWindowPlace write SetSaveWindowPlace default False;
! {$ENDIF COMPLIB_VCL}
property BeforeLoad: TNotifyEvent read FBeforeLoad write FBeforeLoad;
property AfterLoad: TNotifyEvent read FAfterLoad write FAfterLoad;
--- 174,180 ----
property AutoMode: Boolean read FAutoMode write FAutoMode default True;
// To save a size and position of the window [translated]
! {$IFDEF VCL}
property SaveWindowPlace: Boolean read FSaveWindowPlace write SetSaveWindowPlace default False;
! {$ENDIF VCL}
property BeforeLoad: TNotifyEvent read FBeforeLoad write FBeforeLoad;
property AfterLoad: TNotifyEvent read FAfterLoad write FAfterLoad;
***************
*** 246,255 ****
inherited Create(AOwner);
FNotifiers := TList.Create;
! {$IFDEF COMPLIB_VCL}
FStorage := raRegistry;
! {$ENDIF COMPLIB_VCL}
! {$IFDEF COMPLIB_CLX}
FStorage := raIniFile;
! {$ENDIF COMPLIB_CLX}
FGlobalSettings := True;
FProps := TStringList.Create;
--- 246,255 ----
inherited Create(AOwner);
FNotifiers := TList.Create;
! {$IFDEF VCL}
FStorage := raRegistry;
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
FStorage := raIniFile;
! {$ENDIF VisualCLX}
FGlobalSettings := True;
FProps := TStringList.Create;
***************
*** 263,267 ****
if ProjName = '' then
ProjName := 'NONAME';
! {$IFDEF COMPLIB_VCL}
with TRegIniFile.Create('') do
try
--- 263,267 ----
if ProjName = '' then
ProjName := 'NONAME';
! {$IFDEF VCL}
with TRegIniFile.Create('') do
try
***************
*** 276,287 ****
Reg.Free;
end;
! {$ENDIF COMPLIB_VCL}
FIniFile := '$HOME/.' + ProjName;
end
else
begin
! {$IFDEF COMPLIB_VCL}
FRegPath := 'Software\Unknown Delphi Application';
! {$ENDIF COMPLIB_VCL}
end;
FAutoMode := True;
--- 276,287 ----
Reg.Free;
end;
! {$ENDIF VCL}
FIniFile := '$HOME/.' + ProjName;
end
else
begin
! {$IFDEF VCL}
FRegPath := 'Software\Unknown Delphi Application';
! {$ENDIF VCL}
end;
FAutoMode := True;
***************
*** 515,522 ****
end;
end;
! {$IFDEF COMPLIB_VCL}
if SaveWindowPlace then
SaveWindowPlacement;
! {$ENDIF COMPLIB_VCL}
except
raise EJvRegAutoError.Create('Could not save property ' + ObjProp);
--- 515,522 ----
end;
end;
! {$IFDEF VCL}
if SaveWindowPlace then
SaveWindowPlacement;
! {$ENDIF VCL}
except
raise EJvRegAutoError.Create('Could not save property ' + ObjProp);
***************
*** 565,572 ****
FBeforeLoad(Self);
try
! {$IFDEF COMPLIB_VCL}
if SaveWindowPlace then
LoadWindowPlacement;
! {$ENDIF COMPLIB_VCL}
for I := 0 to FProps.Count - 1 do
begin
--- 565,572 ----
FBeforeLoad(Self);
try
! {$IFDEF VCL}
if SaveWindowPlace then
LoadWindowPlacement;
! {$ENDIF VCL}
for I := 0 to FProps.Count - 1 do
begin
***************
*** 594,598 ****
end;
! {$IFDEF COMPLIB_VCL}
procedure TJvRegAuto.LoadWindowPlacement;
--- 594,598 ----
end;
! {$IFDEF VCL}
procedure TJvRegAuto.LoadWindowPlacement;
***************
*** 647,651 ****
end;
! {$ENDIF COMPLIB_VCL}
procedure TJvRegAuto.SetFProps(lProps: TStrings);
--- 647,651 ----
end;
! {$ENDIF VCL}
procedure TJvRegAuto.SetFProps(lProps: TStrings);
***************
*** 654,658 ****
end;
! {$IFDEF COMPLIB_VCL}
function TJvRegAuto.ReadRootString(const Section, Ident, Default: string): string;
--- 654,658 ----
end;
! {$IFDEF VCL}
function TJvRegAuto.ReadRootString(const Section, Ident, Default: string): string;
***************
*** 698,702 ****
end;
! {$ENDIF COMPLIB_VCL}
procedure TJvRegAuto.SetIniStrings(AIniStrings: TStrings);
--- 698,702 ----
end;
! {$ENDIF VCL}
procedure TJvRegAuto.SetIniStrings(AIniStrings: TStrings);
***************
*** 732,752 ****
begin
OldIniFile := FIniFile;
! {$IFDEF COMPLIB_VCL}
OldRegPath := FRegPath;
! {$ENDIF COMPLIB_VCL}
if FGlobalSettings then
begin
if GlobalIniFile <> '' then
FIniFile := GlobalIniFile;
! {$IFDEF COMPLIB_VCL}
if GlobalRegPath <> '' then
FRegPath := GlobalRegPath;
! {$ENDIF COMPLIB_VCL}
end;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Reg := TRegIniFile.Create(FRegPath);
! {$ENDIF COMPLIB_VCL}
raIniFile:
Ini := TJvMyIniFile.Create(GetFullIniFileName);
--- 732,752 ----
begin
OldIniFile := FIniFile;
! {$IFDEF VCL}
OldRegPath := FRegPath;
! {$ENDIF VCL}
if FGlobalSettings then
begin
if GlobalIniFile <> '' then
FIniFile := GlobalIniFile;
! {$IFDEF VCL}
if GlobalRegPath <> '' then
FRegPath := GlobalRegPath;
! {$ENDIF VCL}
end;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Reg := TRegIniFile.Create(FRegPath);
! {$ENDIF VCL}
raIniFile:
Ini := TJvMyIniFile.Create(GetFullIniFileName);
***************
*** 758,765 ****
procedure TJvRegAuto.DestroyFile;
begin
! {$IFDEF COMPLIB_VCL}
Reg.Free;
Reg := nil;
! {$ENDIF COMPLIB_VCL}
{$IFDEF LINUX}
if Ini <> nil then
--- 758,765 ----
procedure TJvRegAuto.DestroyFile;
begin
! {$IFDEF VCL}
Reg.Free;
Reg := nil;
! {$ENDIF VCL}
{$IFDEF LINUX}
if Ini <> nil then
***************
*** 773,781 ****
begin
FIniFile := OldIniFile;
! {$IFDEF COMPLIB_VCL}
if GlobalRegPath <> '' then
FRegPath := GlobalRegPath;
FRegPath := OldRegPath;
! {$ENDIF COMPLIB_VCL}
end;
end;
--- 773,781 ----
begin
FIniFile := OldIniFile;
! {$IFDEF VCL}
if GlobalRegPath <> '' then
FRegPath := GlobalRegPath;
FRegPath := OldRegPath;
! {$ENDIF VCL}
end;
end;
***************
*** 785,792 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Reg.EraseSection(ConcatSep(FSection, Section, cSlash));
! {$ENDIF COMPLIB_VCL}
raIniFile:
Ini.EraseSection(ConcatSep(FSection, Section, cSlash));
--- 785,792 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Reg.EraseSection(ConcatSep(FSection, Section, cSlash));
! {$ENDIF VCL}
raIniFile:
Ini.EraseSection(ConcatSep(FSection, Section, cSlash));
***************
*** 799,806 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Reg.DeleteKey(ConcatSep(FSection, Section, cSlash), Ident);
! {$ENDIF COMPLIB_VCL}
raIniFile:
Ini.DeleteKey(ConcatSep(FSection, Section, cSlash), Ident);
--- 799,806 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Reg.DeleteKey(ConcatSep(FSection, Section, cSlash), Ident);
! {$ENDIF VCL}
raIniFile:
Ini.DeleteKey(ConcatSep(FSection, Section, cSlash), Ident);
***************
*** 814,821 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Result := Reg.ReadString(ConcatSep(FSection, Section, cSlash), Ident, Default);
! {$ENDIF COMPLIB_VCL}
raIniFile:
Result := Ini.ReadString(ConcatSep(FSection, Section, cSlash), Ident, Default);
--- 814,821 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Result := Reg.ReadString(ConcatSep(FSection, Section, cSlash), Ident, Default);
! {$ENDIF VCL}
raIniFile:
Result := Ini.ReadString(ConcatSep(FSection, Section, cSlash), Ident, Default);
***************
*** 830,837 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Reg.WriteString(ConcatSep(FSection, Section, cSlash), Ident, Value);
! {$ENDIF COMPLIB_VCL}
raIniFile:
Ini.WriteString(ConcatSep(FSection, Section, cSlash), Ident, Value);
--- 830,837 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Reg.WriteString(ConcatSep(FSection, Section, cSlash), Ident, Value);
! {$ENDIF VCL}
raIniFile:
Ini.WriteString(ConcatSep(FSection, Section, cSlash), Ident, Value);
***************
*** 848,855 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Result := Reg.ReadInteger(ConcatSep(FSection, Section, cSlash), Ident, Default);
! {$ENDIF COMPLIB_VCL}
raIniFile:
Result := Ini.ReadInteger(ConcatSep(FSection, Section, cSlash), Ident, Default);
--- 848,855 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Result := Reg.ReadInteger(ConcatSep(FSection, Section, cSlash), Ident, Default);
! {$ENDIF VCL}
raIniFile:
Result := Ini.ReadInteger(ConcatSep(FSection, Section, cSlash), Ident, Default);
***************
*** 864,871 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Reg.WriteInteger(ConcatSep(FSection, Section, cSlash), Ident, Value);
! {$ENDIF COMPLIB_VCL}
raIniFile:
Ini.WriteInteger(ConcatSep(FSection, Section, cSlash), Ident, Value);
--- 864,871 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Reg.WriteInteger(ConcatSep(FSection, Section, cSlash), Ident, Value);
! {$ENDIF VCL}
raIniFile:
Ini.WriteInteger(ConcatSep(FSection, Section, cSlash), Ident, Value);
***************
*** 882,889 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Result := Reg.ReadBool(ConcatSep(FSection, Section, cSlash), Ident, Default);
! {$ENDIF COMPLIB_VCL}
raIniFile:
Result := Ini.ReadBool(ConcatSep(FSection, Section, cSlash), Ident, Default);
--- 882,889 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Result := Reg.ReadBool(ConcatSep(FSection, Section, cSlash), Ident, Default);
! {$ENDIF VCL}
raIniFile:
Result := Ini.ReadBool(ConcatSep(FSection, Section, cSlash), Ident, Default);
***************
*** 898,905 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Reg.WriteBool(ConcatSep(FSection, Section, cSlash), Ident, Value);
! {$ENDIF COMPLIB_VCL}
raIniFile:
Ini.WriteBool(ConcatSep(FSection, Section, cSlash), Ident, Value);
--- 898,905 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Reg.WriteBool(ConcatSep(FSection, Section, cSlash), Ident, Value);
! {$ENDIF VCL}
raIniFile:
Ini.WriteBool(ConcatSep(FSection, Section, cSlash), Ident, Value);
***************
*** 915,922 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Result := StrToFloat(Reg.ReadString(ConcatSep(FSection, Section, cSlash), Ident, FloatToStr(Default)));
! {$ENDIF COMPLIB_VCL}
raIniFile:
Result := Ini.ReadFloat(ConcatSep(FSection, Section, cSlash), Ident, Default);
--- 915,922 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Result := StrToFloat(Reg.ReadString(ConcatSep(FSection, Section, cSlash), Ident, FloatToStr(Default)));
! {$ENDIF VCL}
raIniFile:
Result := Ini.ReadFloat(ConcatSep(FSection, Section, cSlash), Ident, Default);
***************
*** 931,938 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Reg.WriteString(ConcatSep(FSection, Section, cSlash), Ident, FloatToStr(Value));
! {$ENDIF COMPLIB_VCL}
raIniFile:
Ini.WriteFloat(ConcatSep(FSection, Section, cSlash), Ident, Value);
--- 931,938 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Reg.WriteString(ConcatSep(FSection, Section, cSlash), Ident, FloatToStr(Value));
! {$ENDIF VCL}
raIniFile:
Ini.WriteFloat(ConcatSep(FSection, Section, cSlash), Ident, Value);
***************
*** 967,974 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Reg.ReadSection(ConcatSep(FSection, Section, cSlash), Ss);
! {$ENDIF COMPLIB_VCL}
raIniFile:
Ini.ReadSection(ConcatSep(FSection, Section, cSlash), Ss);
--- 967,974 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Reg.ReadSection(ConcatSep(FSection, Section, cSlash), Ss);
! {$ENDIF VCL}
raIniFile:
Ini.ReadSection(ConcatSep(FSection, Section, cSlash), Ss);
***************
*** 983,990 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Reg.ReadSectionValues(ConcatSep(FSection, Section, cSlash), Ss);
! {$ENDIF COMPLIB_VCL}
raIniFile:
Ini.ReadSectionValues(ConcatSep(FSection, Section, cSlash), Ss);
--- 983,990 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Reg.ReadSectionValues(ConcatSep(FSection, Section, cSlash), Ss);
! {$ENDIF VCL}
raIniFile:
Ini.ReadSectionValues(ConcatSep(FSection, Section, cSlash), Ss);
***************
*** 999,1007 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
{ ReadWholeSection not supported for registry }
Reg.ReadSection(ConcatSep(FSection, Section, cSlash), Ss);
! {$ENDIF COMPLIB_VCL}
raIniFile:
Ini.ReadWholeSection(ConcatSep(FSection, Section, cSlash), Ss);
--- 999,1007 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
{ ReadWholeSection not supported for registry }
Reg.ReadSection(ConcatSep(FSection, Section, cSlash), Ss);
! {$ENDIF VCL}
raIniFile:
Ini.ReadWholeSection(ConcatSep(FSection, Section, cSlash), Ss);
***************
*** 1016,1023 ****
CreateFile;
case FStorage of
! {$IFDEF COMPLIB_VCL}
raRegistry:
Reg.ReadSections(Ss);
! {$ENDIF COMPLIB_VCL}
raIniFile:
Ini.ReadSections(Ss);
--- 1016,1023 ----
CreateFile;
case FStorage of
! {$IFDEF VCL}
raRegistry:
Reg.ReadSections(Ss);
! {$ENDIF VCL}
raIniFile:
Ini.ReadSections(Ss);
Index: JvRegAutoEditorForm.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvRegAutoEditorForm.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvRegAutoEditorForm.pas 26 Jun 2003 21:10:44 -0000 1.1
--- JvRegAutoEditorForm.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 619,625 ****
RegPath := 'Software\Borland\Delphi\JVCL\JvRegAutoEditorForm';
{$ENDIF DELPHI}
! {$IFDEF CBUILDER}
RegPath := 'Software\Borland\C++Builder\JVCL\JvRegAutoEditorForm';
! {$ENDIF CBUILDER}
AutoMode := True;
SaveWindowPlace := True;
--- 619,625 ----
RegPath := 'Software\Borland\Delphi\JVCL\JvRegAutoEditorForm';
{$ENDIF DELPHI}
! {$IFDEF BCB}
RegPath := 'Software\Borland\C++Builder\JVCL\JvRegAutoEditorForm';
! {$ENDIF BCB}
AutoMode := True;
SaveWindowPlace := True;
Index: JvStrUtil.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvStrUtil.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvStrUtil.pas 20 Jun 2003 14:29:15 -0000 1.1
--- JvStrUtil.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 54,61 ****
TSetOfChar = set of Char;
{$ENDIF DELPHI}
! {$IFDEF CBUILDER}
type
TSetOfChar = string;
! {$ENDIF CBUILDER}
function FindNotBlankCharPos(const S: string): Integer;
--- 54,61 ----
TSetOfChar = set of Char;
{$ENDIF DELPHI}
! {$IFDEF BCB}
type
TSetOfChar = string;
! {$ENDIF BCB}
function FindNotBlankCharPos(const S: string): Integer;
***************
*** 346,352 ****
Result := Ch in SetOfChar;
{$ENDIF DELPHI}
! {$IFDEF CBUILDER}
Result := Pos(Ch, SetOfChar) > 0;
! {$ENDIF CBUILDER}
end;
--- 346,352 ----
Result := Ch in SetOfChar;
{$ENDIF DELPHI}
! {$IFDEF BCB}
Result := Pos(Ch, SetOfChar) > 0;
! {$ENDIF BCB}
end;
Index: JvStrUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvStrUtils.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvStrUtils.pas 20 Jun 2003 14:29:15 -0000 1.1
--- JvStrUtils.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 183,190 ****
const
DigitChars = ['0'..'9'];
! {$IFNDEF CBUILDER}
Brackets = ['(', ')', '[', ']', '{', '}'];
StdWordDelims = [#0..' ', ',', '.', ';', '/', '\', ':', '''', '"', '`'] + Brackets;
! {$ENDIF}
implementation
--- 183,190 ----
const
DigitChars = ['0'..'9'];
! {$IFNDEF BCB}
Brackets = ['(', ')', '[', ']', '{', '}'];
StdWordDelims = [#0..' ', ',', '.', ';', '/', '\', ':', '''', '"', '`'] + Brackets;
! {$ENDIF BCB}
implementation
Index: JvUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvUtils.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvUtils.pas 20 Jun 2003 14:29:15 -0000 1.1
--- JvUtils.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 75,82 ****
TSetOfChar = set of Char;
{$ENDIF DELPHI}
! {$IFDEF CBUILDER}
type
TSetOfChar = string;
! {$ENDIF CBUILDER}
{ GetWordOnPos returns Word from string, S, on the cursor position, P}
--- 75,82 ----
TSetOfChar = set of Char;
{$ENDIF DELPHI}
! {$IFDEF BCB}
type
TSetOfChar = string;
! {$ENDIF BCB}
{ GetWordOnPos returns Word from string, S, on the cursor position, P}
***************
*** 1571,1577 ****
Result := Ch in SetOfChar;
{$ENDIF DELPHI}
! {$IFDEF CBUILDER}
Result := Pos(Ch, SetOfChar) > 0;
! {$ENDIF CBUILDER}
end;
--- 1571,1577 ----
Result := Ch in SetOfChar;
{$ENDIF DELPHI}
! {$IFDEF BCB}
Result := Pos(Ch, SetOfChar) > 0;
! {$ENDIF BCB}
end;
Index: JvVCLUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvVCLUtils.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvVCLUtils.pas 20 Jun 2003 14:29:15 -0000 1.1
--- JvVCLUtils.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 91,95 ****
function MsgDlg(const Msg: string; AType: TMsgDlgType;
AButtons: TMsgDlgButtons; HelpCtx: Longint): Word;
! {$IFDEF CBUILDER}
function FindPrevInstance(const MainFormClass: ShortString;
const ATitle: string): HWND;
--- 91,95 ----
function MsgDlg(const Msg: string; AType: TMsgDlgType;
AButtons: TMsgDlgButtons; HelpCtx: Longint): Word;
! {$IFDEF BCB}
function FindPrevInstance(const MainFormClass: ShortString;
const ATitle: string): HWND;
***************
*** 99,103 ****
function FindPrevInstance(const MainFormClass, ATitle: string): HWND;
function ActivatePrevInstance(const MainFormClass, ATitle: string): Boolean;
! {$ENDIF CBUILDER}
function IsForegroundTask: Boolean;
procedure MergeForm(AControl: TWinControl; AForm: TForm; Align: TAlign;
--- 99,103 ----
function FindPrevInstance(const MainFormClass, ATitle: string): HWND;
function ActivatePrevInstance(const MainFormClass, ATitle: string): Boolean;
! {$ENDIF BCB}
function IsForegroundTask: Boolean;
procedure MergeForm(AControl: TWinControl; AForm: TForm; Align: TAlign;
***************
*** 1559,1568 ****
end;
! {$IFDEF CBUILDER}
function FindPrevInstance(const MainFormClass: ShortString;
const ATitle: string): HWND;
{$ELSE}
function FindPrevInstance(const MainFormClass, ATitle: string): HWND;
! {$ENDIF CBUILDER}
var
BufClass, BufTitle: PChar;
--- 1559,1568 ----
end;
! {$IFDEF BCB}
function FindPrevInstance(const MainFormClass: ShortString;
const ATitle: string): HWND;
{$ELSE}
function FindPrevInstance(const MainFormClass, ATitle: string): HWND;
! {$ENDIF BCB}
var
BufClass, BufTitle: PChar;
***************
*** 1598,1607 ****
{$ENDIF}
! {$IFDEF CBUILDER}
function ActivatePrevInstance(const MainFormClass: ShortString;
const ATitle: string): Boolean;
{$ELSE}
function ActivatePrevInstance(const MainFormClass, ATitle: string): Boolean;
! {$ENDIF CBUILDER}
var
PrevWnd, PopupWnd, ParentWnd: HWND;
--- 1598,1607 ----
{$ENDIF}
! {$IFDEF BCB}
function ActivatePrevInstance(const MainFormClass: ShortString;
const ATitle: string): Boolean;
{$ELSE}
function ActivatePrevInstance(const MainFormClass, ATitle: string): Boolean;
! {$ENDIF BCB}
var
PrevWnd, PopupWnd, ParentWnd: HWND;
Index: JvaCtlReg.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvaCtlReg.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvaCtlReg.pas 22 Jun 2003 06:33:52 -0000 1.1
--- JvaCtlReg.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 38,56 ****
uses
! {$IFDEF COMPLIB_VCL}
Windows,
! {$ENDIF COMPLIB_VCL}
! {$IFDEF COMPLIB_VCL}
SysUtils, Controls,
JvRegAutoEditor, JvHtControls, JvDlg,
JvButtons, JvComponentPanel, JvScrollMax,
JvEditor, JvHLEditor, JvHLEdPropDlg, JvaScrollText, JvHTHintEditor,
! {$ENDIF COMPLIB_VCL}
JvIDEZoom, JvHLEditEditor, JvScrollMaxEditor,
{$IFDEF COMPILER6_UP}
DesignIntf, DesignEditors, PropertyCategories,
! {$IFDEF COMPLIB_VCL}
VCLEditors,
! {$ENDIF COMPLIB_VCL}
{$ELSE}
DsgnIntf,
--- 38,56 ----
uses
! {$IFDEF VCL}
Windows,
! {$ENDIF VCL}
! {$IFDEF VCL}
SysUtils, Controls,
JvRegAutoEditor, JvHtControls, JvDlg,
JvButtons, JvComponentPanel, JvScrollMax,
JvEditor, JvHLEditor, JvHLEdPropDlg, JvaScrollText, JvHTHintEditor,
! {$ENDIF VCL}
JvIDEZoom, JvHLEditEditor, JvScrollMaxEditor,
{$IFDEF COMPILER6_UP}
DesignIntf, DesignEditors, PropertyCategories,
! {$IFDEF VCL}
VCLEditors,
! {$ENDIF VCL}
{$ELSE}
DsgnIntf,
***************
*** 60,64 ****
{$R ..\resources\ractl.dcr}
! {$IFDEF COMPLIB_VCL}
{$IFDEF COMPILER5}
--- 60,64 ----
{$R ..\resources\ractl.dcr}
! {$IFDEF VCL}
{$IFDEF COMPILER5}
***************
*** 79,87 ****
{$ENDIF COMPILER5}
! {$ENDIF COMPLIB_VCL}
procedure Register;
begin
! {$IFDEF COMPLIB_VCL}
{JvEditor unit}
RegisterComponents(srJvCustomPalette, [TJvEditor]);
--- 79,87 ----
{$ENDIF COMPILER5}
! {$ENDIF VCL}
procedure Register;
begin
! {$IFDEF VCL}
{JvEditor unit}
RegisterComponents(srJvCustomPalette, [TJvEditor]);
***************
*** 113,122 ****
{JvComponentPanel unit}
RegisterComponents(srJvCustomPalette, [TJvComponentPanel]);
! {$ENDIF COMPLIB_VCL}
! {$IFDEF COMPLIB_CLX}
{JvRegAuto unit}
RegisterComponents(RALibTabName, [TJvRegAuto]);
! {$ENDIF COMPLIB_CLX}
{Zoom unit}
--- 113,122 ----
{JvComponentPanel unit}
RegisterComponents(srJvCustomPalette, [TJvComponentPanel]);
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
{JvRegAuto unit}
RegisterComponents(RALibTabName, [TJvRegAuto]);
! {$ENDIF VisualCLX}
{Zoom unit}
***************
*** 141,145 ****
{$IFDEF COMPILER6_UP}
! {$IFDEF COMPLIB_VCL}
RegisterPropertiesInCategory('Editor', TJvCustomEditor,
['InsertMode', 'DoubleClickLine', 'Completion', 'SmartTab',
--- 141,145 ----
{$IFDEF COMPILER6_UP}
! {$IFDEF VCL}
RegisterPropertiesInCategory('Editor', TJvCustomEditor,
['InsertMode', 'DoubleClickLine', 'Completion', 'SmartTab',
Index: JvaDBReg.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/archive/JvaDBReg.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvaDBReg.pas 22 Jun 2003 06:33:52 -0000 1.1
--- JvaDBReg.pas 23 Nov 2003 07:55:43 -0000 1.2
***************
*** 60,64 ****
cStartMasterValue = 'StartMasterValue';
{$IFDEF COMPILER6_UP}
! {$IFDEF COMPLIB_VCL}
cDatabase = 'Database';
cUseFilter = 'UseFilter';
--- 60,64 ----
cStartMasterValue = 'StartMasterValue';
{$IFDEF COMPILER6_UP}
! {$IFDEF VCL}
cDatabase = 'Database';
cUseFilter = 'UseFilter';
***************
*** 94,98 ****
{$IFDEF COMPILER6_UP}
! {$IFDEF COMPLIB_VCL}
RegisterPropertiesInCategory(cDatabase, TJvDBTreeView,
[cItemField, cMasterField, cDetailField, cIconField, cStartMasterValue, cUseFilter]);
--- 94,98 ----
{$IFDEF COMPILER6_UP}
! {$IFDEF VCL}
RegisterPropertiesInCategory(cDatabase, TJvDBTreeView,
[cItemField, cMasterField, cDetailField, cIconField, cStartMasterValue, cUseFilter]);
|