[JVCL-Checkins] dev/JVCL3/run JvAnimatedImage.pas,1.27,1.28 JvAppRegistryStorage.pas,1.14,1.15 JvApp

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32767/JVCL3/run

Modified Files:
	JvAnimatedImage.pas JvAppRegistryStorage.pas JvAppStorage.pas 
	JvCipher.pas JvColorProvider.pas JvCtrls.pas JvDBGrid.pas 
	JvDBLookup.pas JvDBLookupTreeView.pas JvDBUltimGrid.pas 
	JvDataEmbedded.pas JvDesktopAlert.pas 
	JvDynControlEngineJVCL.pas JvDynControlEngineVCL.pas 
	JvEditor.pas JvHLParser.pas JvInspector.pas JvInterpreter.pas 
	JvJVCLUtils.pas JvListComb.pas JvMenus.pas 
	JvNavigationPane.pas JvOutlookBar.pas 
	JvParameterListParameter.pas JvPrvwDoc.pas JvResources.pas 
	JvScrollMax.pas JvTFDays.pas JvTFGlanceTextViewer.pas 
	JvTFManager.pas JvUnicodeEditor.pas JvUnicodeHLEditor.pas 
	JvUninstallControls.pas JvUrlListGrabber.pas JvgReport.pas 
Log Message:
cleaning up //=== divider lines

Index: JvInterpreter.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvInterpreter.pas,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** JvInterpreter.pas	12 Aug 2004 17:29:39 -0000	1.54
--- JvInterpreter.pas	15 Aug 2004 15:03:06 -0000	1.55
***************
*** 2624,2628 ****
  end;

! //=== { TJvInterpreterFunctionDesc } ==============================================

  function TJvInterpreterFunctionDesc.GetParamType(Index: Integer): Word;
--- 2624,2628 ----
  end;

! //=== { TJvInterpreterFunctionDesc } =========================================

  function TJvInterpreterFunctionDesc.GetParamType(Index: Integer): Word;
***************
*** 2724,2728 ****
  end;

! //=== { TJvInterpreterSrcFunction } ===============================================

  constructor TJvInterpreterSrcFunction.Create;
--- 2724,2728 ----
  end;

! //=== { TJvInterpreterSrcFunction } ==========================================

  constructor TJvInterpreterSrcFunction.Create;
***************
*** 2738,2742 ****
  end;

! //=== { TJvInterpreterExtFunction } ===============================================

  function TJvInterpreterExtFunction.CallDll(Args: TJvInterpreterArgs): Variant;
--- 2738,2742 ----
  end;

! //=== { TJvInterpreterExtFunction } ==========================================

  function TJvInterpreterExtFunction.CallDll(Args: TJvInterpreterArgs): Variant;
***************
*** 2801,2805 ****
  end;

