[JVCL-Checkins] CVS: jvcl/source JvID3v2Base.pas,1.2,1.3 JvID3v2Editor.pas,1.2,1.3

[Remko B. <rem...@us...>]

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

Modified Files:
	JvID3v2Base.pas JvID3v2Editor.pas 
Log Message:
Fixed some more (maybe not all) D5 errors

Index: JvID3v2Base.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvID3v2Base.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JvID3v2Base.pas	17 Apr 2003 16:34:29 -0000	1.2
--- JvID3v2Base.pas	17 Apr 2003 20:45:09 -0000	1.3
***************
*** 131,135 ****
      function WriteNumber(AValue: Cardinal): Longint;
      function WriteEnc: Longint;
!     function WritePadding(const Count: Cardinal): Longint;
      function WriteStringEnc(const S: TJvID3StringPair): Longint;
      function WriteUserString(const S1, S2: TJvID3StringPair): Longint;
--- 131,135 ----
      function WriteNumber(AValue: Cardinal): Longint;
      function WriteEnc: Longint;
!     function WritePadding(const Count: Longint): Longint;
      function WriteStringEnc(const S: TJvID3StringPair): Longint;
      function WriteUserString(const S1, S2: TJvID3StringPair): Longint;
***************
*** 2866,2870 ****
  end;
  
! function TJvID3Stream.WritePadding(const Count: Cardinal): Longint;
  var
    Pos: Longint;
--- 2866,2870 ----
  end;
  
! function TJvID3Stream.WritePadding(const Count: Longint): Longint;
  var
    Pos: Longint;
***************
*** 3208,3218 ****
        raise;
      {$ELSE}
!     if csDesigning in ComponentState then
!       if Assigned(Application.HandleException) then
!         Application.HandleException(ExceptObject)
!       else
!         ShowException(ExceptObject, ExceptAddr)
!     else
!       raise;
      {$ENDIF}
    end;
--- 3208,3212 ----
        raise;
      {$ELSE}
!     Application.HandleException(ExceptObject)
      {$ENDIF}
    end;
***************
*** 3534,3544 ****
        raise;
      {$ELSE}
!     if csDesigning in ComponentState then
!       if Assigned(Application.HandleException) then
!         Application.HandleException(ExceptObject)
!       else
!         ShowException(ExceptObject, ExceptAddr)
!     else
!       raise;
      {$ENDIF}
    end;
--- 3528,3532 ----
        raise;
      {$ELSE}
!     Application.HandleException(ExceptObject)
      {$ENDIF}
    end;
***************
*** 3693,3697 ****
  
        { FStream.Size = size of new tag including header excluding padding }
!       PaddingSize := OldTagSizeInclHeader - FStream.Size;
  
        { We always want to have padding (because of possible
--- 3681,3685 ----
  
        { FStream.Size = size of new tag including header excluding padding }
!       PaddingSize := OldTagSizeInclHeader - Cardinal(FStream.Size);
  
        { We always want to have padding (because of possible

Index: JvID3v2Editor.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvID3v2Editor.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JvID3v2Editor.pas	17 Apr 2003 16:34:30 -0000	1.2
--- JvID3v2Editor.pas	17 Apr 2003 20:45:10 -0000	1.3
***************
*** 278,282 ****
--- 278,285 ----
  procedure TJvID3FramesEditor.Activated;
  begin
+   { (rb) Don't know equivalent in D5 }
+   {$IFDEF COMPILER6_UP}
    Designer.Activate;
+   {$ENDIF}
    try
      UpdateSelection;
***************
*** 294,300 ****
    if P = Controller then
      Controller := nil
!   else
!   if (P is TJvID3Frame) and (TJvID3Frame(P).Controller = Controller) then
!     UpdateDisplay;
  end;
  {$ENDIF}
--- 297,304 ----
    if P = Controller then
      Controller := nil
!   { (rb) Doesn't work in D5? }
!   //else
!   //if (P is TJvID3Frame) and (TJvID3Frame(P).Controller = Controller) then
!   //  UpdateDisplay;
  end;
  {$ENDIF}
***************
*** 568,577 ****
  procedure TJvID3FramesEditor.UpdateCaption;
  const
!   SDatasetEditor = '%s%s%s';
  var
    NewCaption: string;
  begin
    if (Controller <> nil) and (Controller.Owner <> nil) then
!     NewCaption := Format(SDatasetEditor, [Controller.Owner.Name, '.',
        Controller.Name]);
    if Caption <> NewCaption then
--- 572,581 ----
  procedure TJvID3FramesEditor.UpdateCaption;
  const
!   SFrameEditor = '%s%s%s';
  var
    NewCaption: string;
  begin
    if (Controller <> nil) and (Controller.Owner <> nil) then
!     NewCaption := Format(SFrameEditor, [Controller.Owner.Name, '.',
        Controller.Name]);
    if Caption <> NewCaption then
***************
*** 624,637 ****
  end;
  
  procedure TJvID3FramesEditor.UpdateSelection;
  var
    I: Integer;
    Frame: TJvID3Frame;
!   ComponentList: IDesignerSelections;
  begin
    if Active then
    begin
      ComponentList := TDesignerSelections.Create;
      try
        with FrameListBox do
          for I := 0 to Items.Count - 1 do
--- 628,650 ----
  end;
  
+ {$IFDEF COMPILER6_UP}
+ type
+   TDesignerSelectionList = IDesignerSelections;
+ {$ENDIF}
+ 
  procedure TJvID3FramesEditor.UpdateSelection;
  var
    I: Integer;
    Frame: TJvID3Frame;
!   ComponentList: TDesignerSelectionList; // = Interface for D6 up
  begin
    if Active then
    begin
+     {$IFDEF COMPILER6_UP}
      ComponentList := TDesignerSelections.Create;
+     {$ELSE}
+     ComponentList := TDesignerSelectionList.Create;
      try
+     {$ENDIF}
        with FrameListBox do
          for I := 0 to Items.Count - 1 do
***************
*** 644,652 ****
        if ComponentList.Count = 0 then
          ComponentList.Add(Controller);
!     except
!       { ??? Free ComponentList? }
!       raise;
      end;
!     Designer.SetSelections(ComponentList);
    end;
  end;
--- 657,666 ----
        if ComponentList.Count = 0 then
          ComponentList.Add(Controller);
!       Designer.SetSelections(ComponentList);
!     {$IFNDEF COMPILER6_UP}
!     finally
!       ComponentList.Free;
      end;
!     {$ENDIF}
    end;
  end;