[JVCL-Checkins] CVS: jvcl/source JvButtons.pas,1.1,1.2 JvEdit.pas,1.5,1.6 JvEditor.pas,1.1,1.2 JvHLEdPropDlg.dfm,1.1,1.2 JvHLEdPropDlg.pas,1.1,1.2 JvHLEditor.pas,1.1,1.2 JvImageWindow.pas,1.4,1.5 JvInterpreter_JvUtils.pas,1.1,1.2 JvListComb.pas,1.2,1.3 JvMaxMin.pas,1.3,1.4 JvOLBar.pas,1.3,1.4 JvRadioCtl.pas,1.3,1.4 JvRecentMenuBtn.pas,1.9,1.10 JvScrollPanel.pas,1.3,1.4 JvTimeLine.pas,1.2,1.3 JvUtils.pas,1.1,1.2

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

Update of /cvsroot/jvcl/jvcl/source
In directory usw-pr-cvs1:/tmp/cvs-serv23148/source

Modified Files:
	JvButtons.pas JvEdit.pas JvEditor.pas JvHLEdPropDlg.dfm 
	JvHLEdPropDlg.pas JvHLEditor.pas JvImageWindow.pas 
	JvInterpreter_JvUtils.pas JvListComb.pas JvMaxMin.pas 
	JvOLBar.pas JvRadioCtl.pas JvRecentMenuBtn.pas 
	JvScrollPanel.pas JvTimeLine.pas JvUtils.pas 
Log Message:
Removed local Min/Max functions (already in JvMaxMin)

Index: JvButtons.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvButtons.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvButtons.pas	27 Aug 2002 19:56:42 -0000	1.1
--- JvButtons.pas	16 Sep 2002 12:53:46 -0000	1.2
***************
*** 238,253 ****
  implementation
  
! uses JvHtControls, JvDsgnIntf;
! 
! 
! function Max(x,y:integer):integer;
! begin
!   if x > y then Result := x else Result := y;
! end;
! 
! function Min(x,y:integer):integer;
! begin
!   if x < y then Result := x else Result := y;
! end;
  
  
--- 238,242 ----
  implementation
  
! uses JvHtControls, JvDsgnIntf, JvMaxMin;
  
  

Index: JvEdit.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvEdit.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JvEdit.pas	20 Jul 2002 11:52:35 -0000	1.5
--- JvEdit.pas	16 Sep 2002 12:53:46 -0000	1.6
***************
*** 208,211 ****
--- 208,213 ----
  
  implementation
+ uses
+   JvMaxMin;
  
  { TJvCustomEdit }
***************
*** 262,267 ****
    FMaxPixel.Test(st, Font);
    if st <> Text then
      Text := st;
!   SelStart := Length(Text);
    FAutoSave.SaveValue(Text);
  end;
--- 264,271 ----
    FMaxPixel.Test(st, Font);
    if st <> Text then
+   begin
      Text := st;
!     SelStart := Min(SelStart,Length(Text));
!   end;
    FAutoSave.SaveValue(Text);
  end;
***************
*** 360,365 ****
    FMaxPixel.Test(st, Font);
    if st <> Text then
      Text := st;
!   SelStart := Length(Text);
  end;
  
--- 364,371 ----
    FMaxPixel.Test(st, Font);
    if st <> Text then
+   begin
      Text := st;
!     SelStart := Min(SelStart,Length(Text));
!   end;
  end;
  

Index: JvEditor.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvEditor.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvEditor.pas	27 Aug 2002 19:56:42 -0000	1.1
--- JvEditor.pas	16 Sep 2002 12:53:46 -0000	1.2
***************
*** 1002,1006 ****
  implementation
  
! uses Consts, JvCtlConst, JvStrUtil;
  
  {$IFDEF RAEDITOR_UNDO}
--- 1002,1006 ----
  implementation
  
! uses Consts, JvCtlConst, JvStrUtil, JvMaxMin;
  
  {$IFDEF RAEDITOR_UNDO}
***************
*** 1132,1145 ****
  begin
    Result := GetKeyState(VK) and $8000 = $8000;
- end;
- 
- function Max(x,y:integer):integer;
- begin
-   if x > y then Result := x else Result := y;
- end;
- 
- function Min(x,y:integer):integer;
- begin
-   if x < y then Result := x else Result := y;
  end;
  