! //=== { TJvInterpreterIdentifierList } ========================================

  function TJvInterpreterIdentifierList.Find(const Identifier: string;
--- 2801,2805 ----
  end;

! //=== { TJvInterpreterIdentifierList } =======================================

  function TJvInterpreterIdentifierList.Find(const Identifier: string;

Index: JvgReport.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgReport.pas,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** JvgReport.pas	10 Aug 2004 11:58:32 -0000	1.28
--- JvgReport.pas	15 Aug 2004 15:03:09 -0000	1.29
***************
*** 846,854 ****
  end;

! //===========================================================================

  constructor TJvgReport.Create(AOwner: TComponent);
  begin
!   inherited;
    ParamNames := TStringList.Create;
    ParamValues := TStringList.Create;
--- 846,854 ----
  end;

! //=== { TJvgReport } =========================================================

  constructor TJvgReport.Create(AOwner: TComponent);
  begin
!   inherited Create(AOwner);
    ParamNames := TStringList.Create;
    ParamValues := TStringList.Create;
***************
*** 868,877 ****
    ClearReport;
    ComponentList.Free;
!   inherited;
  end;

  procedure TJvgReport.Loaded;
  begin
!   inherited;
    CreateReport(nil, False);
  end;
--- 868,877 ----
    ClearReport;
    ComponentList.Free;
!   inherited Destroy;
  end;

  procedure TJvgReport.Loaded;
  begin
!   inherited Loaded;
    CreateReport(nil, False);
  end;

Index: JvListComb.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvListComb.pas,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** JvListComb.pas	23 Jul 2004 07:31:26 -0000	1.31
--- JvListComb.pas	15 Aug 2004 15:03:07 -0000	1.32
***************
*** 411,415 ****
  end;

! //=== { TJvImageItem } ========================================================

  constructor TJvImageItem.Create(Collection: TCollection);
--- 411,415 ----
  end;

! //=== { TJvImageItem } =======================================================

  constructor TJvImageItem.Create(Collection: TCollection);
***************
*** 525,529 ****
  end;

! //=== { TJvImageItems } =======================================================

  constructor TJvImageItems.Create(AOwner: TPersistent);
--- 525,529 ----
  end;

! //=== { TJvImageItems } ======================================================

  constructor TJvImageItems.Create(AOwner: TPersistent);

Index: JvCtrls.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCtrls.pas,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** JvCtrls.pas	22 Jul 2004 15:01:55 -0000	1.37
--- JvCtrls.pas	15 Aug 2004 15:03:05 -0000	1.38
***************
*** 248,252 ****
  end;

! //=== { TJvCustomImageButton } ==========================================================

  constructor TJvCustomImageButton.Create(AOwner: TComponent);
--- 248,252 ----
  end;

! //=== { TJvCustomImageButton } ===============================================

  constructor TJvCustomImageButton.Create(AOwner: TComponent);

Index: JvNavigationPane.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvNavigationPane.pas,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** JvNavigationPane.pas	3 Aug 2004 12:33:48 -0000	1.67
--- JvNavigationPane.pas	15 Aug 2004 15:03:07 -0000	1.68
***************
*** 2146,2150 ****
  end;

! //=== { TJvNavIconButton } ==================================================

  constructor TJvNavIconButton.Create(AOwner: TComponent);
--- 2146,2150 ----
  end;

! //=== { TJvNavIconButton } ===================================================

  constructor TJvNavIconButton.Create(AOwner: TComponent);
***************
*** 4351,4355 ****
  end;

! //=== { TJvCustomNavPaneToolPanel } ================================================

  constructor TJvCustomNavPaneToolPanel.Create(AOwner: TComponent);
--- 4351,4355 ----
  end;

! //=== { TJvCustomNavPaneToolPanel } ==========================================

  constructor TJvCustomNavPaneToolPanel.Create(AOwner: TComponent);
***************
*** 4363,4368 ****
    FBackground.OnChange := DoImagesChange;

!   ControlStyle := [csAcceptsControls, {$IFDEF VCL} csCaptureMouse, {$ENDIF VCL} csClickEvents,
!   csOpaque, csDoubleClicks, csReplicatable];

    FButtons := TJvNavPaneToolButtons.Create(Self);
--- 4363,4369 ----
    FBackground.OnChange := DoImagesChange;

!   ControlStyle := [csAcceptsControls,
!     {$IFDEF VCL} csCaptureMouse, {$ENDIF} csClickEvents,
!     csOpaque, csDoubleClicks, csReplicatable];

    FButtons := TJvNavPaneToolButtons.Create(Self);

Index: JvHLParser.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvHLParser.pas,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** JvHLParser.pas	9 Aug 2004 06:40:56 -0000	1.22
--- JvHLParser.pas	15 Aug 2004 15:03:05 -0000	1.23
***************
*** 133,137 ****
      FPosition: Cardinal;
    public
!     constructor Create(AErrCode: Integer; APosition: Cardinal; dummy: Integer = 0);
      property ErrCode: Integer read FErrCode;
      property Position: Cardinal read FPosition;
--- 133,137 ----
      FPosition: Cardinal;
    public
!     constructor Create(AErrCode: Integer; APosition: Cardinal; Dummy: Integer = 0);
      property ErrCode: Integer read FErrCode;
      property Position: Cardinal read FPosition;
***************
*** 157,163 ****
    JvConsts;

! //=== EJvIParserError ========================================================

! constructor EJvIParserError.Create(AErrCode: Integer; APosition: Cardinal; dummy: Integer = 0);
  begin
    inherited Create('');
--- 157,163 ----
    JvConsts;

! //=== { EJvIParserError } ====================================================

! constructor EJvIParserError.Create(AErrCode: Integer; APosition: Cardinal; Dummy: Integer = 0);
  begin
    inherited Create('');
***************
*** 530,534 ****
  end;

! //=== { TJvIParserW (Unicode) } ================================================

  constructor TJvIParserW.Create;
--- 530,534 ----
  end;

! //=== { TJvIParserW } ========================================================

  constructor TJvIParserW.Create;

Index: JvJVCLUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJVCLUtils.pas,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** JvJVCLUtils.pas	12 Aug 2004 17:29:40 -0000	1.130
--- JvJVCLUtils.pas	15 Aug 2004 15:03:06 -0000	1.131
***************
*** 6010,6016 ****
  { begin JvCtrlUtils }

! //==============================================================================
! // ToolBarMenu
! //==============================================================================

  procedure JvCreateToolBarMenu(AForm: TForm; AToolBar: TToolBar;
--- 6010,6014 ----
  { begin JvCtrlUtils }

! //=== ToolBarMenu ============================================================

  procedure JvCreateToolBarMenu(AForm: TForm; AToolBar: TToolBar;
***************
*** 6072,6078 ****
  end;

! //==============================================================================
! // ListView functions
! //==============================================================================

  procedure JvListViewToStrings(ListView: TListView; Strings: TStrings;
--- 6070,6074 ----
  end;

! //=== ListView functions =====================================================

  procedure JvListViewToStrings(ListView: TListView; Strings: TStrings;
***************
*** 6370,6376 ****
  {$ENDIF VCL}

! //==============================================================================
! // MessageBox
! //==============================================================================

  function JvMessageBox(const Text, Caption: string; Flags: DWORD): Integer;
--- 6366,6370 ----
  {$ENDIF VCL}

! //== MessageBox ==============================================================

  function JvMessageBox(const Text, Caption: string; Flags: DWORD): Integer;

Index: JvTFManager.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFManager.pas,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** JvTFManager.pas	26 Jul 2004 06:18:12 -0000	1.36
--- JvTFManager.pas	15 Aug 2004 15:03:08 -0000	1.37
***************
*** 1149,1153 ****
  end;

! { TJvTFCustomImageMap }

  constructor TJvTFCustomImageMap.Create(anAppt: TJvTFAppt);
--- 1149,1153 ----
  end;

! //=== { TJvTFCustomImageMap } ================================================

  constructor TJvTFCustomImageMap.Create(anAppt: TJvTFAppt);
***************
*** 1164,1168 ****
  begin
    FMap.Free;
!   inherited;
  end;

--- 1164,1168 ----
  begin
    FMap.Free;
!   inherited Destroy;
  end;

***************
*** 1254,1258 ****
  end;

! { TJvTFStateImageMap }

  constructor TJvTFStateImageMap.Create(Serv: TJvTFScheduleManager);
--- 1254,1258 ----
  end;

! //=== { TJvTFStateImageMap } =================================================

  constructor TJvTFStateImageMap.Create(Serv: TJvTFScheduleManager);
***************
*** 1378,1382 ****
  end;

! { TJvTFAppt }

  constructor TJvTFAppt.Create(Serv: TJvTFScheduleManager; const ApptID: string);
--- 1378,1382 ----
  end;

! //=== { TJvTFAppt } ==========================================================

  constructor TJvTFAppt.Create(Serv: TJvTFScheduleManager; const ApptID: string);
***************
*** 1423,1427 ****
    FImageMap.Free;

!   inherited;
  end;

--- 1423,1427 ----
    FImageMap.Free;

!   inherited Destroy;
  end;

***************
*** 1916,1920 ****
  end;

! { TJvTFSched }

  constructor TJvTFSched.Create(Serv: TJvTFScheduleManager; const AName: string;
--- 1916,1920 ----
  end;

! //=== { TJvTFSched } =========================================================

  constructor TJvTFSched.Create(Serv: TJvTFScheduleManager; const AName: string;
***************
*** 2459,2463 ****
  end;

! { TJvTFScheduleManagerCache }

  constructor TJvTFScheduleManagerCache.Create(SchedManager: TJvTFScheduleManager);
--- 2459,2463 ----
  end;

! //=== { TJvTFScheduleManagerCache } ==========================================

  constructor TJvTFScheduleManagerCache.Create(SchedManager: TJvTFScheduleManager);
***************
*** 2479,2483 ****
  begin
    FTimer.Free;
!   inherited;
  end;

--- 2479,2483 ----
  begin
    FTimer.Free;
!   inherited Destroy;
  end;

***************
*** 2551,2575 ****
  end;

! { TJvTFScheduleManager }
! 
! class function TJvTFScheduleManager.GetScheduleID(const SchedName: string;
!   SchedDate: TDate): string;
! begin
!   Result := SchedName + IntToStr(Trunc(SchedDate));
! end;
! 
! class function TJvTFScheduleManager.GenerateApptID: string;
! var
!   I: Integer;
! begin
!   Result := FloatToStr(Now);
!   Randomize;
!   for I := 1 to 5 do
!     Result := Result + Chr(Random(25) + 65);
! end;

  constructor TJvTFScheduleManager.Create(AOwner: TComponent);
  begin
!   inherited;

    FSchedLoadMode := slmOnDemand;
--- 2551,2559 ----
  end;

! //=== { TJvTFScheduleManager } ===============================================

  constructor TJvTFScheduleManager.Create(AOwner: TComponent);
  begin
!   inherited Create(AOwner);

    FSchedLoadMode := slmOnDemand;
***************
*** 2623,2627 ****
    FCache.Free;

!   inherited;
  end;

--- 2607,2627 ----
    FCache.Free;

!   inherited Destroy;
! end;
! 
! class function TJvTFScheduleManager.GetScheduleID(const SchedName: string;
!   SchedDate: TDate): string;
! begin
!   Result := SchedName + IntToStr(Trunc(SchedDate));
! end;
! 
! class function TJvTFScheduleManager.GenerateApptID: string;
! var
!   I: Integer;
! begin
!   Result := FloatToStr(Now);
!   Randomize;
!   for I := 1 to 5 do
!     Result := Result + Chr(Random(25) + 65);
  end;

***************
*** 2682,2686 ****
    Operation: TOperation);
  begin
!   inherited;
    if Operation = opRemove then
      if AComponent = StateImages then
--- 2682,2686 ----
    Operation: TOperation);
  begin
!   inherited Notification(AComponent, Operation);
    if Operation = opRemove then
      if AComponent = StateImages then
***************
*** 3625,3629 ****
  end;

! { TJvTFHint }

  constructor TJvTFHint.Create(anApptCtrl: TJvTFControl);
--- 3625,3629 ----
  end;

! //=== { TJvTFHint } ==========================================================

  constructor TJvTFHint.Create(anApptCtrl: TJvTFControl);
***************
*** 3641,3645 ****
  begin
    FTimer.Free;
!   inherited;
  end;

--- 3641,3645 ----
  begin
    FTimer.Free;
!   inherited Destroy;
  end;

***************
*** 3760,3764 ****
  begin
    PrepTimer(False);
!   inherited;
    // Reset the timer so we get the full interval
    FTimer.Enabled := False;
--- 3760,3764 ----
  begin
    PrepTimer(False);
!   inherited ActivateHint(Rect, AHint);
    // Reset the timer so we get the full interval
    FTimer.Enabled := False;
***************
*** 3922,3930 ****
  end;

! { TJvTFControl }

  constructor TJvTFControl.Create(AOwner: TComponent);
  begin
!   inherited;

    FSchedules := TStringList.Create;
--- 3922,3930 ----
  end;

! //=== { TJvTFControl } =======================================================

  constructor TJvTFControl.Create(AOwner: TComponent);
  begin
!   inherited Create(AOwner);

    FSchedules := TStringList.Create;
***************
*** 3938,3942 ****
    FSchedules.Free;

!   inherited;
  end;

--- 3938,3942 ----
    FSchedules.Free;

!   inherited Destroy;
  end;

***************
*** 4039,4043 ****
  procedure TJvTFControl.DoStartDrag(var DragObject: TDragObject);
  begin
!   inherited;

    FDragInfo := TJvTFDragInfo.Create;
--- 4039,4043 ----
  procedure TJvTFControl.DoStartDrag(var DragObject: TDragObject);
  begin
!   inherited DoStartDrag(DragObject);

    FDragInfo := TJvTFDragInfo.Create;
***************
*** 4068,4072 ****
  procedure TJvTFControl.DoEndDrag(Target: TObject; X, Y: Integer);
  begin
!   inherited;

    FDragInfo.Free;
--- 4068,4072 ----
  procedure TJvTFControl.DoEndDrag(Target: TObject; X, Y: Integer);
  begin
!   inherited DoEndDrag(Target, X, Y);

    FDragInfo.Free;
***************
*** 4077,4081 ****
    X, Y: Integer);
  begin
!   inherited;
    FShift := Shift;
  end;
--- 4077,4081 ----
    X, Y: Integer);
  begin
!   inherited MouseDown(Button, Shift, X, Y);
    FShift := Shift;
  end;
***************
*** 4133,4137 ****
    Operation: TOperation);
  begin
!   inherited;
    //  If (AComponent = Navigator) and (Operation = opRemove) Then
    //    Navigator := nil;
--- 4133,4137 ----
    Operation: TOperation);
  begin
!   inherited Notification(AComponent, Operation);
    //  If (AComponent = Navigator) and (Operation = opRemove) Then
    //    Navigator := nil;
***************
*** 4165,4173 ****
  end;

! { TJvTFComponent }

  constructor TJvTFComponent.Create(AOwner: TComponent);
  begin
!   inherited;

    FSchedules := TStringList.Create;
--- 4165,4173 ----
  end;

! //=== { TJvTFComponent } =====================================================

  constructor TJvTFComponent.Create(AOwner: TComponent);
  begin
!   inherited Create(AOwner);

    FSchedules := TStringList.Create;
***************
*** 4181,4185 ****
    FSchedules.Free;

!   inherited;
  end;

--- 4181,4185 ----
    FSchedules.Free;

!   inherited Destroy;
  end;

***************
*** 4337,4341 ****
  end;

! { TJvTFPrinter }

  procedure TJvTFPrinter.AbortPrint;
--- 4337,4361 ----
  end;

! //=== { TJvTFPrinter } =======================================================
! 
! constructor TJvTFPrinter.Create(AOwner: TComponent);
! begin
!   inherited Create(AOwner);
!   CreateLayout;
!   FMeasure := pmInches;
!   FPages := TStringList.Create;
!   FBodies := TStringList.Create;
!   InitializeMargins;
! end;
! 
! destructor TJvTFPrinter.Destroy;
! begin
!   FreeDoc;
!   FBodies.Free;
!   FPages.Free;
! 
!   FPageLayout.Free;
!   inherited Destroy;
! end;

  procedure TJvTFPrinter.AbortPrint;
***************
*** 4387,4410 ****
  end;

- constructor TJvTFPrinter.Create(AOwner: TComponent);
- begin
-   inherited Create(AOwner);
-   CreateLayout;
-   FMeasure := pmInches;
-   FPages := TStringList.Create;
-   FBodies := TStringList.Create;
-   InitializeMargins;
- end;
- 
- destructor TJvTFPrinter.Destroy;
- begin
-   FreeDoc;
-   FBodies.Free;
-   FPages.Free;
- 
-   FPageLayout.Free;
-   inherited;
- end;
- 
  procedure TJvTFPrinter.CreateDoc;
  begin
--- 4407,4410 ----
***************
*** 4924,4933 ****
  end;

! { TJvTFPrinterPageLayout }

  procedure TJvTFPrinterPageLayout.Assign(Source: TPersistent);
  var
!   SourceMeas,
!     DestMeas: TJvTFPrinterMeasure;
    WorkVal: Integer;
    SourceLayout: TJvTFPrinterPageLayout;
--- 4924,4941 ----
  end;

! //=== { TJvTFPrinterPageLayout } =============================================
! 
! constructor TJvTFPrinterPageLayout.Create(aPrinter: TJvTFPrinter);
! begin
!   inherited Create;
!   if not Assigned(aPrinter) then
!     raise EJvTFPrinterError.CreateRes(@RsECouldNotCreateTJvTFPrinterPageLayou);
! 
!   FPrinter := aPrinter;
! end;

  procedure TJvTFPrinterPageLayout.Assign(Source: TPersistent);
  var
!   SourceMeas, DestMeas: TJvTFPrinterMeasure;
    WorkVal: Integer;
    SourceLayout: TJvTFPrinterPageLayout;
***************
*** 4974,4986 ****
  end;

- constructor TJvTFPrinterPageLayout.Create(aPrinter: TJvTFPrinter);
- begin
-   inherited Create;
-   if not Assigned(aPrinter) then
-     raise EJvTFPrinterError.CreateRes(@RsECouldNotCreateTJvTFPrinterPageLayou);
- 
-   FPrinter := aPrinter;
- end;
- 
  function TJvTFPrinterPageLayout.GetMargin(Index: Integer): Integer;
  begin
--- 4982,4985 ----
***************
*** 5112,5138 ****
  end;

! { TJvTFUniversalPrinter }

  procedure TJvTFUniversalPrinter.CreateDoc;
  begin
!   inherited;
  end;

  procedure TJvTFUniversalPrinter.FinishDoc;
  begin
!   inherited;
  end;

  procedure TJvTFUniversalPrinter.NewDoc;
  begin
!   inherited;
  end;

  procedure TJvTFUniversalPrinter.NewPage;
  begin
!   inherited;
  end;

! { TJvTFHintProps }

  procedure TJvTFHintProps.Assign(Source: TPersistent);
--- 5111,5147 ----
  end;

! //=== { TJvTFUniversalPrinter } ==============================================

  procedure TJvTFUniversalPrinter.CreateDoc;
  begin
!   inherited CreateDoc;
  end;

  procedure TJvTFUniversalPrinter.FinishDoc;
  begin
!   inherited FinishDoc;
  end;

  procedure TJvTFUniversalPrinter.NewDoc;
  begin
!   inherited NewDoc;
  end;

  procedure TJvTFUniversalPrinter.NewPage;
  begin
!   inherited NewPage;
  end;

! //=== { TJvTFHintProps } =====================================================
! 
! constructor TJvTFHintProps.Create(AOwner: TJvTFControl);
! begin
!   inherited Create;
!   FControl := AOwner;
! 
!   FHintColor := clDefault;
!   FHintHidePause := -1;
!   FHintPause := -1;
! end;

  procedure TJvTFHintProps.Assign(Source: TPersistent);
***************
*** 5154,5167 ****
  end;

- constructor TJvTFHintProps.Create(AOwner: TJvTFControl);
- begin
-   inherited Create;
-   FControl := AOwner;
- 
-   FHintColor := clDefault;
-   FHintHidePause := -1;
-   FHintPause := -1;
- end;
- 
  procedure TJvTFHintProps.SetHintColor(Value: TColor);
  begin
--- 5163,5166 ----
***************
*** 5197,5201 ****
  end;

! { TJvTFDWNames }

  procedure TJvTFDWNames.Assign(Source: TPersistent);
--- 5196,5213 ----
  end;

! //=== { TJvTFDWNames } =======================================================
! 
! constructor TJvTFDWNames.Create;
! begin
!   inherited Create;
!   FSource := dwnsSysShort;
!   FDWN_Sunday := 'S';
!   FDWN_Monday := 'M';
!   FDWN_Tuesday := 'T';
!   FDWN_Wednesday := 'W';
!   FDWN_Thursday := 'T';
!   FDWN_Friday := 'F';
!   FDWN_Saturday := 'S';
! end;

  procedure TJvTFDWNames.Assign(Source: TPersistent);
***************
*** 5223,5249 ****
  end;

- constructor TJvTFDWNames.Create;
- begin
-   inherited;
-   FSource := dwnsSysShort;
-   FDWN_Sunday := 'S';
-   FDWN_Monday := 'M';
-   FDWN_Tuesday := 'T';
-   FDWN_Wednesday := 'W';
-   FDWN_Thursday := 'T';
-   FDWN_Friday := 'F';
-   FDWN_Saturday := 'S';
- end;
- 
  function TJvTFDWNames.GetDWN(Index: Integer): string;
  begin
    case Index of
!     1: Result := FDWN_Sunday;
!     2: Result := FDWN_Monday;
!     3: Result := FDWN_Tuesday;
!     4: Result := FDWN_Wednesday;
!     5: Result := FDWN_Thursday;
!     6: Result := FDWN_Friday;
!     7: Result := FDWN_Saturday;
    else
      Result := '';
--- 5235,5255 ----
  end;

  function TJvTFDWNames.GetDWN(Index: Integer): string;
  begin
    case Index of
!     1:
!       Result := FDWN_Sunday;
!     2:
!       Result := FDWN_Monday;
!     3:
!       Result := FDWN_Tuesday;
!     4:
!       Result := FDWN_Wednesday;
!     5:
!       Result := FDWN_Thursday;
!     6:
!       Result := FDWN_Friday;
!     7:
!       Result := FDWN_Saturday;
    else
      Result := '';
***************
*** 5286,5290 ****
  end;

! { TJvTFDateList }

  function TJvTFDateList.Add(ADate: TDate): Integer;
--- 5292,5310 ----
  end;

! //=== { TJvTFDateList } ======================================================
! 
! constructor TJvTFDateList.Create;
! begin
!   inherited Create;
!   FList := TStringList.Create;
!   FList.Sorted := True;
!   FList.Duplicates := dupIgnore;
! end;
! 
! destructor TJvTFDateList.Destroy;
! begin
!   FList.Free;
!   inherited Destroy;
! end;

  function TJvTFDateList.Add(ADate: TDate): Integer;
***************
*** 5311,5322 ****
  end;

- constructor TJvTFDateList.Create;
- begin
-   inherited Create;
-   FList := TStringList.Create;
-   FList.Sorted := True;
-   FList.Duplicates := dupIgnore;
- end;
- 
  procedure TJvTFDateList.Delete(Index: Integer);
  begin
--- 5331,5334 ----
***************
*** 5325,5334 ****
  end;

- destructor TJvTFDateList.Destroy;
- begin
-   FList.Free;
-   inherited;
- end;
- 
  function TJvTFDateList.GetDate(Index: Integer): TDate;
  begin
--- 5337,5340 ----
***************
*** 5341,5354 ****
  end;

! { TJvTFNavigator }

- //function TJvTFNavigator.ControlCount: Integer;
- //begin
- //  Result := FControls.Count;
- //end;
- //
  //constructor TJvTFNavigator.Create(AOwner: TComponent);
  //begin
! //  inherited;
  //  FControls := TStringList.Create;
  //end;
--- 5347,5355 ----
  end;

! //=== { TJvTFNavigator } =====================================================

  //constructor TJvTFNavigator.Create(AOwner: TComponent);
  //begin
! //  inherited Create(AOwner);
  //  FControls := TStringList.Create;
  //end;
***************
*** 5360,5364 ****
  //  FControls.Free;
  //
! //  inherited;
  //end;
  //
--- 5361,5370 ----
  //  FControls.Free;
  //
! //  inherited Destroy;
! //end;
! //
! //function TJvTFNavigator.ControlCount: Integer;
! //begin
! //  Result := FControls.Count;
  //end;
  //

Index: JvDBLookupTreeView.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDBLookupTreeView.pas,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** JvDBLookupTreeView.pas	12 Aug 2004 17:29:37 -0000	1.24
--- JvDBLookupTreeView.pas	15 Aug 2004 15:03:05 -0000	1.25
***************
*** 449,453 ****
    JvThemes;

! //=== { TJvLookupDataSourceLink } ==================================================

  procedure TJvLookupDataSourceLink.ActiveChanged;
--- 449,453 ----
    JvThemes;

! //=== { TJvLookupDataSourceLink } ============================================

  procedure TJvLookupDataSourceLink.ActiveChanged;
***************
*** 1290,1294 ****
  end;

! //=== { TJvTreePopupDataList } ===================================================

  constructor TJvTreePopupDataList.Create(AOwner: TComponent);
--- 1290,1294 ----
  end;

! //=== { TJvTreePopupDataList } ===============================================

  constructor TJvTreePopupDataList.Create(AOwner: TComponent);

Index: JvDesktopAlert.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDesktopAlert.pas,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** JvDesktopAlert.pas	26 Jul 2004 16:52:27 -0000	1.27
--- JvDesktopAlert.pas	15 Aug 2004 15:03:05 -0000	1.28
***************
*** 1223,1227 ****
  end;

! //=== { TJvCustomDesktopAlertStyle } ================================================

  constructor TJvCustomDesktopAlertStyleHandler.Create(OwnerForm: TJvFormDesktopAlert);
--- 1223,1227 ----
  end;

! //=== { TJvCustomDesktopAlertStyle } =========================================

  constructor TJvCustomDesktopAlertStyleHandler.Create(OwnerForm: TJvFormDesktopAlert);
***************
*** 1230,1234 ****
    FAnimTimer := TTimer.Create(nil);
    FAnimTimer.Enabled := False;
- 
    FOwnerForm := OwnerForm;
  end;
--- 1230,1233 ----
***************
*** 1469,1473 ****
  end;

! //=== { TJvCenterGrowAlertStyleHandler } ================================================

  constructor TJvCenterGrowAlertStyleHandler.Create(OwnerForm: TJvFormDesktopAlert);
--- 1468,1472 ----
  end;

! //=== { TJvCenterGrowAlertStyleHandler } =====================================

  constructor TJvCenterGrowAlertStyleHandler.Create(OwnerForm: TJvFormDesktopAlert);

Index: JvDBGrid.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDBGrid.pas,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** JvDBGrid.pas	12 Aug 2004 17:29:36 -0000	1.71
--- JvDBGrid.pas	15 Aug 2004 15:03:05 -0000	1.72
***************
*** 711,715 ****
  {$ENDIF COMPILER6_UP}

! //=== { TJvDBGridControls } ==========================================================

  constructor TJvDBGridControls.Create(ParentDBGrid: TJvDBGrid);
--- 711,715 ----
  {$ENDIF COMPILER6_UP}

! //=== { TJvDBGridControls } ==================================================

  constructor TJvDBGridControls.Create(ParentDBGrid: TJvDBGrid);

Index: JvUnicodeHLEditor.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUnicodeHLEditor.pas,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** JvUnicodeHLEditor.pas	9 Aug 2004 06:40:56 -0000	1.17
--- JvUnicodeHLEditor.pas	15 Aug 2004 15:03:08 -0000	1.18
***************
*** 202,206 ****
  end;

! //=== { TJvWideHLEditor } ========================================================

  constructor TJvWideHLEditor.Create(AOwner: TComponent);
--- 202,206 ----
  end;

! //=== { TJvWideHLEditor } ====================================================

  constructor TJvWideHLEditor.Create(AOwner: TComponent);
***************
*** 223,227 ****
  end;

! procedure TJvWideHLEditor.Notification(AComponent: TComponent; Operation: TOperation);
  begin
    if (Operation = opRemove) and (AComponent = FSyntaxHighlighter) then
--- 223,228 ----
  end;

! procedure TJvWideHLEditor.Notification(AComponent: TComponent;
!   Operation: TOperation);
  begin
    if (Operation = opRemove) and (AComponent = FSyntaxHighlighter) then

Index: JvResources.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvResources.pas,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** JvResources.pas	4 Aug 2004 17:44:56 -0000	1.80
--- JvResources.pas	15 Aug 2004 15:03:07 -0000	1.81
***************
*** 492,496 ****
    RsEJvDBGridControlPropertyNotAssigned = 'JvDBGrid.EditControls: property Control not assigned';

! //=== JvDBUltimGrid.pas ===========================================================
  resourcestring
    RsEJvDBGridBadFieldKind = 'Cannot sort a binary or special field';
--- 492,496 ----
    RsEJvDBGridControlPropertyNotAssigned = 'JvDBGrid.EditControls: property Control not assigned';

! //=== JvDBUltimGrid.pas ======================================================
  resourcestring
    RsEJvDBGridBadFieldKind = 'Cannot sort a binary or special field';

Index: JvTFGlanceTextViewer.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFGlanceTextViewer.pas,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** JvTFGlanceTextViewer.pas	25 Jul 2004 05:42:26 -0000	1.19
--- JvTFGlanceTextViewer.pas	15 Aug 2004 15:03:08 -0000	1.20
***************
*** 106,111 ****
      procedure UpdateDDBtnRect;

!     procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
!                         X, Y: Integer); override;
      procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
      procedure MouseAccel(X, Y: Integer);
--- 106,110 ----
      procedure UpdateDDBtnRect;

!     procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
      procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
      procedure MouseAccel(X, Y: Integer);
***************
*** 116,123 ****
      property Replicating: Boolean read FReplicating;
      procedure Paint; override;
!     procedure DrawDDButton(aCanvas: TCanvas);
!     procedure DrawArrow(aCanvas: TCanvas; aRect: TRect; Direction: TJvTFDirection);
!     procedure DrawScrollUpBtn(aCanvas: TCanvas; aCellRect: TRect);
!     procedure DrawScrollDnBtn(aCanvas: TCanvas; aCellRect: TRect);
      function GetStartEndString(Appt: TJvTFAppt): string;

--- 115,122 ----
      property Replicating: Boolean read FReplicating;
      procedure Paint; override;
!     procedure DrawDDButton(ACanvas: TCanvas);
!     procedure DrawArrow(ACanvas: TCanvas; aRect: TRect; Direction: TJvTFDirection);
!     procedure DrawScrollUpBtn(ACanvas: TCanvas; aCellRect: TRect);
!     procedure DrawScrollDnBtn(ACanvas: TCanvas; aCellRect: TRect);
      function GetStartEndString(Appt: TJvTFAppt): string;

***************
*** 140,144 ****
      destructor Destroy; override;

!     procedure PaintTo(aCanvas: TCanvas; DrawInfo: TJvTFGlTxtVwDrawInfo); overload;

      property Viewer: TJvTFGlanceTextViewer read FViewer;
--- 139,143 ----
      destructor Destroy; override;

!     procedure PaintTo(ACanvas: TCanvas; DrawInfo: TJvTFGlTxtVwDrawInfo); overload;

      property Viewer: TJvTFGlanceTextViewer read FViewer;
***************
*** 147,151 ****
      // editor management routines
      //procedure EditAppt(Col, Row: Integer; Appt: TJvTFAppt);
!     procedure EditAppt(aCell: TJvTFGlanceCell; RelLine: Integer; Appt: TJvTFAppt);
      procedure FinishEditAppt;
      function Editing: Boolean;
--- 146,150 ----
      // editor management routines
      //procedure EditAppt(Col, Row: Integer; Appt: TJvTFAppt);
!     procedure EditAppt(ACell: TJvTFGlanceCell; RelLine: Integer; Appt: TJvTFAppt);
      procedure FinishEditAppt;
      function Editing: Boolean;
***************
*** 160,164 ****
      function GetApptAt(X, Y: Integer): TJvTFAppt;
      function GetApptAccel(X, Y: Integer): TJvTFAppt;
-   published
    end;

--- 159,162 ----
***************
*** 180,185 ****
    published
      property Color: TColor read FColor write SetColor default clBlue;
!     property FontColor: TColor read FFontColor write SetFontColor
!       default clWhite;
    end;

--- 178,182 ----
    published
      property Color: TColor read FColor write SetColor default clBlue;
!     property FontColor: TColor read FFontColor write SetFontColor default clWhite;
    end;

***************
*** 193,206 ****
      FOnLineDDClick: TJvTFLineDDClickEvent;
      FShowStartEnd: Boolean;
- 
      FTopLines: TStringList;
      FSelApptAttr: TJvTFTxtVwApptAttr;
      FSelAppt: TJvTFAppt;
- 
      procedure SetLineSpacing(Value: Integer);
      procedure SetSelApptAttr(Value: TJvTFTxtVwApptAttr);
      procedure SetEditorAlign(Value: TJvTFGlTxtVwEditorAlign);
      procedure SetShowStartEnd(Value: Boolean);
!     function GetCellString(aCell: TJvTFGlanceCell): string;
    protected
      procedure SetVisible(Value: Boolean); override;
--- 190,201 ----
      FOnLineDDClick: TJvTFLineDDClickEvent;
      FShowStartEnd: Boolean;
      FTopLines: TStringList;
      FSelApptAttr: TJvTFTxtVwApptAttr;
      FSelAppt: TJvTFAppt;
      procedure SetLineSpacing(Value: Integer);
      procedure SetSelApptAttr(Value: TJvTFTxtVwApptAttr);
      procedure SetEditorAlign(Value: TJvTFGlTxtVwEditorAlign);
      procedure SetShowStartEnd(Value: Boolean);
!     function GetCellString(ACell: TJvTFGlanceCell): string;
    protected
      procedure SetVisible(Value: Boolean); override;
***************
*** 220,244 ****
      procedure Refresh; override;
      procedure Realign; override;
!     procedure PaintTo(aCanvas: TCanvas; aCell: TJvTFGlanceCell); override;
!     function GetDrawInfo(aCell: TJvTFGlanceCell): TJvTFGlTxtVwDrawInfo;
      procedure ResetTopLines;
      property SelAppt: TJvTFAppt read FSelAppt;

!     procedure SetTopLine(aCell: TJvTFGlanceCell; Value: Integer);
!     function GetTopLine(aCell: TJvTFGlanceCell): Integer;
      function GetApptAt(X, Y: Integer): TJvTFAppt; override;

      // editor management routines
!     procedure EditAppt(aCell: TJvTFGlanceCell; RelLine: Integer; Appt: TJvTFAppt);
      procedure FinishEditAppt; override;
      function Editing: Boolean; override;
      function CanEdit: Boolean; override;
    published
!     property LineSpacing: Integer read FLineSpacing write SetLineSpacing
!       default 0;
!     property OnLineDDClick: TJvTFLineDDClickEvent read FOnLineDDClick
!       write FOnLineDDClick;
!     property SelApptAttr: TJvTFTxtVwApptAttr read FSelApptAttr
!       write SetSelApptAttr;
      property EditorAlign: TJvTFGlTxtVwEditorAlign read FEditorAlign
        write SetEditorAlign default eaLine;
--- 215,236 ----
      procedure Refresh; override;
      procedure Realign; override;
!     procedure PaintTo(ACanvas: TCanvas; ACell: TJvTFGlanceCell); override;
!     function GetDrawInfo(ACell: TJvTFGlanceCell): TJvTFGlTxtVwDrawInfo;
      procedure ResetTopLines;
      property SelAppt: TJvTFAppt read FSelAppt;

!     procedure SetTopLine(ACell: TJvTFGlanceCell; Value: Integer);
!     function GetTopLine(ACell: TJvTFGlanceCell): Integer;
      function GetApptAt(X, Y: Integer): TJvTFAppt; override;

      // editor management routines
!     procedure EditAppt(ACell: TJvTFGlanceCell; RelLine: Integer; Appt: TJvTFAppt);
      procedure FinishEditAppt; override;
      function Editing: Boolean; override;
      function CanEdit: Boolean; override;
    published
!     property LineSpacing: Integer read FLineSpacing write SetLineSpacing default 0;
!     property OnLineDDClick: TJvTFLineDDClickEvent read FOnLineDDClick write FOnLineDDClick;
!     property SelApptAttr: TJvTFTxtVwApptAttr read FSelApptAttr write SetSelApptAttr;
      property EditorAlign: TJvTFGlTxtVwEditorAlign read FEditorAlign
        write SetEditorAlign default eaLine;
***************
*** 259,266 ****
  {$ENDIF USEJVCL}

! function TJvTFGVTextControl.CalcAbsLineNum(Y: Integer): Integer;
! begin
!   Result := Y div CalcLineHeight;
! end;

  constructor TJvTFGVTextControl.Create(AOwner: TComponent);
--- 251,255 ----
  {$ENDIF USEJVCL}

! //=== { TJvTFGVTextControl } =================================================

  constructor TJvTFGVTextControl.Create(AOwner: TComponent);
***************
*** 289,300 ****
  end;

! procedure TJvTFGVTextControl.DrawDDButton(aCanvas: TCanvas);
  begin
!   with aCanvas do
    begin
      Brush.Color := clBtnFace;
      FillRect(FDDBtnRect);

!     DrawArrow(aCanvas, FDDBtnRect, dirDown);

      Pen.Color := clBlack;
--- 278,294 ----
  end;

! function TJvTFGVTextControl.CalcAbsLineNum(Y: Integer): Integer;
  begin
!   Result := Y div CalcLineHeight;
! end;
! 
! procedure TJvTFGVTextControl.DrawDDButton(ACanvas: TCanvas);
! begin
!   with ACanvas do
    begin
      Brush.Color := clBtnFace;
      FillRect(FDDBtnRect);

!     DrawArrow(ACanvas, FDDBtnRect, dirDown);

      Pen.Color := clBlack;
***************
*** 347,360 ****
    DrawInfo: TJvTFGlTxtVwDrawInfo;
  begin
! {
! All drawing should be done in a PaintTo method.  PaintTo should have aCanvas
! and aRect Params.  All drawing code within PaintTo should rely solely on
! the aCanvas and aRect parameters given.

! This method (Paint) should then call PaintTo(Canvas, ClientRect) to draw the
! info on the viewer control.  TJvTFCustomGlance.DrawCell should call
! PaintTo(PaintBuffer, CellBodyRect(Col, Row, Selected, False)) to draw the
! info on the GlanceControl.
! }

    Viewer.SetTo(Viewer.PhysicalCell);
--- 341,354 ----
    DrawInfo: TJvTFGlTxtVwDrawInfo;
  begin
!   {
!   All drawing should be done in a PaintTo method.  PaintTo should have ACanvas
!   and aRect Params.  All drawing code within PaintTo should rely solely on
!   the ACanvas and aRect parameters given.

!   This method (Paint) should then call PaintTo(Canvas, ClientRect) to draw the
!   info on the viewer control.  TJvTFCustomGlance.DrawCell should call
!   PaintTo(PaintBuffer, CellBodyRect(Col, Row, Selected, False)) to draw the
!   info on the GlanceControl.
!   }

    Viewer.SetTo(Viewer.PhysicalCell);
***************
*** 380,392 ****
  end;

! procedure TJvTFGVTextControl.PaintTo(aCanvas: TCanvas; DrawInfo: TJvTFGlTxtVwDrawInfo);
  var
!   I,
!   NextLineTop,
!   LastLine: Integer;
!   aRect,
!   LineRect,
!   TxtRect,
!   BtnRect: TRect;
    Flags: UINT;
    Txt: string;
--- 374,381 ----
  end;

! procedure TJvTFGVTextControl.PaintTo(ACanvas: TCanvas; DrawInfo: TJvTFGlTxtVwDrawInfo);
  var
!   I, NextLineTop, LastLine: Integer;
!   aRect, LineRect, TxtRect, BtnRect: TRect;
    Flags: UINT;
    Txt: string;
***************
*** 398,402 ****
    Viewer.SetTo(DrawInfo.Cell);

!   with aCanvas do
    begin
      aRect := DrawInfo.aRect;
--- 387,391 ----
    Viewer.SetTo(DrawInfo.Cell);

!   with ACanvas do
    begin
      aRect := DrawInfo.aRect;
***************
*** 469,473 ****
        PTxt := StrAlloc((Length(Txt) + 4) * SizeOf(Char));
        StrPCopy(PTxt, Txt);
!       Windows.DrawText(aCanvas.Handle, PTxt, -1, TxtRect, Flags);
        StrDispose(PTxt);

--- 458,462 ----
        PTxt := StrAlloc((Length(Txt) + 4) * SizeOf(Char));
        StrPCopy(PTxt, Txt);
!       Windows.DrawText(ACanvas.Handle, PTxt, -1, TxtRect, Flags);
        StrDispose(PTxt);

***************
*** 480,501 ****
      if not Replicating and (FMousePtInfo.RelLineNum < Viewer.ApptCount) and
         FMouseInControl then
!       DrawDDButton(aCanvas);

      BtnRect := ScrollUpBtnRect(DrawInfo.aRect);
      if not Windows.IsRectEmpty(BtnRect) then
!       DrawScrollUpBtn(aCanvas, DrawInfo.aRect);

      BtnRect := ScrollDnBtnRect(DrawInfo.aRect);
      if not Windows.IsRectEmpty(BtnRect) then
!       DrawScrollDnBtn(aCanvas, DrawInfo.aRect);

      {
      if TopLine > 0 then
!       DrawScrollUpBtn(aCanvas, DrawInfo.aRect);

      BottomLine := TopLine + FullViewableLines - 1;
      LastLine := LineCount - 1;
      if BottomLine < LastLine then
!       DrawScrollDnBtn(aCanvas, DrawInfo.aRect);
      }
    end;
--- 469,490 ----
      if not Replicating and (FMousePtInfo.RelLineNum < Viewer.ApptCount) and
         FMouseInControl then
!       DrawDDButton(ACanvas);

      BtnRect := ScrollUpBtnRect(DrawInfo.aRect);
      if not Windows.IsRectEmpty(BtnRect) then
!       DrawScrollUpBtn(ACanvas, DrawInfo.aRect);

      BtnRect := ScrollDnBtnRect(DrawInfo.aRect);
      if not Windows.IsRectEmpty(BtnRect) then
!       DrawScrollDnBtn(ACanvas, DrawInfo.aRect);

      {
      if TopLine > 0 then
!       DrawScrollUpBtn(ACanvas, DrawInfo.aRect);

      BottomLine := TopLine + FullViewableLines - 1;
      LastLine := LineCount - 1;
      if BottomLine < LastLine then
!       DrawScrollDnBtn(ACanvas, DrawInfo.aRect);
      }
    end;
***************
*** 535,546 ****
  end;

! procedure TJvTFGVTextControl.DrawArrow(aCanvas: TCanvas; aRect: TRect;
    Direction: TJvTFDirection);
  var
!   I,
!   ArrowHeight,
!   ArrowWidth,
!   BaseX,
!   BaseY: Integer;
  begin
    ArrowWidth := RectWidth(aRect) - 2;
--- 524,531 ----
  end;

! procedure TJvTFGVTextControl.DrawArrow(ACanvas: TCanvas; aRect: TRect;
    Direction: TJvTFDirection);
  var
!   I, ArrowHeight, ArrowWidth, BaseX, BaseY: Integer;
  begin
    ArrowWidth := RectWidth(aRect) - 2;
***************
*** 549,553 ****
    ArrowHeight := (ArrowWidth + 1) div 2;

!   Case Direction of
      dirUp:
        begin
--- 534,538 ----
    ArrowHeight := (ArrowWidth + 1) div 2;

!   case Direction of
      dirUp:
        begin
***************
*** 556,560 ****

          for I := ArrowHeight downto 1 do
!           with aCanvas do
            begin
              MoveTo(BaseX, BaseY);
--- 541,545 ----

          for I := ArrowHeight downto 1 do
!           with ACanvas do
            begin
              MoveTo(BaseX, BaseY);
***************
*** 570,574 ****

          for I := ArrowHeight downto 1 do
!         with aCanvas do
            begin
              MoveTo(BaseX, BaseY);
--- 555,559 ----

          for I := ArrowHeight downto 1 do
!         with ACanvas do
            begin
              MoveTo(BaseX, BaseY);
***************
*** 584,588 ****

          for I := ArrowHeight downto 1 do
!           with aCanvas do
            begin
              MoveTo(BaseX, BaseY);
--- 569,573 ----

          for I := ArrowHeight downto 1 do
!           with ACanvas do
            begin
              MoveTo(BaseX, BaseY);
***************
*** 597,601 ****

      for I := ArrowHeight downto 1 do
!       with aCanvas do
        begin
          MoveTo(BaseX, BaseY);
--- 582,586 ----

      for I := ArrowHeight downto 1 do
!       with ACanvas do
        begin
          MoveTo(BaseX, BaseY);
***************
*** 627,643 ****
    FMouseLine := -1; 
  end;
  {
  function TJvTFGVTextControl.LineCount: Integer;
  var
!   aCell: TJvTFGlanceCell;
    I: Integer;
  begin
    Result := 0;
!   aCell := Viewer.GlanceControl.Cells.Cells[Viewer.Col, Viewer.Row];

!   for I := 0 to aCell.ScheduleCount - 1 do
!     Inc(Result, aCell.Schedules[I].ApptCount);
  end;
  }
  function TJvTFGVTextControl.LineCount: Integer;
  begin
--- 612,630 ----
    FMouseLine := -1; 
  end;
+ 
  {
  function TJvTFGVTextControl.LineCount: Integer;
  var
!   ACell: TJvTFGlanceCell;
    I: Integer;
  begin
    Result := 0;
!   ACell := Viewer.GlanceControl.Cells.Cells[Viewer.Col, Viewer.Row];

!   for I := 0 to ACell.ScheduleCount - 1 do
!     Inc(Result, ACell.Schedules[I].ApptCount);
  end;
  }
+ 
  function TJvTFGVTextControl.LineCount: Integer;
  begin
***************
*** 797,802 ****
        Pen.Color := clBlack;
        Polyline([Point(0, 0), Point(Width - 1, 0),
!                 Point(Width - 1, Height - 1), Point(0, Height - 1),
!                 Point(0, 0)]);

        MoveTo(2, 2);
--- 784,789 ----
        Pen.Color := clBlack;
        Polyline([Point(0, 0), Point(Width - 1, 0),
!         Point(Width - 1, Height - 1), Point(0, Height - 1),
!         Point(0, 0)]);

        MoveTo(2, 2);
***************
*** 828,833 ****
        Pen.Color := clBlack;
        Polyline([Point(0, 0), Point(Width - 1, 0),
!                 Point(Width - 1, Height - 1), Point(0, Height - 1),
!                 Point(0, 0)]);

        MoveTo(9, 2);
--- 815,820 ----
        Pen.Color := clBlack;
        Polyline([Point(0, 0), Point(Width - 1, 0),
!         Point(Width - 1, Height - 1), Point(0, Height - 1),
!         Point(0, 0)]);

        MoveTo(9, 2);
***************
*** 845,863 ****
  end;

! procedure TJvTFGVTextControl.DrawScrollDnBtn(aCanvas: TCanvas; aCellRect: TRect);
  var
    aRect: TRect;
  begin
    aRect := ScrollDnBtnRect(aCellRect);
!   Windows.BitBlt(aCanvas.Handle, aRect.Left, aRect.Top, RectWidth(aRect),
      RectHeight(aRect), FScrollDnBtnBMP.Canvas.Handle, 0, 0, SRCCOPY);
  end;

! procedure TJvTFGVTextControl.DrawScrollUpBtn(aCanvas: TCanvas; aCellRect: TRect);
  var
    aRect: TRect;
  begin
    aRect := ScrollUpBtnRect(aCellRect);
!   Windows.BitBlt(aCanvas.Handle, aRect.Left, aRect.Top, RectWidth(aRect),
      RectHeight(aRect), FScrollUpBtnBMP.Canvas.Handle, 0, 0, SRCCOPY);
  end;
--- 832,850 ----
  end;

! procedure TJvTFGVTextControl.DrawScrollDnBtn(ACanvas: TCanvas; aCellRect: TRect);
  var
    aRect: TRect;
  begin
    aRect := ScrollDnBtnRect(aCellRect);
!   Windows.BitBlt(ACanvas.Handle, aRect.Left, aRect.Top, RectWidth(aRect),
      RectHeight(aRect), FScrollDnBtnBMP.Canvas.Handle, 0, 0, SRCCOPY);
  end;

! procedure TJvTFGVTextControl.DrawScrollUpBtn(ACanvas: TCanvas; aCellRect: TRect);
  var
    aRect: TRect;
  begin
    aRect := ScrollUpBtnRect(aCellRect);
!   Windows.BitBlt(ACanvas.Handle, aRect.Left, aRect.Top, RectWidth(aRect),
      RectHeight(aRect), FScrollUpBtnBMP.Canvas.Handle, 0, 0, SRCCOPY);
  end;
***************
*** 932,936 ****
  }

