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

fix compile rxMemDataset for 86-x64

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1126 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2010-01-14 18:51:51 +00:00
parent 06f1e9145c
commit ad71ccb493
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/rx/rxdbgrid.pas
View File

@@ -1168,16 +1168,22 @@ end;
procedure TRxDBGrid.OutCaptionCellText90(aCol,aRow: Integer;const aRect: TRect; procedure TRxDBGrid.OutCaptionCellText90(aCol,aRow: Integer;const aRect: TRect;
aState: TGridDrawState;const ACaption:string; const TextOrient:TTextOrientation); aState: TGridDrawState;const ACaption:string; const TextOrient:TTextOrientation);
var var
dW:integer; dW, dY:integer;
begin begin
Canvas.FillRect(aRect); Canvas.FillRect(aRect);
DrawCellGrid(aCol,aRow,aRect,aState); DrawCellGrid(aCol,aRow,aRect,aState);
if TextOrient in [toVertical90, toVertical270] then if TextOrient in [toVertical90, toVertical270] then
dW:=((aRect.Bottom - aRect.Top) - Canvas.TextWidth(ACaption)) div 2 begin
dW:=((aRect.Bottom - aRect.Top) - Canvas.TextWidth(ACaption)) div 2;
dY:=((aRect.Right - aRect.Left) - Canvas.TextHeight(ACaption)) div 2;
end
else else
begin
dW:=0; dW:=0;
OutTextXY90(Canvas, aRect.Left, aRect.Top+dw, ACaption, TextOrient); dY:=0;
end;
OutTextXY90(Canvas, aRect.Left + dY, aRect.Top+dw, ACaption, TextOrient);
end; end;
procedure TRxDBGrid.OutCaptionSortMarker(const aRect: TRect; procedure TRxDBGrid.OutCaptionSortMarker(const aRect: TRect;

3
components/rx/rxdbtimeedit.pas
View File

@@ -240,8 +240,11 @@ end;
procedure TCustomRxDBTimeEdit.Change; procedure TCustomRxDBTimeEdit.Change;
begin begin
if Assigned(FDatalink) then
begin
FDatalink.Edit; FDatalink.Edit;
FDataLink.Modified; FDataLink.Modified;
end;
inherited Change; inherited Change;
end; end;

4
components/rx/rxfileutils.pas
View File

@@ -107,7 +107,7 @@ var
S:string; S:string;
begin begin
{$IFDEF WINDOWS} {$IFDEF WINDOWS}
GetFileNameOwner(SearchDomain, FileName, Result, S); GetFileNameOwner(UTF8ToSys(SearchDomain), UTF8ToSys(FileName), Result, S);
Result:=UTF8Encode(Result); Result:=UTF8Encode(Result);
{$ELSE} {$ELSE}
Result:=''; Result:='';
@@ -118,7 +118,7 @@ procedure GetFileOwnerData(const SearchDomain, FileName: String; out UserName,
DomainName: string); DomainName: string);
begin begin
{$IFDEF WINDOWS} {$IFDEF WINDOWS}
GetFileNameOwner(SearchDomain, FileName, UserName, DomainName); GetFileNameOwner(UTF8ToSys(SearchDomain), UTF8ToSys(FileName), UserName, DomainName);
UserName:=UTF8Encode(UserName); UserName:=UTF8Encode(UserName);
DomainName:=UTF8Encode(DomainName); DomainName:=UTF8Encode(DomainName);
{$ELSE} {$ELSE}

2
components/rx/rxmemds.pas
View File

@@ -558,7 +558,7 @@ begin
{.$ELSE} {.$ELSE}
(FieldDefs[Index].DataType in ftSupported - ftBlobTypes) then (FieldDefs[Index].DataType in ftSupported - ftBlobTypes) then
{.$ENDIF} {.$ENDIF}
Result := Pointer(Integer(PChar(Buffer)) + FOffsets^[Index]) Result := Pointer(PtrInt(PChar(Buffer)) + FOffsets^[Index])
else Result := nil; else Result := nil;
end; end;

14
components/rx/vclutils.pas
View File

@@ -186,11 +186,12 @@ end;
procedure RotateLabel(Canvas: TCanvas; x, y: Integer; const St: String; RotDegree: Integer); procedure RotateLabel(Canvas: TCanvas; x, y: Integer; const St: String; RotDegree: Integer);
var var
OldFont, NewFont: HFONT; { OldFont, NewFont: HFONT;
LogRec: TLOGFONT; LogRec: TLOGFONT;
DC: HDC; DC: HDC;}
L:integer;
begin begin
with Canvas do { with Canvas do
begin begin
Brush.Style := bsClear; Brush.Style := bsClear;
GetObject(Font.Handle, SizeOf(LogRec), @LogRec); GetObject(Font.Handle, SizeOf(LogRec), @LogRec);
@@ -202,7 +203,12 @@ begin
end; end;
OldFont := SelectObject(DC, NewFont); OldFont := SelectObject(DC, NewFont);
TextOut(DC, X, Y, @St[1], Length(St)); TextOut(DC, X, Y, @St[1], Length(St));
DeleteObject(SelectObject(DC, OldFont)); DeleteObject(SelectObject(DC, OldFont));}
L:=Canvas.Font.Orientation;
Canvas.Font.Orientation:=RotDegree * 10;
Canvas.TextOut(X, Y, St);
Canvas.Font.Orientation:=L;
end; end;