--- 1132,1135 ----

Index: JvHLEdPropDlg.dfm
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvHLEdPropDlg.dfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvHLEdPropDlg.dfm	28 Aug 2002 09:20:24 -0000	1.1
--- JvHLEdPropDlg.dfm	16 Sep 2002 12:53:46 -0000	1.2
***************
*** 1,3 ****
! object RAHLEditorParamsForm: TJvHLEditorParamsForm
    Left = 147
    Top = 108
--- 1,3 ----
! object JvHLEditorParamsForm: TJvHLEditorParamsForm
    Left = 147
    Top = 108
***************
*** 24,27 ****
--- 24,28 ----
      Height = 321
      ActivePage = tsEditor
+     TabIndex = 0
      TabOrder = 0
      object tsEditor: TTabSheet
***************
*** 218,221 ****
--- 219,223 ----
          Width = 153
          Height = 121
+         Style = lbOwnerDrawFixed
          ExtendedSelect = False
          ItemHeight = 13
***************
*** 235,239 ****
            'Marked block'
            'Right margin')
-         Style = lbOwnerDrawFixed
          TabOrder = 1
          OnClick = lbElementsClick
--- 237,240 ----
***************
*** 761,766 ****
        ''
        
!         '<p align="left">Download last JVCLmp;A Library version now - <fon' +
!         't face="Arial"'
        
          'color="#00FFFF"><a href="http://www.torry.ru/vcl/packs/ralib.zip' +
--- 762,767 ----
        ''
        
!         '<p align="left">Download last JVCLmp;A Library version now - <fo' +
!         'nt face="Arial"'
        
          'color="#00FFFF"><a href="http://www.torry.ru/vcl/packs/ralib.zip' +

Index: JvHLEdPropDlg.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvHLEdPropDlg.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvHLEdPropDlg.pas	27 Aug 2002 19:56:42 -0000	1.1
--- JvHLEdPropDlg.pas	16 Sep 2002 12:53:46 -0000	1.2
***************
*** 37,41 ****
  uses
    Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
!   ComCtrls, JvRegAuto, StdCtrls, JvEditor, JvHLEditor, ExtCtrls;
  
  type
--- 37,42 ----
  uses
    Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
!   ComCtrls, JvRegAuto, StdCtrls, JvEditor, JvHLEditor, ExtCtrls,
!   JvComponent;
  
  type
***************
*** 178,194 ****
  implementation
  
! uses {Consts,} JvCtlConst, JvStrUtil;
  
  {$R *.DFM}
  
- function Max(x,y:integer):integer;
- begin
-   if x > y then Result := x else Result := y;
- end;
- 
- function Min(x,y:integer):integer;
- begin
-   if x < y then Result := x else Result := y;
- end;
  
  function Pixels(Control : TControl; APixels : integer) : integer;
--- 179,186 ----
  implementation
  
! uses {Consts,} JvCtlConst, JvStrUtil, JvMaxMin;
  
  {$R *.DFM}
  
  
  function Pixels(Control : TControl; APixels : integer) : integer;

Index: JvHLEditor.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvHLEditor.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvHLEditor.pas	27 Aug 2002 19:56:42 -0000	1.1
--- JvHLEditor.pas	16 Sep 2002 12:53:46 -0000	1.2
***************
*** 177,187 ****
  implementation
  