! procedure TJvTFGVTextControl.EditAppt(aCell: TJvTFGlanceCell; RelLine: Integer; Appt: TJvTFAppt);
  var
    EditLine: Integer;
--- 919,923 ----
  }

! procedure TJvTFGVTextControl.EditAppt(ACell: TJvTFGlanceCell; RelLine: Integer; Appt: TJvTFAppt);
  var
    EditLine: Integer;
***************
*** 943,947 ****
      Exit;

!   Viewer.MoveTo(aCell);

    if Viewer.EditorAlign = eaLine then
--- 930,934 ----
      Exit;

!   Viewer.MoveTo(ACell);

    if Viewer.EditorAlign = eaLine then
***************
*** 1084,1093 ****
  end;

! { TJvTFGlanceTextViewer }
! 
! procedure TJvTFGlanceTextViewer.Change;
! begin
!   Refresh;
! end;

  constructor TJvTFGlanceTextViewer.Create(AOwner: TComponent);
--- 1071,1075 ----
  end;

! //=== { TJvTFGlanceTextViewer } ==============================================

  constructor TJvTFGlanceTextViewer.Create(AOwner: TComponent);
***************
*** 1112,1115 ****
--- 1094,1102 ----
  end;

+ procedure TJvTFGlanceTextViewer.Change;
+ begin
+   Refresh;
+ end;
+ 
  procedure TJvTFGlanceTextViewer.SetEditorAlign(Value: TJvTFGlTxtVwEditorAlign);
  begin
