Forráskód Böngészése

+ ReplaceDate

git-svn-id: trunk@7794 -
florian 18 éve
szülő
commit
628452f04d
2 módosított fájl, 14 hozzáadás és 4 törlés
  1. 12 3
      rtl/objpas/sysutils/dati.inc
  2. 2 1
      rtl/objpas/sysutils/datih.inc

+ 12 - 3
rtl/objpas/sysutils/dati.inc

@@ -483,14 +483,14 @@ If (i<5) and (TimeValues[I]=-1) then
   TimeValues[I]:=0;
 if PM then
   begin
-  if (TimeValues[0] <> 12) then 
+  if (TimeValues[0] <> 12) then
     Inc(TimeValues[0], 12);
   end
 else
   begin
   if (TimeValues[0]=12) then
     TimeValues[0]:=0;
-  end;   
+  end;
 result := EncodeTime(TimeValues[0], TimeValues[1], TimeValues[2], TimeValues[3]);
 end ;
 
@@ -847,7 +847,16 @@ begin
 end;
 
 procedure ReplaceTime(var dati:TDateTime; NewTime : TDateTime);inline;
-
 begin
   dati:=trunc(dati)+frac(newtime);
 end;
+
+procedure ReplaceDate(var DateTime: TDateTime; const NewDate: TDateTime); inline;
+var
+  tmp : TDateTime;
+begin
+  tmp:=NewDate;
+  ReplaceTime(tmp,DateTime);
+  DateTime:=tmp;
+end;
+

+ 2 - 1
rtl/objpas/sysutils/datih.inc

@@ -140,4 +140,5 @@ function CurrentYear:Word;
 { FPC Extra }
 Procedure GetLocalTime(var SystemTime: TSystemTime);
 
-procedure  ReplaceTime(var dati:TDateTime; NewTime : TDateTime); inline;
+procedure ReplaceTime(var dati:TDateTime; NewTime : TDateTime); inline;
+procedure ReplaceDate(var DateTime: TDateTime; const NewDate: TDateTime); inline;