pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

RxMDI - fix MDIForm.ActiveControl on change MDI windows

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2752 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2013-06-14 18:44:58 +00:00
parent cb3ce470f6
commit e8883e24af
9 changed files with 87 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/rx/rxclock.pas
View File

@ -244,8 +244,8 @@ procedure InvalidTime(Hour, Min, Sec: Word);
var
sTime: string[50];
begin
sTime := IntToStr(Hour) + TimeSeparator + IntToStr(Min) +
TimeSeparator + IntToStr(Sec);
sTime := IntToStr(Hour) + DefaultFormatSettings.TimeSeparator + IntToStr(Min) +
DefaultFormatSettings.TimeSeparator + IntToStr(Sec);
raise EConvertError.CreateFmt(SInvalidTime, [sTime]);
end;
@ -488,9 +488,9 @@ begin
TimeStr := '88888';
if FShowSeconds then TimeStr := TimeStr + '888';
if FTwelveHour then begin
if Canvas.TextWidth(TimeAMString) > Canvas.TextWidth(TimePMString) then
TimeStr := TimeStr + ' ' + TimeAMString
else TimeStr := TimeStr + ' ' + TimePMString;
if Canvas.TextWidth(DefaultFormatSettings.TimeAMString) > Canvas.TextWidth(DefaultFormatSettings.TimePMString) then
TimeStr := TimeStr + ' ' + DefaultFormatSettings.TimeAMString
else TimeStr := TimeStr + ' ' + DefaultFormatSettings.TimePMString;
end;
SetNewFontSize(Canvas, TimeStr, H, W);
Font := Canvas.Font;