***************
*** 1117,1121 ****
  end;

! function TJvTFGlanceTextViewer.GetDrawInfo(aCell: TJvTFGlanceCell): TJvTFGlTxtVwDrawInfo;
  var
    Attr: TJvTFGlanceCellAttr;
--- 1104,1108 ----
  end;

! function TJvTFGlanceTextViewer.GetDrawInfo(ACell: TJvTFGlanceCell): TJvTFGlTxtVwDrawInfo;
  var
    Attr: TJvTFGlanceCellAttr;
***************
*** 1126,1143 ****
    with Result do
    begin
!     Cell := aCell;
!     Attr := GlanceControl.GetCellAttr(aCell);
      Font := Attr.Font;
      Color := Attr.Color;
!     aRect := GlanceControl.CalcCellBodyRect(aCell,
!       GlanceControl.CellIsSelected(aCell), False);
    end;
  end;

! function TJvTFGlanceTextViewer.GetTopLine(aCell: TJvTFGlanceCell): Integer;
  var
    I: Integer;
  begin
!   I := FTopLines.IndexOf(GetCellString(aCell));
    if I > -1 then
      Result := Integer(FTopLines.Objects[I])
--- 1113,1130 ----
    with Result do
    begin
!     Cell := ACell;
!     Attr := GlanceControl.GetCellAttr(ACell);
      Font := Attr.Font;
      Color := Attr.Color;
