Make compatible to actual svn, Mac OSX Compatibility

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@253 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
christian_u
2007-09-02 19:04:07 +00:00
parent 5d38e0badc
commit 55d828ec76
4 changed files with 88 additions and 6354 deletions

View File

@@ -1570,8 +1570,8 @@ var
R: TRect;
S: WideString;
DrawFormat: Cardinal;
xxBidiMode: TBidiMode;
// xAlignment: TAlignment;
xBidiMode: Classes.TBidiMode;
xAlignment: TAlignment;
PaintInfo: TVTPaintInfo;
Dummy: TColumnIndex;
@@ -1584,28 +1584,28 @@ begin
DrawFormat := DT_TOP or DT_NOPREFIX or DT_CALCRECT or DT_WORDBREAK;
if Column <= NoColumn then
begin
//b BidiMode := Self.BidiMode;
// xAlignment := Self.Alignment;
xBidiMode := Self.BidiMode;
xAlignment := Self.Alignment;
end
else
begin
//b BidiMode := Header.Columns[Column].BidiMode;
// xAlignment := Header.Columns[Column].Alignment;
BidiMode := Header.Columns[Column].BidiMode;
xAlignment := Header.Columns[Column].Alignment;
end;
//b if BidiMode <> bdLeftToRight then
//b ChangeBidiModeAlignment(Alignment);
// if xBidiMode <> bdLeftToRight then
// ChangeBidiModeAlignment(Alignment);
// Allow for autospanning.
PaintInfo.Node := Node;
//b PaintInfo.BidiMode := BidiMode;
PaintInfo.BidiMode := xBidiMode;
PaintInfo.Column := Column;
PaintInfo.CellRect := R;
AdjustPaintCellRect(PaintInfo, Dummy);
//b if BidiMode <> bdLeftToRight then
//b DrawFormat := DrawFormat or DT_RIGHT or DT_RTLREADING
//b else
if xBidiMode <> bdLeftToRight then
DrawFormat := DrawFormat or DT_RIGHT or DT_RTLREADING
else
DrawFormat := DrawFormat or DT_LEFT;
DrawTextW(xCanvas, PWideChar(S), PaintInfo.CellRect, DrawFormat, False); //theo
Result := PaintInfo.CellRect.Bottom - PaintInfo.CellRect.Top;