! uses JvStrUtil, JvCtlConst;
  
  
- function Min(x,y:integer):integer;
- begin
-   if x < y then Result := x else Result := y;
- end;
  
  procedure TJvSymbolColor .SetColor(const ForeColor, BackColor: TColor; const Style:
--- 177,183 ----
  implementation
  
! uses JvStrUtil, JvCtlConst, JvMaxMin;
  
  
  
  procedure TJvSymbolColor .SetColor(const ForeColor, BackColor: TColor; const Style:

Index: JvImageWindow.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvImageWindow.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JvImageWindow.pas	20 Jul 2002 11:52:35 -0000	1.4
--- JvImageWindow.pas	16 Sep 2002 12:53:46 -0000	1.5
***************
*** 184,209 ****
  implementation
  uses
!   JvTypes;
! 
! function Max(Val1, Val2: integer): integer;
! begin
!   Result := Val1;
!   if Val2 > Val1 then
!     Result := Val2;
! end;
! 
! function Min(Val1, Val2: integer): integer;
! begin
!   Result := Val1;
!   if Val2 < Val1 then
!     Result := Val2;
! end;
  
- function Ceil(X: Extended): Integer;
- begin
-   Result := Trunc(X);
-   if Frac(X) > 0 then
-     Inc(Result);
- end;
  
  { TJvImageWindow }
--- 184,189 ----
  implementation
  uses
!   JvTypes, JvMaxMin;
  
  
  { TJvImageWindow }

Index: JvInterpreter_JvUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvInterpreter_JvUtils.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvInterpreter_JvUtils.pas	27 Aug 2002 19:56:42 -0000	1.1
--- JvInterpreter_JvUtils.pas	16 Sep 2002 12:53:46 -0000	1.2
***************
*** 40,44 ****
  
  uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls, ExtCtrls,
!   Dialogs, Menus, JvUtils, JvInterpreter_Windows, JvInterpreter_SysUtils;
  
  
--- 40,44 ----
  
  uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls, ExtCtrls,
!   Dialogs, Menus, JvUtils, JvInterpreter_Windows, JvInterpreter_SysUtils, JvMaxMin;
  
  

Index: JvListComb.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvListComb.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JvListComb.pas	20 Jul 2002 11:52:35 -0000	1.2
--- JvListComb.pas	16 Sep 2002 12:53:46 -0000	1.3
***************
*** 254,258 ****
  
  implementation
! uses Consts;
  
  { utility }
--- 254,259 ----
  
  implementation
! uses
!   Consts, JvMaxMin;
  
  { utility }
***************
*** 276,295 ****
  end;
  
- function IMax(i, j: integer): integer;
- begin
-   if j > i then
-     Result := j
-   else
-     Result := i;
- end;
- {
- function Min(i,j:Integer):integer;
- begin
-   Result := i;
-   if j < i then
-     Result := j;
- end;
- }
- 
  procedure DrawBtnFrame(Canvas: TCanvas; ButtonStyle: TJvButtonColors; DefColor: TColor; Default: boolean; R: TRect);
  var FTop, FBtm: TColor;
--- 277,280 ----
***************
*** 681,685 ****
  procedure TJvImageComboBox.MeasureItem(Index: Integer; var Height: Integer);
  begin
!   Height := IMax(GetItemHeight(Font) + 2, FHeight);
  end;
  
--- 666,670 ----
  procedure TJvImageComboBox.MeasureItem(Index: Integer; var Height: Integer);
  begin
!   Height := Max(GetItemHeight(Font) + 2, FHeight);
  end;
  
***************
*** 723,727 ****
  procedure TJvImageComboBox.ResetItemHeight;
  begin
!   ItemHeight := IMax(GetItemHeight(Font) + 4, FHeight + 4);
  end;
  
--- 708,712 ----
  procedure TJvImageComboBox.ResetItemHeight;
  begin
!   ItemHeight := Max(GetItemHeight(Font) + 4, FHeight + 4);
  end;
  
***************
*** 1088,1092 ****
  procedure TJvImageListBox.MeasureItem(Index: Integer; var Height: Integer);
  begin
!   Height := IMax(GetItemHeight(Font) + 4, FHeight + 4);
  end;
  
--- 1073,1077 ----
  procedure TJvImageListBox.MeasureItem(Index: Integer; var Height: Integer);
  begin
!   Height := Max(GetItemHeight(Font) + 4, FHeight + 4);
  end;
  
***************
*** 1101,1105 ****
  begin
    case FAlignment of
!     taLeftJustify, taRightJustify: ItemHeight := IMax(GetItemHeight(Font) + 4, FHeight + 4);
      taCenter: ItemHeight := GetItemHeight(Font) + FHeight + 8;
    end;
--- 1086,1090 ----
  begin
    case FAlignment of
!     taLeftJustify, taRightJustify: ItemHeight := Max(GetItemHeight(Font) + 4, FHeight + 4);
      taCenter: ItemHeight := GetItemHeight(Font) + FHeight + 8;
    end;

Index: JvMaxMin.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvMaxMin.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvMaxMin.pas	20 Jul 2002 11:52:35 -0000	1.3
--- JvMaxMin.pas	16 Sep 2002 12:53:46 -0000	1.4
***************
*** 30,35 ****
  interface
  
! function Max(A, B: Longint): Longint;
! function Min(A, B: Longint): Longint;
  function MaxInteger(const Values: array of Longint): Longint;
  function MinInteger(const Values: array of Longint): Longint;
--- 30,37 ----
  interface
  
! function Ceil(X: Extended): integer;
! function Floor(X:Extended):integer;
! function Max(Val1, Val2: Longint): Longint;
! function Min(Val1, Val2: Longint): Longint;
  function MaxInteger(const Values: array of Longint): Longint;
  function MinInteger(const Values: array of Longint): Longint;
***************
*** 90,103 ****
  end;
  
! function Max(A, B: Longint): Longint;
  begin
!   if A > B then Result := A
!   else Result := B;
  end;
  
! function Min(A, B: Longint): Longint;
  begin
!   if A < B then Result := A
!   else Result := B;
  end;
  
--- 92,123 ----
  end;
  
! { utility }
! 
! function Ceil(X: Extended): Integer;
  begin
!   Result := Trunc(X);
!   if frac(X) > 0 then
!     Inc(Result);
  end;
  
! function Floor(X:Extended):integer;
  begin
!   Result := trunc(X);
!   if frac(X) < 0 then
!     Dec(Result);
! end;
! 
! function Min(Val1, Val2: integer): integer;
! begin
!   Result := Val1;
!   if Val2 < Val1 then
!     Result := Val2;
! end;
! 
! function Max(Val1, Val2: integer): integer;
! begin
!   Result := Val1;
!   if Val2 > Val1 then
!     Result := Val2;
  end;
  
***************
*** 106,111 ****
    I: Cardinal;
  begin
!   Result := Values[0];
!   for I := 0 to High(Values) do
      if Values[I] > Result then Result := Values[I];
  end;
--- 126,131 ----
    I: Cardinal;
  begin
!   Result := Values[Low(Values)];
!   for I := Succ(Low(Values)) to High(Values) do
      if Values[I] > Result then Result := Values[I];
  end;
***************
*** 115,120 ****
    I: Cardinal;
  begin
!   Result := Values[0];
!   for I := 0 to High(Values) do
      if Values[I] < Result then Result := Values[I];
  end;
--- 135,140 ----
    I: Cardinal;
  begin
!   Result := Values[Low(Values)];
!   for I := Succ(Low(Values)) to High(Values) do
      if Values[I] < Result then Result := Values[I];
  end;
***************
*** 126,131 ****
    I: Cardinal;
  begin
!   Result := Values[0];
!   for I := 0 to High(Values) do
      if Values[I] > Result then Result := Values[I];
  end;
--- 146,151 ----
    I: Cardinal;
  begin
!   Result := Values[Low(Values)];
!   for I := Succ(Low(Values)) to High(Values) do
      if Values[I] > Result then Result := Values[I];
  end;
***************
*** 135,140 ****
    I: Cardinal;
  begin
!   Result := Values[0];
!   for I := 0 to High(Values) do
      if Values[I] < Result then Result := Values[I];
  end;
--- 155,160 ----
    I: Cardinal;
  begin
!   Result := Values[Low(Values)];
!   for I := Succ(Low(Values)) to High(Values) do
      if Values[I] < Result then Result := Values[I];
  end;
***************
*** 146,151 ****
    I: Cardinal;
  begin
!   Result := Values[0];
!   for I := 0 to High(Values) do
      if Values[I] > Result then Result := Values[I];
  end;
--- 166,171 ----
    I: Cardinal;
  begin
!   Result := Values[Low(Values)];
!   for I := Succ(Low(Values)) to High(Values) do
      if Values[I] > Result then Result := Values[I];
  end;
***************
*** 155,160 ****
    I: Cardinal;
  begin
!   Result := Values[0];
!   for I := 0 to High(Values) do
      if Values[I] < Result then Result := Values[I];
  end;
--- 175,180 ----
    I: Cardinal;
  begin
!   Result := Values[Low(Values)];
!   for I := Succ(Low(Values)) to High(Values) do
      if Values[I] < Result then Result := Values[I];
  end;
***************
*** 164,169 ****
    I: Cardinal;
  begin
!   Result := Values[0];
!   for I := 0 to High(Values) do
      if Values[I] < Result then Result := Values[I];
  end;
--- 184,189 ----
    I: Cardinal;
  begin
!   Result := Values[Low(Values)];
!   for I := Succ(Low(Values)) to High(Values) do
      if Values[I] < Result then Result := Values[I];
  end;
***************
*** 173,178 ****
    I: Cardinal;
  begin
!   Result := Values[0];
!   for I := 0 to High(Values) do
      if Values[I] < Result then Result := Values[I];
  end;
--- 193,198 ----
    I: Cardinal;
  begin
!   Result := Values[Low(Values)];
!   for I := Succ(Low(Values)) to High(Values) do
      if Values[I] < Result then Result := Values[I];
  end;
***************
*** 183,188 ****
    I: Cardinal;
  begin
!   Result := Values[0];
!   for I := 0 to High(Values) do
      if Values[I] > Result then Result := Values[I];
  end;
--- 203,208 ----
    I: Cardinal;
  begin
!   Result := Values[Low(Values)];
!   for I := Succ(Low(Values)) to High(Values) do
      if Values[I] > Result then Result := Values[I];
  end;
***************
*** 192,197 ****
    I: Cardinal;
  begin
!   Result := Values[0];
!   for I := 0 to High(Values) do
      if Values[I] < Result then Result := Values[I];
  end;
--- 212,217 ----
    I: Cardinal;
  begin
!   Result := Values[Low(Values)];
!   for I := Succ(Low(Values)) to High(Values) do
      if Values[I] < Result then Result := Values[I];
  end;

Index: JvOLBar.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvOLBar.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvOLBar.pas	30 Aug 2002 08:54:53 -0000	1.3
--- JvOLBar.pas	16 Sep 2002 12:53:46 -0000	1.4
***************
*** 311,315 ****
  implementation
  uses
!   ExtCtrls;
  
  {$R JvOUTLOOKBARRES.RES}
--- 311,315 ----
  implementation
  uses
!   ExtCtrls, JvMaxMin;
  
  {$R JvOUTLOOKBARRES.RES}
***************
*** 1508,1517 ****
  end;
  
- function Min(Val1,Val2:integer):integer;
- begin
-   Result := Val1;
-   if Val2 < Val1 then
-     Result := Val2;
- end;
  var R:TRect;B:TJvOutlookbarButton;P:TJvOutlookBarPage;
  begin
--- 1508,1511 ----

Index: JvRadioCtl.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvRadioCtl.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvRadioCtl.pas	20 Jul 2002 22:01:26 -0000	1.3
--- JvRadioCtl.pas	16 Sep 2002 12:53:46 -0000	1.4
***************
*** 246,250 ****
  implementation
  
! uses Consts;
  
  const
--- 246,251 ----
  implementation
  
! uses
!   Consts, JvMaxMin;
  
  const
***************
*** 685,698 ****
    SmallRadius: Integer;
  
-   function Min(A, B: Integer): Integer;
-   begin
-     if A < B then Result := A else Result := B;
-   end;
- 
-   function Max(A, B: Integer): Integer;
-   begin
-     if A > B then Result := A else Result := B;
-   end;
- 
    function Lowest(A, B, C: Integer): Integer;
    begin
--- 686,689 ----
***************
*** 732,739 ****
          Inner := AngleToPoint(Angle, Center, (101 - FPointerSize) * InnerRadius div 100);
          Canvas.LineTo(Inner.X, Inner.Y);
!         FPointerRect := Rect(Min(Inner.X, Outer.X),
!                              Min(Inner.Y, Outer.Y),
!                              Max(Inner.X, Outer.X),
!                              Max(Inner.Y, Outer.Y));
        end;
      psTriangle:
--- 723,730 ----
          Inner := AngleToPoint(Angle, Center, (101 - FPointerSize) * InnerRadius div 100);
          Canvas.LineTo(Inner.X, Inner.Y);
!         FPointerRect := Rect(JvMaxMin.Min(Inner.X, Outer.X),
!                              JvMaxMin.Min(Inner.Y, Outer.Y),
!                              JvMaxMin.Max(Inner.X, Outer.X),
!                              JvMaxMin.Max(Inner.Y, Outer.Y));
        end;
      psTriangle:

Index: JvRecentMenuBtn.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvRecentMenuBtn.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** JvRecentMenuBtn.pas	20 Jul 2002 22:02:28 -0000	1.9
--- JvRecentMenuBtn.pas	16 Sep 2002 12:53:46 -0000	1.10
***************
*** 70,74 ****
  implementation
  uses
!   ShlObj, ActiveX;
  
  resourcestring
--- 70,74 ----
  implementation
  uses
!   JvMaxMin, ShlObj, ActiveX;
  
  resourcestring
***************
*** 237,247 ****
      Strings.EndUpdate;
    end;
- end;
- 
- function Min(Val1, Val2: integer): integer;
- begin
-   Result := Val1;
-   if Val2 < Val1 then
-     Result := Val2;
  end;
  
--- 237,240 ----

Index: JvScrollPanel.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvScrollPanel.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvScrollPanel.pas	25 Aug 2002 10:59:34 -0000	1.3
--- JvScrollPanel.pas	16 Sep 2002 12:53:46 -0000	1.4
***************
*** 184,209 ****
  
  implementation
  
  const
    cInitTime = 360;
    cTimeDelay = 100;
- 
-   { utility }
- 
- function Min(X, Y: integer): integer;
- begin
-   if X > Y then
-     Result := Y
-   else
-     Result := X;
- end;
- 
- function Max(X, Y: integer): integer;
- begin
-   if X > Y then
-     Result := X
-   else
-     Result := Y
- end;
  
  {
--- 184,193 ----
  
  implementation
+ uses
+   JvMaxMin;
  
  const
    cInitTime = 360;
    cTimeDelay = 100;
  
  {

Index: JvTimeLine.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvTimeLine.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JvTimeLine.pas	20 Jul 2002 11:52:36 -0000	1.2
--- JvTimeLine.pas	16 Sep 2002 12:53:46 -0000	1.3
***************
*** 445,450 ****
  {$IFDEF COMPILER6_UP}
  uses
!   DateUtils;
  {$ENDIF COMPILER6_UP}
  // PRY END
  
--- 445,451 ----
  {$IFDEF COMPILER6_UP}
  uses
!   DateUtils,
  {$ENDIF COMPILER6_UP}
+   JvMaxMin;
  // PRY END
  
***************
*** 462,481 ****
    FInitRepeatPause: Cardinal = 400;
    FRepeatPause: Cardinal = 100;
- 
- { utility }
- 
- function Min(Val1, Val2: integer): integer;
- begin
-   Result := Val1;
-   if Val2 < Val1 then
-     Result := Val2;
- end;
- 
- function Max(Val1, Val2: integer): integer;
- begin
-   Result := Val1;
-   if Val2 > Val1 then
-     Result := Val2;
- end;
  
  function MonthCount(Date1, Date2: TDateTime): integer;
--- 463,466 ----

Index: JvUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvUtils.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvUtils.pas	27 Aug 2002 19:56:42 -0000	1.1
--- JvUtils.pas	16 Sep 2002 12:53:46 -0000	1.2
***************
*** 332,341 ****
    function KeyPressed(VK : integer) : boolean;
  
-   { functions Max and Min not need comments }
- 
-   function Max(x, y :integer):integer;
- 
-   function Min(x, y :integer):integer;
- 
    procedure SwapInt(var Int1, Int2: Integer);
  
--- 332,335 ----
***************
*** 651,655 ****
  implementation
  
! uses JvCtlConst;
  
  
--- 645,650 ----
  implementation
  
! uses
!   JvCtlConst, JvMaxMin;
  
  
***************
*** 1564,1577 ****
      if S[i] = Ch then
        inc(Result);
- end;
- 
- function Max(x,y:integer):integer;
- begin
-   if x > y then Result := x else Result := y;
- end;
- 
- function Min(x,y:integer):integer;
- begin
-   if x < y then Result := x else Result := y;
  end;
  
--- 1559,1562 ----