!     aRect := GlanceControl.CalcCellBodyRect(ACell,
!       GlanceControl.CellIsSelected(ACell), False);
    end;
  end;

! function TJvTFGlanceTextViewer.GetTopLine(ACell: TJvTFGlanceCell): Integer;
  var
    I: Integer;
  begin
!   I := FTopLines.IndexOf(GetCellString(ACell));
    if I > -1 then
      Result := Integer(FTopLines.Objects[I])
***************
*** 1164,1170 ****
  end;

! procedure TJvTFGlanceTextViewer.PaintTo(aCanvas: TCanvas; aCell: TJvTFGlanceCell);
  begin
!   FViewControl.PaintTo(aCanvas, GetDrawInfo(aCell));
  end;

--- 1151,1157 ----
  end;

! procedure TJvTFGlanceTextViewer.PaintTo(ACanvas: TCanvas; ACell: TJvTFGlanceCell);
  begin
!   FViewControl.PaintTo(ACanvas, GetDrawInfo(ACell));
  end;

***************
*** 1229,1233 ****
  end;

! procedure TJvTFGlanceTextViewer.SetTopLine(aCell: TJvTFGlanceCell; Value: Integer);
  var
    I: Integer;
--- 1216,1220 ----
  end;

! procedure TJvTFGlanceTextViewer.SetTopLine(ACell: TJvTFGlanceCell; Value: Integer);
  var
    I: Integer;
