Menu
▾
▴
[JVCL-Checkins] dev/JVCL3/run JvAppStorage.pas,1.75,1.76 JvBDELists.pas,1.14,1.15 JvBalloonHint.pas,1.32,1.33 JvCaptionButton.pas,1.45,1.46 JvCharMap.pas,1.37,1.38 JvColorProvider.pas,1.57,1.58 JvComCtrls.pas,1.75,1.76 JvComboListBox.pas,1.33,1.34 JvControlBar.pas,1.21,1.22 JvCsvData.pas,1.98,1.99 JvDBCombobox.pas,1.18,1.19 JvDBControls.pas,1.83,1.84 JvDataEmbedded.pas,1.15,1.16 JvDataProvider.pas,1.49,1.50 JvDataProviderIntf.pas,1.15,1.16 JvDockControlForm.pas,1.57,1.58 JvDockDelphiStyle.pas,1.12,1.13 JvDockGlobals.pas,1.24,1.25 JvDockInfo.pas,1.33,1.34 JvDockVCStyle.pas,1.24,1.25 JvDockVIDStyle.pas,1.29,1.30 JvDockVIDVCStyle.pas,1.14,1.15 JvDockVSNetStyle.pas,1.44,1.45 JvDynControlEngine.pas,1.27,1.28 JvExGrids.pas,1.49,1.50 JvFullColorRotate.pas,1.6,1.7 JvFullColorSpaces.pas,1.10,1.11 JvGenetic.pas,1.14,1.15 JvHLEditor.pas,1.27,1.28 JvHidControllerClass.pas,1.22,1.23 JvInspector.pas,1.135,1.136 JvInterpreter.pas,1.61,1.62 JvInterpreter_JvUtils.pas,1.20,1.21 JvInterpreter_SysUtils.pas,1.20,1.21 JvInterpreter_all.pas,1.12,1.13 JvJCLUtils.pas,1.139,1.140 JvJVCLUtils.pas,1.157,1.158 JvListView.pas,1.47,1.48 JvMTComponents.pas,1.22,1.23 JvMTData.pas,1.23,1.24 JvMTSync.pas,1.22,1.23 JvMTThreading.pas,1.30,1.31 JvNTEventLog.pas,1.18,1.19 JvNetscapeSplitter.pas,1.16,1.17 JvOutlookBar.pas,1.68,1.69 JvPageList.pas,1.22,1.23 JvPageListTreeView.pas,1.41,1.42 JvPickDate.pas,1.42,1.43 JvPluginManager.pas,1.23,1.24 JvProgressBar.pas,1.25,1.26 JvProgressForm.pas,1.21,1.22 JvRas32.pas,1.22,1.23 JvResources.pas,1.103,1.104 JvRichEdit.pas,1.62,1.63 JvShellHook.pas,1.12,1.13 JvSimpleXml.pas,1.53,1.54 JvSpeedbar.pas,1.51,1.52 JvSyncSplitter.pas,1.15,1.16 JvTFDays.pas,1.43,1.44 JvTFGantt.pas,1.19,1.20 JvTFGlance.pas,1.29,1.30 JvTFGlanceTextViewer.pas,1.23,1.24 JvTFManager.pas,1.42,1.43 JvTFSparseMatrix.pas,1.15,1.16 JvTFWeeks.pas,1.20,1.21 JvTabBar.pas,1.12,1.13 JvThemes.pas,1.60,1.61 JvThreadTimer.pas,1.18,1.19 JvTimeLine.pas,1.44,1.45 JvTimerList.pas,1.35,1.36 JvToolBar.pas,1.22,1.23 JvToolEdit.pas,1.162,1.163 JvTrayIcon.pas,1.35,1.36 JvTypes.pas,1.83,1.84 JvUIB.pas,1.29,1.30 JvUIBConst.pas,1.19,1.20 JvUIBDataSet.pas,1.21,1.22 JvUIBError.pas,1.16,1.17 JvUIBLib.pas,1.33,1.34 JvUIBObj.pas,1.10,1.11 JvUIBSQLParser.pas,1.14,1.15 JvUIBase.pas,1.24,1.25 JvUnicodeHLEditor.pas,1.21,1.22 JvUrlGrabbers.pas,1.40,1.41 JvValidators.pas,1.32,1.33 JvWizard.pas,1.64,1.65 JvWizardCommon.pas,1.22,1.23 JvWizardRouteMapSteps.pas,1.25,1.26 JvXPBar.pas,1.84,1.85 JvXPCore.pas,1.29,1.30 JvYearGrid.pas,1.42,1.43 Jvg3DColors.pas,1.19,1.20 JvgCaption.pas,1.28,1.29 JvgCheckVersionInfoForm.pas,1.21,1.22 JvgExport.pas,1.17,1.18 JvgGridHeaderControl.pas,1.17,1.18 JvgHint.pas,1.26,1.27 JvgMailSlots.pas,1.24,1.25 JvgQPrintPreviewForm.pas,1.22,1.23 JvgReport.pas,1.34,1.35 - ENDIFs of IFNDEFs get !
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13928/JVCL3/run Modified Files: JvAppStorage.pas JvBDELists.pas JvBalloonHint.pas JvCaptionButton.pas JvCharMap.pas JvColorProvider.pas JvComCtrls.pas JvComboListBox.pas JvControlBar.pas JvCsvData.pas JvDBCombobox.pas JvDBControls.pas JvDataEmbedded.pas JvDataProvider.pas JvDataProviderIntf.pas JvDockControlForm.pas JvDockDelphiStyle.pas JvDockGlobals.pas JvDockInfo.pas JvDockVCStyle.pas JvDockVIDStyle.pas JvDockVIDVCStyle.pas JvDockVSNetStyle.pas JvDynControlEngine.pas JvExGrids.pas JvFullColorRotate.pas JvFullColorSpaces.pas JvGenetic.pas JvHLEditor.pas JvHidControllerClass.pas JvInspector.pas JvInterpreter.pas JvInterpreter_JvUtils.pas JvInterpreter_SysUtils.pas JvInterpreter_all.pas JvJCLUtils.pas JvJVCLUtils.pas JvListView.pas JvMTComponents.pas JvMTData.pas JvMTSync.pas JvMTThreading.pas JvNTEventLog.pas JvNetscapeSplitter.pas JvOutlookBar.pas JvPageList.pas JvPageListTreeView.pas JvPickDate.pas JvPluginManager.pas JvProgressBar.pas JvProgressForm.pas JvRas32.pas JvResources.pas JvRichEdit.pas JvShellHook.pas JvSimpleXml.pas JvSpeedbar.pas JvSyncSplitter.pas JvTFDays.pas JvTFGantt.pas JvTFGlance.pas JvTFGlanceTextViewer.pas JvTFManager.pas JvTFSparseMatrix.pas JvTFWeeks.pas JvTabBar.pas JvThemes.pas JvThreadTimer.pas JvTimeLine.pas JvTimerList.pas JvToolBar.pas JvToolEdit.pas JvTrayIcon.pas JvTypes.pas JvUIB.pas JvUIBConst.pas JvUIBDataSet.pas JvUIBError.pas JvUIBLib.pas JvUIBObj.pas JvUIBSQLParser.pas JvUIBase.pas JvUnicodeHLEditor.pas JvUrlGrabbers.pas JvValidators.pas JvWizard.pas JvWizardCommon.pas JvWizardRouteMapSteps.pas JvXPBar.pas JvXPCore.pas JvYearGrid.pas Jvg3DColors.pas JvgCaption.pas JvgCheckVersionInfoForm.pas JvgExport.pas JvgGridHeaderControl.pas JvgHint.pas JvgMailSlots.pas JvgQPrintPreviewForm.pas JvgReport.pas Log Message: ENDIFs of IFNDEFs get ! Index: JvInterpreter.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvInterpreter.pas,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** JvInterpreter.pas 21 Jan 2005 09:28:56 -0000 1.61 --- JvInterpreter.pas 29 Jan 2005 06:37:00 -0000 1.62 *************** *** 213,217 **** {$IFNDEF COMPILER6_UP} TVarType = Word; ! {$ENDIF COMPILER6_UP} TJvInterpreterArgs = class; --- 213,217 ---- {$IFNDEF COMPILER6_UP} TVarType = Word; ! {$ENDIF !COMPILER6_UP} TJvInterpreterArgs = class; Index: JvgHint.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgHint.pas,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** JvgHint.pas 21 Jan 2005 15:05:45 -0000 1.26 --- JvgHint.pas 29 Jan 2005 06:37:09 -0000 1.27 *************** *** 106,110 **** resourcestring RsEOnlyOneInstanceOfTJvgHint = 'Cannot create more than one instance of TJvgHint component'; ! {$ENDIF USEJVCL} type --- 106,110 ---- resourcestring RsEOnlyOneInstanceOfTJvgHint = 'Cannot create more than one instance of TJvgHint component'; ! {$ENDIF !USEJVCL} type Index: JvTFGlance.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFGlance.pas,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** JvTFGlance.pas 21 Jan 2005 09:29:00 -0000 1.29 --- JvTFGlance.pas 29 Jan 2005 06:37:04 -0000 1.30 *************** *** 757,761 **** RsEASubcellCannotBeSplit = 'A subcell cannot be split'; RsGlanceMainTitle = '(Title)'; ! {$ENDIF USEJVCL} //=== { TJvTFGlanceCell } ==================================================== --- 757,761 ---- RsEASubcellCannotBeSplit = 'A subcell cannot be split'; RsGlanceMainTitle = '(Title)'; ! {$ENDIF !USEJVCL} //=== { TJvTFGlanceCell } ==================================================== Index: JvTimeLine.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTimeLine.pas,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** JvTimeLine.pas 21 Jan 2005 09:29:01 -0000 1.44 --- JvTimeLine.pas 29 Jan 2005 06:37:05 -0000 1.45 *************** *** 582,586 **** Result := IncMonth(AValue, ANumberOfYears * 12); end; ! {$ENDIF COMPILER6_UP} // PRY END --- 582,586 ---- Result := IncMonth(AValue, ANumberOfYears * 12); end; ! {$ENDIF !COMPILER6_UP} // PRY END Index: JvShellHook.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvShellHook.pas,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** JvShellHook.pas 26 Sep 2004 23:48:29 -0000 1.12 --- JvShellHook.pas 29 Jan 2005 06:37:03 -0000 1.13 *************** *** 256,260 **** {$IFNDEF COMPILER6_UP} Forms, ! {$ENDIF COMPILER6_UP} JvJVCLUtils; --- 256,260 ---- {$IFNDEF COMPILER6_UP} Forms, ! {$ENDIF !COMPILER6_UP} JvJVCLUtils; Index: JvDockInfo.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDockInfo.pas,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** JvDockInfo.pas 21 Jan 2005 09:28:53 -0000 1.33 --- JvDockInfo.pas 29 Jan 2005 06:36:58 -0000 1.34 *************** *** 216,220 **** FDockInfoIni := nil; FDockInfoReg := nil; ! {$ENDIF USEJVCL} FJvDockInfoStyle := isNone; FDataStream := TMemoryStream.Create; --- 216,220 ---- FDockInfoIni := nil; FDockInfoReg := nil; ! {$ENDIF !USEJVCL} FJvDockInfoStyle := isNone; FDataStream := TMemoryStream.Create; Index: JvResources.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvResources.pas,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** JvResources.pas 21 Jan 2005 09:28:59 -0000 1.103 --- JvResources.pas 29 Jan 2005 06:37:02 -0000 1.104 *************** *** 1726,1730 **** {$IFNDEF COMPILER6_UP} // RsEInvalidBoolean = '''%s'' is not a valid Boolean value'; make Delphi 5 compiler happy // andreas ! {$ENDIF COMPILER6_UP} RsEInvalidXMLElementUnexpectedCharacte = 'Invalid XML Element: Unexpected character in property declaration ("%s" found)'; --- 1726,1730 ---- {$IFNDEF COMPILER6_UP} // RsEInvalidBoolean = '''%s'' is not a valid Boolean value'; make Delphi 5 compiler happy // andreas ! {$ENDIF !COMPILER6_UP} RsEInvalidXMLElementUnexpectedCharacte = 'Invalid XML Element: Unexpected character in property declaration ("%s" found)'; *************** *** 2251,2255 **** {$IFNDEF USEJVCL} {$UNDEF UNITVERSIONING} ! {$ENDIF ~USEJVCL} {$IFDEF UNITVERSIONING} --- 2251,2255 ---- {$IFNDEF USEJVCL} {$UNDEF UNITVERSIONING} ! {$ENDIF !USEJVCL} {$IFDEF UNITVERSIONING} Index: JvPickDate.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPickDate.pas,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** JvPickDate.pas 23 Jan 2005 06:31:16 -0000 1.42 --- JvPickDate.pas 29 Jan 2005 06:37:02 -0000 1.43 *************** *** 937,941 **** HorzOffset: Integer; Control, BackPanel: TWinControl; ! {$ENDIF JVCLThemesEnabled} begin inherited Create(AOwner); --- 937,941 ---- HorzOffset: Integer; Control, BackPanel: TWinControl; ! {$ENDIF !JVCLThemesEnabled} begin inherited Create(AOwner); Index: JvDataProvider.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDataProvider.pas,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** JvDataProvider.pas 28 Oct 2004 07:31:06 -0000 1.49 --- JvDataProvider.pas 29 Jan 2005 06:36:57 -0000 1.50 *************** *** 544,548 **** { IInterfaceComponentReference } function GetComponent: TComponent; ! {$ENDIF COMPILER6_UP} { IDataProvider } function GetItems: IJvDataItems; virtual; --- 544,548 ---- { IInterfaceComponentReference } function GetComponent: TComponent; ! {$ENDIF !COMPILER6_UP} { IDataProvider } function GetItems: IJvDataItems; virtual; *************** *** 754,758 **** function GetProviderComp: TComponent; procedure SetProviderComp(Value: TComponent); ! {$ENDIF COMPILER6_UP} protected function _AddRef: Integer; override; stdcall; --- 754,758 ---- function GetProviderComp: TComponent; procedure SetProviderComp(Value: TComponent); ! {$ENDIF !COMPILER6_UP} protected function _AddRef: Integer; override; stdcall; *************** *** 1689,1693 **** {$IFNDEF TYPEINFO_ON} {$TYPEINFO OFF} ! {$ENDIF TYPEINFO_ON} function THackWriter.GetPropPath: string; --- 1689,1693 ---- {$IFNDEF TYPEINFO_ON} {$TYPEINFO OFF} ! {$ENDIF !TYPEINFO_ON} function THackWriter.GetPropPath: string; *************** *** 3334,3338 **** Result := Self; end; ! {$ENDIF COMPILER6_UP} function TJvCustomDataProvider.GetItems: IJvDataItems; --- 3334,3338 ---- Result := Self; end; ! {$ENDIF !COMPILER6_UP} function TJvCustomDataProvider.GetItems: IJvDataItems; *************** *** 3810,3814 **** end; ! {$ENDIF COMPILER6_UP} function TJvDataConsumer._AddRef: Integer; --- 3810,3814 ---- end; ! {$ENDIF !COMPILER6_UP} function TJvDataConsumer._AddRef: Integer; *************** *** 5039,5043 **** {$IFNDEF ViewList_UseFinder} ParIdx: Integer; ! {$ENDIF ViewList_UseFinder} begin {$IFDEF ViewList_UseFinder} --- 5039,5043 ---- {$IFNDEF ViewList_UseFinder} ParIdx: Integer; ! {$ENDIF !ViewList_UseFinder} begin {$IFDEF ViewList_UseFinder} Index: JvFullColorSpaces.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvFullColorSpaces.pas,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** JvFullColorSpaces.pas 21 Jan 2005 09:28:56 -0000 1.10 --- JvFullColorSpaces.pas 29 Jan 2005 06:36:59 -0000 1.11 *************** *** 332,336 **** {$IFNDEF COMPILER6_UP} JclMath, // For EnsureRange ! {$ENDIF COMPILER7_UP} Math; --- 332,336 ---- {$IFNDEF COMPILER6_UP} JclMath, // For EnsureRange ! {$ENDIF !COMPILER6_UP} Math; Index: JvBalloonHint.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBalloonHint.pas,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** JvBalloonHint.pas 15 Dec 2004 07:30:52 -0000 1.32 --- JvBalloonHint.pas 29 Jan 2005 06:36:56 -0000 1.33 *************** *** 359,363 **** end; ! {$ENDIF COMPILER6_UP} function IsWinXP_UP: Boolean; --- 359,363 ---- end; ! {$ENDIF !COMPILER6_UP} function IsWinXP_UP: Boolean; *************** *** 411,415 **** {$IFNDEF COMPILER6_UP} InitD5Controls; ! {$ENDIF COMPILER6_UP} inherited Create(AOwner); ControlStyle := [csCaptureMouse, csClickEvents, csDoubleClicks]; --- 411,415 ---- {$IFNDEF COMPILER6_UP} InitD5Controls; ! {$ENDIF !COMPILER6_UP} inherited Create(AOwner); ControlStyle := [csCaptureMouse, csClickEvents, csDoubleClicks]; *************** *** 1828,1832 **** {$IFNDEF COMPILER6_UP} Invalidate; ! {$ENDIF COMPILER6_UP} end; --- 1828,1832 ---- {$IFNDEF COMPILER6_UP} Invalidate; ! {$ENDIF !COMPILER6_UP} end; Index: JvgCaption.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgCaption.pas,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** JvgCaption.pas 21 Jan 2005 15:05:44 -0000 1.28 --- JvgCaption.pas 29 Jan 2005 06:37:09 -0000 1.29 *************** *** 174,178 **** end; ! {$ENDIF USEJVCL} constructor TJvgCaption.Create(AOwner: TComponent); --- 174,178 ---- end; ! {$ENDIF !USEJVCL} constructor TJvgCaption.Create(AOwner: TComponent); Index: JvDockVCStyle.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDockVCStyle.pas,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** JvDockVCStyle.pas 21 Jan 2005 09:28:54 -0000 1.24 --- JvDockVCStyle.pas 29 Jan 2005 06:36:58 -0000 1.25 *************** *** 66,70 **** {$IFNDEF USEJVCL} function GetControlName: string; override; ! {$ENDIF USEJVCL} procedure SetDockBaseControl(IsCreate: Boolean; DockBaseControl: TJvDockBaseControl); override; --- 66,70 ---- {$IFNDEF USEJVCL} function GetControlName: string; override; ! {$ENDIF !USEJVCL} procedure SetDockBaseControl(IsCreate: Boolean; DockBaseControl: TJvDockBaseControl); override; Index: JvCaptionButton.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCaptionButton.pas,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** JvCaptionButton.pas 21 Jan 2005 09:28:50 -0000 1.45 --- JvCaptionButton.pas 29 Jan 2005 06:36:56 -0000 1.46 *************** *** 70,74 **** {$EXTERNALSYM AC_SRC_ALPHA} AC_SRC_ALPHA = $01; ! {$ENDIF COMPILER6_UP} type --- 70,74 ---- {$EXTERNALSYM AC_SRC_ALPHA} AC_SRC_ALPHA = $01; ! {$ENDIF !COMPILER6_UP} type *************** *** 317,321 **** {$IFNDEF COMPILER7_UP} TmSchema, ! {$ENDIF COMPILER7_UP} JvJVCLUtils, {$ENDIF JVCLThemesEnabled} --- 317,321 ---- {$IFNDEF COMPILER7_UP} TmSchema, ! {$ENDIF !COMPILER7_UP} JvJVCLUtils, {$ENDIF JVCLThemesEnabled} Index: JvSyncSplitter.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSyncSplitter.pas,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** JvSyncSplitter.pas 1 Sep 2004 15:06:51 -0000 1.15 --- JvSyncSplitter.pas 29 Jan 2005 06:37:03 -0000 1.16 *************** *** 202,206 **** end; end; ! {$ENDIF VisualCLX} {$IFDEF UNITVERSIONING} --- 202,206 ---- end; end; ! {$ENDIF VisualCLX} {$IFDEF UNITVERSIONING} Index: JvTFDays.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFDays.pas,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** JvTFDays.pas 21 Jan 2005 09:29:00 -0000 1.43 --- JvTFDays.pas 29 Jan 2005 06:37:03 -0000 1.44 *************** *** 1785,1789 **** '"%s" already exists'; RsEATimeBlockWithTheNamesDoesNotExist = 'A time block with the name "%s" does not exist'; ! {$ENDIF USEJVCL} //Type --- 1785,1789 ---- '"%s" already exists'; RsEATimeBlockWithTheNamesDoesNotExist = 'A time block with the name "%s" does not exist'; ! {$ENDIF !USEJVCL} //Type *************** *** 5196,5200 **** end; } ! {$ENDIF Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} --- 5196,5200 ---- end; } ! {$ENDIF !Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} *************** *** 6423,6427 **** end; } ! {$ENDIF Jv_TIMEBLOCKS} procedure TJvTFDays.DrawAppts(ACanvas: TCanvas; DrawAll: Boolean); --- 6423,6427 ---- end; } ! {$ENDIF !Jv_TIMEBLOCKS} procedure TJvTFDays.DrawAppts(ACanvas: TCanvas; DrawAll: Boolean); *************** *** 7981,7985 **** end; } ! {$ENDIF Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} --- 7981,7985 ---- end; } ! {$ENDIF !Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} *************** *** 8361,8365 **** end; } ! {$ENDIF Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} --- 8361,8365 ---- end; } ! {$ENDIF !Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} *************** *** 8510,8514 **** end; } ! {$ENDIF Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} --- 8510,8514 ---- end; } ! {$ENDIF !Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} *************** *** 8883,8887 **** end; } ! {$ENDIF Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} --- 8883,8887 ---- end; } ! {$ENDIF !Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} *************** *** 9079,9083 **** end; } ! {$ENDIF Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} --- 9079,9083 ---- end; } ! {$ENDIF !Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} *************** *** 9209,9213 **** end; } ! {$ENDIF Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} --- 9209,9213 ---- end; } ! {$ENDIF !Jv_TIMEBLOCKS} {$IFDEF Jv_TIMEBLOCKS} Index: JvInspector.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvInspector.pas,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** JvInspector.pas 21 Jan 2005 21:04:27 -0000 1.135 --- JvInspector.pas 29 Jan 2005 06:36:59 -0000 1.136 *************** *** 5557,5561 **** {$IFNDEF COMPILER6_UP} J: Integer; ! {$ENDIF COMPILER6_UP} begin TempList := TList.Create; --- 5557,5561 ---- {$IFNDEF COMPILER6_UP} J: Integer; ! {$ENDIF !COMPILER6_UP} begin TempList := TList.Create; Index: JvInterpreter_SysUtils.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvInterpreter_SysUtils.pas,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** JvInterpreter_SysUtils.pas 5 Jan 2005 15:40:14 -0000 1.20 --- JvInterpreter_SysUtils.pas 29 Jan 2005 06:37:00 -0000 1.21 *************** *** 256,260 **** end; ! {$ENDIF COMPILER6_UP} { function UpperCase(const S: string): string; } --- 256,260 ---- end; ! {$ENDIF !COMPILER6_UP} { function UpperCase(const S: string): string; } *************** *** 1816,1820 **** { EStackOverflow } AddClass(cSysUtils, EStackOverflow, 'EStackOverflow'); ! {$ENDIF COMPILER6_UP} { EControlC } AddClass(cSysUtils, EControlC, 'EControlC'); --- 1816,1820 ---- { EStackOverflow } AddClass(cSysUtils, EStackOverflow, 'EStackOverflow'); ! {$ENDIF !COMPILER6_UP} { EControlC } AddClass(cSysUtils, EControlC, 'EControlC'); *************** *** 1833,1837 **** { EAbstractError } AddClass(cSysUtils, EAbstractError, 'EAbstractError'); ! {$ENDIF PC_MAPPED_EXCEPTIONS} { EIntfCastError } AddClass(cSysUtils, EIntfCastError, 'EIntfCastError'); --- 1833,1837 ---- { EAbstractError } AddClass(cSysUtils, EAbstractError, 'EAbstractError'); ! {$ENDIF !PC_MAPPED_EXCEPTIONS} { EIntfCastError } AddClass(cSysUtils, EIntfCastError, 'EIntfCastError'); *************** *** 1859,1863 **** AddFunction(cSysUtils, 'AssignStr', JvInterpreter_AssignStr, 2, [varByRef, varEmpty], varEmpty); AddFunction(cSysUtils, 'AppendStr', JvInterpreter_AppendStr, 2, [varByRef, varEmpty], varEmpty); ! {$ENDIF COMPILER6_UP} AddFunction(cSysUtils, 'UpperCase', JvInterpreter_UpperCase, 1, [varEmpty], varEmpty); AddFunction(cSysUtils, 'LowerCase', JvInterpreter_LowerCase, 1, [varEmpty], varEmpty); --- 1859,1863 ---- AddFunction(cSysUtils, 'AssignStr', JvInterpreter_AssignStr, 2, [varByRef, varEmpty], varEmpty); AddFunction(cSysUtils, 'AppendStr', JvInterpreter_AppendStr, 2, [varByRef, varEmpty], varEmpty); ! {$ENDIF !COMPILER6_UP} AddFunction(cSysUtils, 'UpperCase', JvInterpreter_UpperCase, 1, [varEmpty], varEmpty); AddFunction(cSysUtils, 'LowerCase', JvInterpreter_LowerCase, 1, [varEmpty], varEmpty); *************** *** 2065,2069 **** {$IFNDEF COMPILER8_UP} AddConst(cSysUtils, 'faVolumeID', Ord(faVolumeID)); // deprecated ! {$ENDIF ~COMPILER8_UP} AddConst(cSysUtils, 'faDirectory', Ord(faDirectory)); AddConst(cSysUtils, 'faArchive', Ord(faArchive)); --- 2065,2069 ---- {$IFNDEF COMPILER8_UP} AddConst(cSysUtils, 'faVolumeID', Ord(faVolumeID)); // deprecated ! {$ENDIF !COMPILER8_UP} AddConst(cSysUtils, 'faDirectory', Ord(faDirectory)); AddConst(cSysUtils, 'faArchive', Ord(faArchive)); Index: JvUrlGrabbers.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUrlGrabbers.pas,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** JvUrlGrabbers.pas 22 Jan 2005 13:28:53 -0000 1.40 --- JvUrlGrabbers.pas 29 Jan 2005 06:37:09 -0000 1.41 *************** *** 256,260 **** function FtpGetFileSize(hFile: HINTERNET; lpdwFileSizeHigh: LPDWORD): DWORD; stdcall; external 'wininet.dll' name 'FtpGetFileSize'; ! {$ENDIF COMPILER6_UP} // global download callback --- 256,260 ---- function FtpGetFileSize(hFile: HINTERNET; lpdwFileSizeHigh: LPDWORD): DWORD; stdcall; external 'wininet.dll' name 'FtpGetFileSize'; ! {$ENDIF !COMPILER6_UP} // global download callback Index: JvPageListTreeView.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPageListTreeView.pas,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** JvPageListTreeView.pas 9 Sep 2004 22:50:35 -0000 1.41 --- JvPageListTreeView.pas 29 Jan 2005 06:37:01 -0000 1.42 *************** *** 90,94 **** FPageListComponent: TComponent; procedure SetPageListComponent(const Value: TComponent); ! {$ENDIF COMPILER6_UP} procedure SetPageDefault(const Value: Integer); procedure SetLinks(const Value: TJvPageLinks); --- 90,94 ---- FPageListComponent: TComponent; procedure SetPageListComponent(const Value: TComponent); ! {$ENDIF !COMPILER6_UP} procedure SetPageDefault(const Value: Integer); procedure SetLinks(const Value: TJvPageLinks); *************** *** 420,424 **** {$IFNDEF COMPILER6_UP} JvResources, ! {$ENDIF COMPLER6_UP} Forms; --- 420,424 ---- {$IFNDEF COMPILER6_UP} JvResources, ! {$ENDIF !COMPILER6_UP} Forms; *************** *** 519,523 **** // TreeNodes are destroyed by TCustomTreeview in D6 and above!!! FreeAndNil(FItems); ! {$ENDIF COMPILER6_UP} inherited Destroy; end; --- 519,523 ---- // TreeNodes are destroyed by TCustomTreeview in D6 and above!!! FreeAndNil(FItems); ! {$ENDIF !COMPILER6_UP} inherited Destroy; end; Index: Jvg3DColors.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/Jvg3DColors.pas,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Jvg3DColors.pas 21 Jan 2005 15:05:43 -0000 1.19 --- Jvg3DColors.pas 29 Jan 2005 06:37:09 -0000 1.20 *************** *** 85,89 **** resourcestring RsEOnlyOneInstanceOfTJvg3DLocalColors = 'Cannot create more than one instance of TJvg3DLocalColors component'; ! {$ENDIF USEJVCL} //=== { TJvg3DLocalColors } ================================================== --- 85,89 ---- resourcestring RsEOnlyOneInstanceOfTJvg3DLocalColors = 'Cannot create more than one instance of TJvg3DLocalColors component'; ! {$ENDIF !USEJVCL} //=== { TJvg3DLocalColors } ================================================== Index: JvDBCombobox.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDBCombobox.pas,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** JvDBCombobox.pas 1 Sep 2004 15:06:35 -0000 1.18 --- JvDBCombobox.pas 29 Jan 2005 06:36:57 -0000 1.19 *************** *** 59,63 **** {$IFNDEF COMPILER6_UP} procedure SetItems(const Value: TStrings); ! {$ENDIF COMPILER6_UP} procedure SetReadOnly(Value: Boolean); procedure UpdateData(Sender: TObject); --- 59,63 ---- {$IFNDEF COMPILER6_UP} procedure SetItems(const Value: TStrings); ! {$ENDIF !COMPILER6_UP} procedure SetReadOnly(Value: Boolean); procedure UpdateData(Sender: TObject); Index: JvJVCLUtils.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJVCLUtils.pas,v retrieving revision 1.157 retrieving revision 1.158 diff -C2 -d -r1.157 -r1.158 *** JvJVCLUtils.pas 21 Jan 2005 09:28:57 -0000 1.157 --- JvJVCLUtils.pas 29 Jan 2005 06:37:01 -0000 1.158 *************** *** 670,674 **** function JvMakeObjectInstance(Method: TWndMethod): Pointer; procedure JvFreeObjectInstance(ObjectInstance: Pointer); ! {$ENDIF MSWINDOWS} function GetAppHandle: HWND; --- 670,674 ---- function JvMakeObjectInstance(Method: TWndMethod): Pointer; procedure JvFreeObjectInstance(ObjectInstance: Pointer); ! {$ENDIF MSWINDOWS} function GetAppHandle: HWND; Index: JvTFSparseMatrix.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFSparseMatrix.pas,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** JvTFSparseMatrix.pas 21 Jan 2005 09:29:01 -0000 1.15 --- JvTFSparseMatrix.pas 29 Jan 2005 06:37:04 -0000 1.16 *************** *** 77,81 **** resourcestring RsEMatrixMustBeEmpty = 'Matrix must be empty before setting null value'; ! {$ENDIF USEJVCL} destructor TJvTFSparseMatrix.Destroy; --- 77,81 ---- resourcestring RsEMatrixMustBeEmpty = 'Matrix must be empty before setting null value'; ! {$ENDIF !USEJVCL} destructor TJvTFSparseMatrix.Destroy; Index: JvUIBSQLParser.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBSQLParser.pas,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** JvUIBSQLParser.pas 5 Jan 2005 10:32:35 -0000 1.14 --- JvUIBSQLParser.pas 29 Jan 2005 06:37:06 -0000 1.15 *************** *** 41711,41715 **** {$else} yydebug := false; ! {$endif} parse: --- 41711,41715 ---- {$else} yydebug := false; ! {$ENDIF yydebug} parse: Index: JvTrayIcon.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTrayIcon.pas,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** JvTrayIcon.pas 26 Sep 2004 23:48:30 -0000 1.35 --- JvTrayIcon.pas 29 Jan 2005 06:37:05 -0000 1.36 *************** *** 360,364 **** Result := Trunc(86400 * (FTime - Now)); end; ! {$ENDIF COMPILER6_UP} function IsApplicationMinimized: Boolean; --- 360,364 ---- Result := Trunc(86400 * (FTime - Now)); end; ! {$ENDIF !COMPILER6_UP} function IsApplicationMinimized: Boolean; Index: JvToolBar.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvToolBar.pas,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** JvToolBar.pas 1 Sep 2004 15:06:53 -0000 1.22 --- JvToolBar.pas 29 Jan 2005 06:37:05 -0000 1.23 *************** *** 44,48 **** {$IFNDEF COMPILER6_UP} FMenu: TMainMenu; ! {$ENDIF COMPILER6_UP} FTempMenu: TJvPopupMenu; FButtonMenu: TMenuItem; --- 44,48 ---- {$IFNDEF COMPILER6_UP} FMenu: TMainMenu; ! {$ENDIF !COMPILER6_UP} FTempMenu: TJvPopupMenu; FButtonMenu: TMenuItem; *************** *** 56,60 **** {$IFNDEF COMPILER6_UP} procedure BuildButtons(AMenu: TMainMenu); ! {$ENDIF COMPILER6_UP} protected procedure AdjustSize; override; --- 56,60 ---- {$IFNDEF COMPILER6_UP} procedure BuildButtons(AMenu: TMainMenu); ! {$ENDIF !COMPILER6_UP} protected procedure AdjustSize; override; *************** *** 145,149 **** Buttons[I].MenuItem := FMenu.Items[I]; end; ! {$ENDIF COMPILER6_UP} procedure TJvToolBar.SetMenu(const Value: TMainMenu); --- 145,149 ---- Buttons[I].MenuItem := FMenu.Items[I]; end; ! {$ENDIF !COMPILER6_UP} procedure TJvToolBar.SetMenu(const Value: TMainMenu); Index: JvgReport.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgReport.pas,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** JvgReport.pas 21 Jan 2005 15:05:47 -0000 1.34 --- JvgReport.pas 29 Jan 2005 06:37:09 -0000 1.35 *************** *** 682,686 **** end; ! {$ENDIF USEJVCL} procedure TJvgReportItem.SetSelected(Value: Boolean); --- 682,686 ---- end; ! {$ENDIF !USEJVCL} procedure TJvgReportItem.SetSelected(Value: Boolean); Index: JvControlBar.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvControlBar.pas,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** JvControlBar.pas 1 Sep 2004 15:06:34 -0000 1.21 --- JvControlBar.pas 29 Jan 2005 06:36:56 -0000 1.22 *************** *** 161,165 **** {$IFNDEF COMPILER6_UP} Checked := not Checked; ! {$ENDIF COMPILER6_UP} if (Tag >= 0) and (Tag < FList.Count) then TControl(FList[Tag]).Visible := Checked; --- 161,165 ---- {$IFNDEF COMPILER6_UP} Checked := not Checked; ! {$ENDIF !COMPILER6_UP} if (Tag >= 0) and (Tag < FList.Count) then TControl(FList[Tag]).Visible := Checked; Index: JvTFManager.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFManager.pas,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** JvTFManager.pas 21 Jan 2005 09:29:00 -0000 1.42 --- JvTFManager.pas 29 Jan 2005 06:37:04 -0000 1.43 *************** *** 1088,1092 **** RsEInvalidFooterHeightd = 'Invalid Footer Height (%d)'; RsEInvalidHeaderHeightd = 'Invalid Header Height (%d)'; ! {$ENDIF USEJVCL} function AdjustEndTime(ATime: TTime): TTime; --- 1088,1092 ---- RsEInvalidFooterHeightd = 'Invalid Footer Height (%d)'; RsEInvalidHeaderHeightd = 'Invalid Header Height (%d)'; ! {$ENDIF !USEJVCL} function AdjustEndTime(ATime: TTime): TTime; Index: JvCsvData.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCsvData.pas,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** JvCsvData.pas 21 Jan 2005 09:28:51 -0000 1.98 --- JvCsvData.pas 29 Jan 2005 06:36:56 -0000 1.99 *************** *** 173,177 **** {$IFNDEF COMPILER6_UP} PWordBool = ^WordBool; ! {$ENDIF COMPILER6_UP} EJvCsvDataSetError = class(EDatabaseError); // Subclass DB.EDatabaseError so we can work nicely with existing Delphi apps. --- 173,177 ---- {$IFNDEF COMPILER6_UP} PWordBool = ^WordBool; ! {$ENDIF !COMPILER6_UP} EJvCsvDataSetError = class(EDatabaseError); // Subclass DB.EDatabaseError so we can work nicely with existing Delphi apps. Index: JvUIBLib.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBLib.pas,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** JvUIBLib.pas 5 Jan 2005 10:32:34 -0000 1.33 --- JvUIBLib.pas 29 Jan 2005 06:37:05 -0000 1.34 *************** *** 108,115 **** csWIN1256, csWIN1257, csISO8859_3, csISO8859_4, csISO8859_5, csISO8859_6, csISO8859_7, csISO8859_8, csISO8859_9, csISO8859_13 ! {$ENDIF} {$IFDEF IB71_UP} ,csISO8859_15 ,csKOI8R ! {$ENDIF} ); --- 108,115 ---- csWIN1256, csWIN1257, csISO8859_3, csISO8859_4, csISO8859_5, csISO8859_6, csISO8859_7, csISO8859_8, csISO8859_9, csISO8859_13 ! {$ENDIF FB15_UP} {$IFDEF IB71_UP} ,csISO8859_15 ,csKOI8R ! {$ENDIF IB71_UP} ); *************** *** 125,137 **** 'WIN1255', 'WIN1256', 'WIN1257', 'ISO8859_3', 'ISO8859_4', 'ISO8859_5', 'ISO8859_6', 'ISO8859_7', 'ISO8859_8', 'ISO8859_9', 'ISO8859_13' ! {$ENDIF} {$IFDEF IB71_UP} ,'ISO8859_15', 'KOI8R' ! {$ENDIF} ); {$IFDEF DLLREGISTRY} FBINSTANCES = 'SOFTWARE\Firebird Project\Firebird Server\Instances'; ! {$ENDIF} function StrToCharacterSet(const CharacterSet: string): TCharacterSet; --- 125,137 ---- 'WIN1255', 'WIN1256', 'WIN1257', 'ISO8859_3', 'ISO8859_4', 'ISO8859_5', 'ISO8859_6', 'ISO8859_7', 'ISO8859_8', 'ISO8859_9', 'ISO8859_13' ! {$ENDIF FB15_UP} {$IFDEF IB71_UP} ,'ISO8859_15', 'KOI8R' ! {$ENDIF IB71_UP} ); {$IFDEF DLLREGISTRY} FBINSTANCES = 'SOFTWARE\Firebird Project\Firebird Server\Instances'; ! {$ENDIF DLLREGISTRY} function StrToCharacterSet(const CharacterSet: string): TCharacterSet; *************** *** 160,164 **** {$ELSE} MaxParamLength = 125; ! {$ENDIF} type --- 160,164 ---- {$ELSE} MaxParamLength = 125; ! {$ENDIF IB7_UP} type *************** *** 169,173 **** {$IFDEF IB7_UP} SqlPrecision : Smallint; ! {$ENDIF} SqlSubType : Smallint; SqlLen : Smallint; --- 169,173 ---- {$IFDEF IB7_UP} SqlPrecision : Smallint; ! {$ENDIF IB7_UP} SqlSubType : Smallint; SqlLen : Smallint; *************** *** 219,223 **** {$IFDEF FB15_UP} ,stSavePoint // user_savepoint | undo_savepoint SAVEPOINT | ROLLBACK [WORK] TO ! {$ENDIF} ); --- 219,223 ---- {$IFDEF FB15_UP} ,stSavePoint // user_savepoint | undo_savepoint SAVEPOINT | ROLLBACK [WORK] TO ! {$ENDIF FB15_UP} ); *************** *** 565,569 **** TArrayDesc = TISCArrayDesc; TBlobDesc = TISCBlobDesc; ! {$ENDIF} TUIBLibrary = class; --- 565,569 ---- TArrayDesc = TISCArrayDesc; TBlobDesc = TISCBlobDesc; ! {$ENDIF IB7_UP} TUIBLibrary = class; *************** *** 680,684 **** procedure SavepointRollback(var TrHandle: IscTrHandle; const Name: string; Option: Word); procedure SavepointStart(var TrHandle: IscTrHandle; const Name: string); ! {$ENDIF} property SegMentSize: Word read GetSegmentSize write SetSegmentSize; --- 680,684 ---- procedure SavepointRollback(var TrHandle: IscTrHandle; const Name: string; Option: Word); procedure SavepointStart(var TrHandle: IscTrHandle; const Name: string); ! {$ENDIF IB71_UP} property SegMentSize: Word read GetSegmentSize write SetSegmentSize; *************** *** 856,874 **** ,(Name: 'gbak_ods_version'; ParamType: prCard) // ?? ,(Name: 'gbak_ods_minor_version'; ParamType: prCard) // ?? ! {$ENDIF} {$IFDEF YF867_UP} ,(Name: 'numeric_scale_reduction';ParamType: prNone) ! {$ENDIF} {$IFDEF IB7_UP} ,(Name: 'set_group_commit'; ParamType: prNone) // ?? ! {$ENDIF} {$IFDEF IB71_UP} ,(Name: 'gbak_validate'; ParamType: prNone) // ?? ! {$ENDIF} {$IFDEF FB103_UP} ,(Name: 'set_db_charset'; ParamType: prStrg) // ok ! {$ENDIF} ); --- 856,874 ---- ,(Name: 'gbak_ods_version'; ParamType: prCard) // ?? ,(Name: 'gbak_ods_minor_version'; ParamType: prCard) // ?? ! {$ENDIF IB65ORYF867} {$IFDEF YF867_UP} ,(Name: 'numeric_scale_reduction';ParamType: prNone) ! {$ENDIF YF867_UP} {$IFDEF IB7_UP} ,(Name: 'set_group_commit'; ParamType: prNone) // ?? ! {$ENDIF IB7_UP} {$IFDEF IB71_UP} ,(Name: 'gbak_validate'; ParamType: prNone) // ?? ! {$ENDIF IB71_UP} {$IFDEF FB103_UP} ,(Name: 'set_db_charset'; ParamType: prStrg) // ok ! {$ENDIF FB103_UP} ); *************** *** 876,880 **** {$IFNDEF COMPILER6_UP} function TryStrToInt(const S: string; out Value: Integer): Boolean; ! {$ENDIF} implementation --- 876,880 ---- {$IFNDEF COMPILER6_UP} function TryStrToInt(const S: string; out Value: Integer): Boolean; ! {$ENDIF !COMPILER6_UP} implementation *************** *** 911,915 **** end; ! {$ENDIF} const --- 911,915 ---- end; ! {$ENDIF !COMPILER6_UP} const *************** *** 1026,1030 **** Size: Cardinal; HR: Integer; ! {$ENDIF} begin {$IFDEF DLLREGISTRY} --- 1026,1030 ---- Size: Cardinal; HR: Integer; ! {$ENDIF DLLREGISTRY} begin {$IFDEF DLLREGISTRY} *************** *** 1043,1047 **** end; if (HR <> ERROR_SUCCESS) then ! {$ENDIF} Result := GDS32DLL; end; --- 1043,1047 ---- end; if (HR <> ERROR_SUCCESS) then ! {$ENDIF DLLREGISTRY} Result := GDS32DLL; end; *************** *** 1652,1656 **** CheckUIBApiCall(isc_array_lookup_bounds(@FStatusVector, @DBHandle, @TransHandle, PChar(RelationName), PChar(FieldName), @Result)); ! {$ENDIF} finally UnLock; --- 1652,1656 ---- CheckUIBApiCall(isc_array_lookup_bounds(@FStatusVector, @DBHandle, @TransHandle, PChar(RelationName), PChar(FieldName), @Result)); ! {$ENDIF IB7_UP} finally UnLock; *************** *** 1669,1673 **** CheckUIBApiCall(isc_array_get_slice(@FStatusVector, @DBHandle, @TransHandle, @ArrayId, @desc, DestArray, @SliceLength)); ! {$ENDIF} finally UnLock; --- 1669,1673 ---- CheckUIBApiCall(isc_array_get_slice(@FStatusVector, @DBHandle, @TransHandle, @ArrayId, @desc, DestArray, @SliceLength)); ! {$ENDIF IB7_UP} finally UnLock; *************** *** 1686,1690 **** CheckUIBApiCall(isc_array_put_slice(@FStatusVector, @DBHandle, @TransHandle, @ArrayId, @desc, DestArray, @SliceLength)); ! {$ENDIF} finally UnLock; --- 1686,1690 ---- CheckUIBApiCall(isc_array_put_slice(@FStatusVector, @DBHandle, @TransHandle, @ArrayId, @desc, DestArray, @SliceLength)); ! {$ENDIF IB7_UP} finally UnLock; *************** *** 1899,1903 **** {$ELSE} isc_blob_default_desc(@Desc, PChar(RelationName), PChar(FieldName)); ! {$ENDIF} finally UnLock; --- 1899,1903 ---- {$ELSE} isc_blob_default_desc(@Desc, PChar(RelationName), PChar(FieldName)); ! {$ENDIF IB7_UP} finally UnLock; *************** *** 2191,2195 **** end; end; ! {$ENDIF} function TUIBLibrary.GetSegmentSize: Word; --- 2191,2195 ---- end; end; ! {$ENDIF IB71_UP} function TUIBLibrary.GetSegmentSize: Word; *************** *** 2259,2264 **** ((31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31), (31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)); ! {$ENDIF} ! {$ENDIF} procedure EncodeDate(const Year: Smallint; const Month: Word; Day: Word; out Date: Integer); --- 2259,2264 ---- ((31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31), (31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)); ! {$ENDIF LINUX} ! {$ENDIF FPC} procedure EncodeDate(const Year: Smallint; const Month: Word; Day: Word; out Date: Integer); *************** *** 2412,2416 **** {$ELSE} v := Hour * 36000000 + Minute * 600000 + Second * 10000 + Fractions * 10; ! {$ENDIF} end; --- 2412,2416 ---- {$ELSE} v := Hour * 36000000 + Minute * 600000 + Second * 10000 + Fractions * 10; ! {$ENDIF FPC} end; *************** *** 2546,2550 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; --- 2546,2550 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; *************** *** 2589,2593 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; --- 2589,2593 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; *************** *** 2632,2636 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; --- 2632,2636 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; *************** *** 2675,2679 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; --- 2675,2679 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; *************** *** 2718,2722 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; --- 2718,2722 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; *************** *** 2763,2767 **** {$IFDEF IB7_UP} SQL_BOOLEAN : Result := BoolToStr(PSmallint(sqldata)^ = 1); ! {$ENDIF} SQL_SHORT : Result := IntToStr(PSmallint(sqldata)^); SQL_INT64 : Result := IntToStr(PInt64(sqldata)^); --- 2763,2767 ---- {$IFDEF IB7_UP} SQL_BOOLEAN : Result := BoolToStr(PSmallint(sqldata)^ = 1); ! {$ENDIF IB7_UP} SQL_SHORT : Result := IntToStr(PSmallint(sqldata)^); SQL_INT64 : Result := IntToStr(PInt64(sqldata)^); *************** *** 2894,2898 **** {$IFDEF IB7_UP} SQL_BOOLEAN : Result := PSmallint(sqldata)^ = 1; ! {$ENDIF} SQL_SHORT : Result := PSmallint(sqldata)^; {$IFDEF COMPILER6_UP} --- 2894,2898 ---- {$IFDEF IB7_UP} SQL_BOOLEAN : Result := PSmallint(sqldata)^ = 1; ! {$ENDIF IB7_UP} SQL_SHORT : Result := PSmallint(sqldata)^; {$IFDEF COMPILER6_UP} *************** *** 2900,2904 **** {$ELSE} SQL_INT64 : Result := Integer(PInt64(sqldata)^); ! {$ENDIF} SQL_TEXT : Result := DecodeString(SQL_TEXT, Index); SQL_VARYING : Result := DecodeString(SQL_VARYING, Index); --- 2900,2904 ---- {$ELSE} SQL_INT64 : Result := Integer(PInt64(sqldata)^); ! {$ENDIF COMPILER6_UP} SQL_TEXT : Result := DecodeString(SQL_TEXT, Index); SQL_VARYING : Result := DecodeString(SQL_VARYING, Index); *************** *** 3041,3045 **** if (FXSQLDA.sqlvar[i].sqlind <> nil) then inc(Integer(FXSQLDA.sqlvar[i].sqlind), Integer(FDataBuffer)); ! {$ENDIF} end; end; --- 3041,3045 ---- if (FXSQLDA.sqlvar[i].sqlind <> nil) then inc(Integer(FXSQLDA.sqlvar[i].sqlind), Integer(FDataBuffer)); ! {$ENDIF FPC} end; end; *************** *** 3270,3274 **** {$IFDEF IB7_UP} SQL_BOOLEAN : Result := BoolToStr(PSmallint(sqldata)^ = 1); ! {$ENDIF} SQL_SHORT : Result := IntToStr(PSmallint(sqldata)^); SQL_INT64 : Result := IntToStr(PInt64(sqldata)^); --- 3270,3274 ---- {$IFDEF IB7_UP} SQL_BOOLEAN : Result := BoolToStr(PSmallint(sqldata)^ = 1); ! {$ENDIF IB7_UP} SQL_SHORT : Result := IntToStr(PSmallint(sqldata)^); SQL_INT64 : Result := IntToStr(PInt64(sqldata)^); *************** *** 3316,3320 **** {$IFDEF IB7_UP} SQL_BOOLEAN : Result := BoolToStr(PSmallint(sqldata)^ = 1); ! {$ENDIF} SQL_SHORT : Result := IntToStr(PSmallint(sqldata)^); SQL_INT64 : Result := IntToStr(PInt64(sqldata)^); --- 3316,3320 ---- {$IFDEF IB7_UP} SQL_BOOLEAN : Result := BoolToStr(PSmallint(sqldata)^ = 1); ! {$ENDIF IB7_UP} SQL_SHORT : Result := IntToStr(PSmallint(sqldata)^); SQL_INT64 : Result := IntToStr(PInt64(sqldata)^); *************** *** 3366,3370 **** {$IFDEF IB7_UP} SQL_BOOLEAN : Result := WordBool(PSmallint(sqldata)^); ! {$ENDIF} SQL_SHORT : Result := PSmallint(sqldata)^; {$IFDEF COMPILER6_UP} --- 3366,3370 ---- {$IFDEF IB7_UP} SQL_BOOLEAN : Result := WordBool(PSmallint(sqldata)^); ! {$ENDIF IB7_UP} SQL_SHORT : Result := PSmallint(sqldata)^; {$IFDEF COMPILER6_UP} *************** *** 3372,3376 **** {$ELSE} SQL_INT64 : Result := Integer(PInt64(sqldata)^); ! {$ENDIF} SQL_TEXT : Result := DecodeString(SQL_TEXT, Index); SQL_VARYING : Result := DecodeString(SQL_VARYING, Index); --- 3372,3376 ---- {$ELSE} SQL_INT64 : Result := Integer(PInt64(sqldata)^); ! {$ENDIF COMPILER6_UP} SQL_TEXT : Result := DecodeString(SQL_TEXT, Index); SQL_VARYING : Result := DecodeString(SQL_VARYING, Index); *************** *** 3424,3428 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; --- 3424,3428 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; *************** *** 3483,3487 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; --- 3483,3487 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; *************** *** 3528,3532 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : Result := PSmallint(sqldata)^ <> 0; SQL_INT64 : Result := PInt64(sqldata)^ <> 0; --- 3528,3532 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : Result := PSmallint(sqldata)^ <> 0; SQL_INT64 : Result := PInt64(sqldata)^ <> 0; *************** *** 3589,3593 **** {$IFDEF IB7_UP} SQL_BOOLEAN : Result := BoolToStr(PSmallint(sqldata)^ = 1); ! {$ENDIF} SQL_SHORT : Result := IntToStr(PSmallint(sqldata)^); SQL_INT64 : Result := IntToStr(PInt64(sqldata)^); --- 3589,3593 ---- {$IFDEF IB7_UP} SQL_BOOLEAN : Result := BoolToStr(PSmallint(sqldata)^ = 1); ! {$ENDIF IB7_UP} SQL_SHORT : Result := IntToStr(PSmallint(sqldata)^); SQL_INT64 : Result := IntToStr(PInt64(sqldata)^); *************** *** 3631,3635 **** {$IFDEF IB7_UP} SQL_BOOLEAN : Result := uftBoolean; ! {$ENDIF} else Result := uftUnKnown; --- 3631,3635 ---- {$IFDEF IB7_UP} SQL_BOOLEAN : Result := uftBoolean; ! {$ENDIF IB7_UP} else Result := uftUnKnown; *************** *** 3669,3673 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; --- 3669,3673 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; *************** *** 3718,3722 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; --- 3718,3722 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : Result := PSmallint(sqldata)^; SQL_INT64 : Result := PInt64(sqldata)^; *************** *** 3754,3758 **** @@Exit: end; ! {$ENDIF} begin inherited Create; --- 3754,3758 ---- @@Exit: end; ! {$ENDIF FPC} begin inherited Create; *************** *** 3820,3824 **** {$IFDEF IB7_UP} uftBoolean : SetFieldType(AddField(name), SizeOf(Smallint) , SQL_BOOLEAN + 1, 0); ! {$ENDIF} end; end; --- 3820,3824 ---- {$IFDEF IB7_UP} uftBoolean : SetFieldType(AddField(name), SizeOf(Smallint) , SQL_BOOLEAN + 1, 0); ! {$ENDIF IB7_UP} end; end; *************** *** 3878,3882 **** result := c^; end; ! {$ENDIF} begin Clear; --- 3878,3882 ---- result := c^; end; ! {$ENDIF FPC} begin Clear; *************** *** 4434,4438 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : PSmallint(sqldata)^ := Trunc(Value); SQL_INT64 : PInt64(sqldata)^ := Trunc(Value); --- 4434,4438 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : PSmallint(sqldata)^ := Trunc(Value); SQL_INT64 : PInt64(sqldata)^ := Trunc(Value); *************** *** 4476,4480 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : PSmallint(sqldata)^ := Value; SQL_INT64 : PInt64(sqldata)^ := Value; --- 4476,4480 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : PSmallint(sqldata)^ := Value; SQL_INT64 : PInt64(sqldata)^ := Value; *************** *** 4518,4522 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : PSmallint(sqldata)^ := Value; SQL_INT64 : PInt64(sqldata)^ := Value; --- 4518,4522 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : PSmallint(sqldata)^ := Value; SQL_INT64 : PInt64(sqldata)^ := Value; *************** *** 4538,4542 **** {$ELSE} SetFieldType(Index, sizeof(Smallint), SQL_SHORT + 1); ! {$ENDIF} with FXSQLDA.sqlvar[Index] do begin --- 4538,4542 ---- {$ELSE} SetFieldType(Index, sizeof(Smallint), SQL_SHORT + 1); ! {$ENDIF IB7_UP} with FXSQLDA.sqlvar[Index] do begin *************** *** 4562,4566 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : PSmallint(sqldata)^ := ord(Value); SQL_INT64 : PInt64(sqldata)^ := ord(Value); --- 4562,4566 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : PSmallint(sqldata)^ := ord(Value); SQL_INT64 : PInt64(sqldata)^ := ord(Value); *************** *** 4604,4608 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : PSmallint(sqldata)^ := Value; SQL_INT64 : PInt64(sqldata)^ := Value; --- 4604,4608 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : PSmallint(sqldata)^ := Value; SQL_INT64 : PInt64(sqldata)^ := Value; *************** *** 4646,4650 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : PSmallint(sqldata)^ := Trunc(Value); SQL_INT64 : PInt64(sqldata)^ := Trunc(Value); --- 4646,4650 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : PSmallint(sqldata)^ := Trunc(Value); SQL_INT64 : PInt64(sqldata)^ := Trunc(Value); *************** *** 4688,4692 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : PSmallint(sqldata)^ := Value; SQL_INT64 : PInt64(sqldata)^ := Value; --- 4688,4692 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : PSmallint(sqldata)^ := Value; SQL_INT64 : PInt64(sqldata)^ := Value; *************** *** 4731,4735 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : PSmallint(sqldata)^ := Trunc(StrToFloat(Value)); SQL_INT64 : PInt64(sqldata)^ := Trunc(StrToFloat(Value)); --- 4731,4735 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : PSmallint(sqldata)^ := Trunc(StrToFloat(Value)); SQL_INT64 : PInt64(sqldata)^ := Trunc(StrToFloat(Value)); *************** *** 4776,4780 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : PSmallint(sqldata)^ := Trunc(StrToFloat(Value)); SQL_INT64 : PInt64(sqldata)^ := Trunc(StrToFloat(Value)); --- 4776,4780 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : PSmallint(sqldata)^ := Trunc(StrToFloat(Value)); SQL_INT64 : PInt64(sqldata)^ := Trunc(StrToFloat(Value)); *************** *** 4819,4823 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : PSmallint(sqldata)^ := Value; SQL_INT64 : PInt64(sqldata)^ := Value; --- 4819,4823 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : PSmallint(sqldata)^ := Value; SQL_INT64 : PInt64(sqldata)^ := Value; *************** *** 4861,4865 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : PSmallint(sqldata)^ := Trunc(Value); SQL_INT64 : PInt64(sqldata)^ := Trunc(Value); --- 4861,4865 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : PSmallint(sqldata)^ := Trunc(Value); SQL_INT64 : PInt64(sqldata)^ := Trunc(Value); *************** *** 4904,4908 **** {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF} SQL_SHORT : PSmallint(sqldata)^ := Trunc(Value); SQL_INT64 : PInt64(sqldata)^ := Trunc(Value); --- 4904,4908 ---- {$IFDEF IB7_UP} SQL_BOOLEAN, ! {$ENDIF IB7_UP} SQL_SHORT : PSmallint(sqldata)^ := Trunc(Value); SQL_INT64 : PInt64(sqldata)^ := Trunc(Value); Index: JvDockVIDVCStyle.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDockVIDVCStyle.pas,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** JvDockVIDVCStyle.pas 21 Jan 2005 09:28:54 -0000 1.14 --- JvDockVIDVCStyle.pas 29 Jan 2005 06:36:58 -0000 1.15 *************** *** 155,159 **** {$IFNDEF USEJVCL} function GetControlName: string; override; ! {$ENDIF USEJVCL} procedure SetDockBaseControl(IsCreate: Boolean; DockBaseControl: TJvDockBaseControl); override; published --- 155,159 ---- {$IFNDEF USEJVCL} function GetControlName: string; override; ! {$ENDIF !USEJVCL} procedure SetDockBaseControl(IsCreate: Boolean; DockBaseControl: TJvDockBaseControl); override; published *************** *** 3843,3847 **** Result := Format(RsDockLikeVIDStyle, [inherited GetControlName]); end; ! {$ENDIF USEJVCL} //=== { TJvDockVIDVCDragDockObject } ========================================= --- 3843,3847 ---- Result := Format(RsDockLikeVIDStyle, [inherited GetControlName]); end; ! {$ENDIF !USEJVCL} //=== { TJvDockVIDVCDragDockObject } ========================================= Index: JvUIBObj.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBObj.pas,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** JvUIBObj.pas 5 Jan 2005 10:32:35 -0000 1.10 --- JvUIBObj.pas 29 Jan 2005 06:37:06 -0000 1.11 *************** *** 39,43 **** {$IFNDEF COMPILER7_UP} TDate = TDateTime; ! {$ENDIF COMPILER6_UP} {$IFDEF VisualCLX} TDate = TDateTime; --- 39,43 ---- {$IFNDEF COMPILER7_UP} TDate = TDateTime; ! {$ENDIF !COMPILER7_UP} {$IFDEF VisualCLX} TDate = TDateTime; *************** *** 191,195 **** external OleAutDllName name 'SafeArrayUnaccessData'; ! {$ENDIF DELPHI6_UP} function SafeArrayElementTotal(VarArray: PVarArray): Integer; --- 191,195 ---- external OleAutDllName name 'SafeArrayUnaccessData'; ! {$ENDIF !DELPHI6_UP} function SafeArrayElementTotal(VarArray: PVarArray): Integer; Index: JvTFGlanceTextViewer.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFGlanceTextViewer.pas,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** JvTFGlanceTextViewer.pas 21 Jan 2005 09:29:00 -0000 1.23 --- JvTFGlanceTextViewer.pas 29 Jan 2005 06:37:04 -0000 1.24 *************** *** 246,250 **** resourcestring RsEGlanceControlNotAssigned = 'GlanceControl not assigned'; ! {$ENDIF USEJVCL} //=== { TJvTFGVTextControl } ================================================= --- 246,250 ---- resourcestring RsEGlanceControlNotAssigned = 'GlanceControl not assigned'; ! {$ENDIF !USEJVCL} //=== { TJvTFGVTextControl } ================================================= Index: JvInterpreter_JvUtils.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvInterpreter_JvUtils.pas,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** JvInterpreter_JvUtils.pas 21 Jan 2005 09:28:57 -0000 1.20 --- JvInterpreter_JvUtils.pas 29 Jan 2005 06:37:00 -0000 1.21 *************** *** 47,51 **** {$IFNDEF COMPILER6_UP} FileCtrl, ! {$ENDIF COMPILER6_UP} JvJVCLUtils, JvJCLUtils, JvInterpreter_Windows; --- 47,51 ---- {$IFNDEF COMPILER6_UP} FileCtrl, ! {$ENDIF !COMPILER6_UP} JvJVCLUtils, JvJCLUtils, JvInterpreter_Windows; *************** *** 737,741 **** Value := BrowseForFolderNative(Args.Values[0], Args.Values[1], string(TVarData(Args.Values[2]).vString)); end; ! {$ENDIF BCB1} { function DeleteReadOnlyFile(const FileName: TFileName): Boolean; } --- 737,741 ---- Value := BrowseForFolderNative(Args.Values[0], Args.Values[1], string(TVarData(Args.Values[2]).vString)); end; ! {$ENDIF !BCB1} { function DeleteReadOnlyFile(const FileName: TFileName): Boolean; } *************** *** 1072,1076 **** AddFunction(cJvUtils, 'BrowseForFolderNative', JvInterpreter_BrowseForFolderNative, 3, [varEmpty, varString, varString or varByRef], varEmpty); ! {$ENDIF BCB1} AddFunction(cJvUtils, 'DeleteReadOnlyFile', JvInterpreter_DeleteReadOnlyFile, 1, [varEmpty], varEmpty); AddFunction(cJvUtils, 'HasParam', JvInterpreter_HasParam, 1, [varString], varEmpty); --- 1072,1076 ---- AddFunction(cJvUtils, 'BrowseForFolderNative', JvInterpreter_BrowseForFolderNative, 3, [varEmpty, varString, varString or varByRef], varEmpty); ! {$ENDIF !BCB1} AddFunction(cJvUtils, 'DeleteReadOnlyFile', JvInterpreter_DeleteReadOnlyFile, 1, [varEmpty], varEmpty); AddFunction(cJvUtils, 'HasParam', JvInterpreter_HasParam, 1, [varString], varEmpty); Index: JvDockVSNetStyle.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDockVSNetStyle.pas,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** JvDockVSNetStyle.pas 21 Jan 2005 09:28:55 -0000 1.44 --- JvDockVSNetStyle.pas 29 Jan 2005 06:36:58 -0000 1.45 *************** *** 255,259 **** {$IFNDEF USEJVCL} function GetControlName: string; override; ! {$ENDIF USEJVCL} procedure SetDockFormVisible(ADockClient: TJvDockClient; AVisible: Boolean); procedure ShowDockForm(ADockClient: TJvDockClient); override; --- 255,259 ---- {$IFNDEF USEJVCL} function GetControlName: string; override; ! {$ENDIF !USEJVCL} procedure SetDockFormVisible(ADockClient: TJvDockClient; AVisible: Boolean); procedure ShowDockForm(ADockClient: TJvDockClient); override; Index: JvProgressBar.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvProgressBar.pas,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** JvProgressBar.pas 11 Sep 2004 20:59:53 -0000 1.25 --- JvProgressBar.pas 29 Jan 2005 06:37:02 -0000 1.26 *************** *** 176,180 **** property OnMouseWheelDown; property OnMouseWheelUp; ! {$ENDIF COMPILEr6_UP} property OnStartDrag; end; --- 176,180 ---- property OnMouseWheelDown; property OnMouseWheelUp; ! {$ENDIF COMPILER6_UP} property OnStartDrag; end; Index: JvMTThreading.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvMTThreading.pas,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** JvMTThreading.pas 21 Jan 2005 09:28:59 -0000 1.30 --- JvMTThreading.pas 29 Jan 2005 06:37:01 -0000 1.31 *************** *** 163,167 **** RsECannotChangeNameOfOtherActiveThread = 'Cannot change name of other active thread'; RsEReleaseOfUnusedTicket = 'Release of unused ticket'; ! {$ENDIF USEJVCL} th... [truncated message content] |