***************
*** 1242,1246 ****
    GlanceControl.CheckViewerApptHint(-1, -1);

!   CellStr := GetCellString(aCell);
    I := FTopLines.IndexOf(CellStr);
    if I > -1 then
--- 1229,1233 ----
    GlanceControl.CheckViewerApptHint(-1, -1);

!   CellStr := GetCellString(ACell);
    I := FTopLines.IndexOf(CellStr);
    if I > -1 then
***************
*** 1284,1291 ****
  end;

! procedure TJvTFGlanceTextViewer.EditAppt(aCell: TJvTFGlanceCell; RelLine: Integer;
    Appt: TJvTFAppt);
  begin
!   FViewControl.EditAppt(aCell, RelLine, Appt);
  end;

--- 1271,1278 ----
  end;

! procedure TJvTFGlanceTextViewer.EditAppt(ACell: TJvTFGlanceCell; RelLine: Integer;
    Appt: TJvTFAppt);
  begin
!   FViewControl.EditAppt(ACell, RelLine, Appt);
  end;

***************
*** 1300,1315 ****
  end;

! function TJvTFGlanceTextViewer.GetCellString(aCell: TJvTFGlanceCell): string;
  begin
    Result := '';
!   if Assigned(aCell) then
    begin
!     Result := IntToStr(aCell.ColIndex) + ',' + IntToStr(aCell.RowIndex);
!     if aCell.IsSubcell then
        Result := Result + 'S';
    end;
  end;

! { TJvTFGVTxtEditor }

  constructor TJvTFGVTxtEditor.Create(AOwner: TComponent);
--- 1287,1302 ----
  end;

! function TJvTFGlanceTextViewer.GetCellString(ACell: TJvTFGlanceCell): string;
  begin
    Result := '';
!   if Assigned(ACell) then
    begin
!     Result := IntToStr(ACell.ColIndex) + ',' + IntToStr(ACell.RowIndex);
!     if ACell.IsSubcell then
        Result := Result + 'S';
    end;
  end;

! //=== { TJvTFGVTxtEditor } ===================================================

  constructor TJvTFGVTxtEditor.Create(AOwner: TComponent);
***************
*** 1355,1359 ****
  end;

! { TJvTFTxtVwApptAttr }

  procedure TJvTFTxtVwApptAttr.Assign(Source: TPersistent);
--- 1342,1353 ----
  end;

! //=== { TJvTFTxtVwApptAttr } =================================================
! 
! constructor TJvTFTxtVwApptAttr.Create(AOwner: TComponent);
! begin
!   inherited Create;
!   FColor := clBlue;
!   FFontColor := clWhite;
! end;

  procedure TJvTFTxtVwApptAttr.Assign(Source: TPersistent);
***************
*** 1375,1385 ****
  end;

- constructor TJvTFTxtVwApptAttr.Create(AOwner: TComponent);
- begin
-   inherited Create;
-   FColor := clBlue;
-   FFontColor := clWhite;
- end;
- 
  procedure TJvTFTxtVwApptAttr.SetColor(Value: TColor);
  begin
--- 1369,1372 ----

Index: JvUninstallControls.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUninstallControls.pas,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** JvUninstallControls.pas	25 Jul 2004 05:42:27 -0000	1.21
--- JvUninstallControls.pas	15 Aug 2004 15:03:08 -0000	1.22
***************
*** 243,247 ****
    end;

! //=== { TJvUninstallInfo } ================================================

  destructor TJvUninstallInfo.Destroy;
--- 243,247 ----
    end;

! //=== { TJvUninstallInfo } ===================================================

  destructor TJvUninstallInfo.Destroy;
***************
*** 266,270 ****
  end;}

! //=== { TSafeRegIniFile } ================================================

  function TSafeRegIniFile.ReadString(const Section, Ident, Default: string): string;
--- 266,270 ----
  end;}

! //=== { TSafeRegIniFile } ====================================================

  function TSafeRegIniFile.ReadString(const Section, Ident, Default: string): string;
***************
*** 273,278 ****
    Len: Integer;
    RegData: TRegDataType;
!   Buffer: array[0..4095] of byte;
!   function BufToStr(Buffer: array of byte; BufSize: Integer): string;
    var
      I: Integer;
--- 273,279 ----
    Len: Integer;
    RegData: TRegDataType;
!   Buffer: array [0..4095] of Byte;
! 
!   function BufToStr(Buffer: array of Byte; BufSize: Integer): string;
    var
      I: Integer;
***************
*** 288,342 ****
      ExpandEnvironmentStrings(PChar(S), PChar(Result), Length(Result));
    end;
  begin
    Key := GetKey(Section);
    if Key <> 0 then
-   try
-     OldKey := CurrentKey;
-     SetCurrentKey(Key);
      try
!       if ValueExists(Ident) then
!       begin
!         RegData := GetDataType(Ident);
!         case RegData of
!           rdString, rdExpandString:
!             begin
!               Len := GetDataSize(Ident);
!               if Len > 0 then
                begin
!                 SetString(Result, nil, Len);
!                 GetData(Ident, PChar(Result), Len, RegData);
!                 SetLength(Result, StrLen(PChar(Result)));
!                 if RegData = rdExpandString then
!                   Result := ExpandEnvVar(Result);
!               end
!               else
!                 Result := '';
!             end;
!           rdInteger:
!             begin
!               GetData(Ident, @Len, SizeOf(Len), RegData);
!               Result := IntToStr(Len);
!             end;
!           rdBinary:
!             begin
!               Len := GetDataSize(Ident);
!               if Len > 0 then
                begin
!                 GetData(Ident, @Buffer, SizeOf(Buffer), RegData);
!                 Result := BufToStr(Buffer, Min(Len, SizeOf(Buffer)));
!               end
!               else
!                 Result := '';
!             end;
!         end;
!       end
!       else
!         Result := Default;
      finally
!       SetCurrentKey(OldKey);
!     end;
!   finally
!     RegCloseKey(Key);
!   end
    else
      Result := Default;
--- 289,344 ----
      ExpandEnvironmentStrings(PChar(S), PChar(Result), Length(Result));
    end;
+ 
  begin
    Key := GetKey(Section);
    if Key <> 0 then
      try
!       OldKey := CurrentKey;
!       SetCurrentKey(Key);
!       try
!         if ValueExists(Ident) then
!         begin
!           RegData := GetDataType(Ident);
!           case RegData of
!             rdString, rdExpandString:
                begin
!                 Len := GetDataSize(Ident);
!                 if Len > 0 then
!                 begin
!                   SetString(Result, nil, Len);
!                   GetData(Ident, PChar(Result), Len, RegData);
!                   SetLength(Result, StrLen(PChar(Result)));
!                   if RegData = rdExpandString then
!                     Result := ExpandEnvVar(Result);
!                 end
!                 else
!                   Result := '';
!               end;
!             rdInteger:
                begin
!                 GetData(Ident, @Len, SizeOf(Len), RegData);
!                 Result := IntToStr(Len);
!               end;
!             rdBinary:
!               begin
!                 Len := GetDataSize(Ident);
!                 if Len > 0 then
!                 begin
!                   GetData(Ident, @Buffer, SizeOf(Buffer), RegData);
!                   Result := BufToStr(Buffer, Min(Len, SizeOf(Buffer)));
!                 end
!                 else
!                   Result := '';
!               end;
!           end;
!         end
!         else
!           Result := Default;
!       finally
!         SetCurrentKey(OldKey);
!       end;
      finally
!       RegCloseKey(Key);
!     end
    else
      Result := Default;
***************
*** 352,356 ****
    UI: TJvUninstallInfo;

!   function BufToStr(Buffer: array of byte; BufSize: Integer): string;
    var
      I: Integer;
--- 354,358 ----
    UI: TJvUninstallInfo;

!   function BufToStr(Buffer: array of Byte; BufSize: Integer): string;
    var
      I: Integer;
***************
*** 391,394 ****
--- 393,397 ----
      end;
    end;
+ 
  begin
    FFolders := TStringList.Create;

Index: JvDynControlEngineJVCL.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDynControlEngineJVCL.pas,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** JvDynControlEngineJVCL.pas	12 Aug 2004 17:29:38 -0000	1.27
--- JvDynControlEngineJVCL.pas	15 Aug 2004 15:03:05 -0000	1.28
***************
*** 573,577 ****
  end;

! //=== { TJvDynControlJVCLButtonEdit } ============================================

  constructor TJvDynControlJVCLButtonEdit.Create(AOwner: TComponent);
--- 573,577 ----
  end;

! //=== { TJvDynControlJVCLButtonEdit } ========================================

  constructor TJvDynControlJVCLButtonEdit.Create(AOwner: TComponent);
***************
*** 1483,1487 ****
  end;

! //=== { TJvDynControlJVCLCheckListBox } ============================================

  procedure TJvDynControlJVCLCheckListBox.ControlSetDefaultProperties;
--- 1483,1487 ----
  end;

! //=== { TJvDynControlJVCLCheckListBox } ======================================

  procedure TJvDynControlJVCLCheckListBox.ControlSetDefaultProperties;
***************
*** 1685,1689 ****
  end;

! //=== { TJvDynControlJVCLGroupBox } ==============================================

  procedure TJvDynControlJVCLGroupBox.ControlSetDefaultProperties;
--- 1685,1689 ----
  end;

! //=== { TJvDynControlJVCLGroupBox } ==========================================

  procedure TJvDynControlJVCLGroupBox.ControlSetDefaultProperties;

Index: JvMenus.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvMenus.pas,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** JvMenus.pas	26 Jul 2004 16:52:28 -0000	1.65
--- JvMenus.pas	15 Aug 2004 15:03:07 -0000	1.66
***************
*** 3294,3307 ****
  end;

! //=== { TJvStandardMenuItemPainter } ========================================

  procedure TJvStandardMenuItemPainter.DrawCheckedImageBack(ARect: TRect);
  begin
!   inherited;
  end;
 ...

[truncated message content]

[JVCL-Checkins] dev/JVCL3/run JvAnimatedImage.pas,1.27,1.28 JvAppRegistryStorage.pas,1.14,1.15 JvApp

JEDI VCL for Delphi