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

richmemo: renamed values of TTabAlignment from ta** to tab** to prevent name collision with Classes.TAlignment.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4140 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz
2015-05-18 12:16:18 +00:00
parent d245500ae0
commit e1182fc49d
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/richmemo/cocoa/cocoarichmemo.pas
View File

@ -472,11 +472,11 @@ var
rng : NSRange; rng : NSRange;
const const
TabAlignMap : array [TTabAlignment] of NSTextTabType = ( TabAlignMap : array [TTabAlignment] of NSTextTabType = (
NSLeftTabStopType, // taLeft, NSLeftTabStopType, // tabLeft,
NSCenterTabStopType, // taCenter, NSCenterTabStopType, // tabCenter,
NSRightTabStopType, // taRight, NSRightTabStopType, // tabRight,
NSDecimalTabStopType, // taDecimal NSDecimalTabStopType, // tabDecimal
NSLeftTabStopType // taWordBar - not supported NSLeftTabStopType // tabWordBar - not supported
); );
begin begin
view:=MemoTextView(AWinControl); view:=MemoTextView(AWinControl);
@ -526,9 +526,9 @@ begin
tab:=NSTextTab(tabs.objectAtIndex(i)); tab:=NSTextTab(tabs.objectAtIndex(i));
AStopList.Tabs[i].Offset:=tab.location; AStopList.Tabs[i].Offset:=tab.location;
case tab.tabStopType of case tab.tabStopType of
NSCenterTabStopType: AStopList.Tabs[i].Align:= taCenter; NSCenterTabStopType: AStopList.Tabs[i].Align:= tabCenter;
NSRightTabStopType: AStopList.Tabs[i].Align:= taRight; NSRightTabStopType: AStopList.Tabs[i].Align:= tabRight;
NSDecimalTabStopType: AStopList.Tabs[i].Align:= taDecimal; NSDecimalTabStopType: AStopList.Tabs[i].Align:= tabDecimal;
else else
AStopList.Tabs[i].Align:=taLeft; AStopList.Tabs[i].Align:=taLeft;
end; end;

2
components/richmemo/richmemo.pas
View File

@ -94,7 +94,7 @@ type
end; end;
type type
TTabAlignment = (taLeft, taCenter, taRight, taDecimal, taWordBar); TTabAlignment = (tabLeft, tabCenter, tabRight, tabDecimal, tabWordBar);
TTabStop = record TTabStop = record
Offset : Double; Offset : Double;

20
components/richmemo/win32/win32richmemo.pas
View File

@ -874,11 +874,11 @@ var
i : Integer; i : Integer;
const const
PARAALIGN : array [TTabAlignment] of LongWord = ( PARAALIGN : array [TTabAlignment] of LongWord = (
0 shl TAB_OFFSET_BITS, // taHead, 0 shl TAB_OFFSET_BITS, // tabHead,
1 shl TAB_OFFSET_BITS, // taCenter, 1 shl TAB_OFFSET_BITS, // tabCenter,
2 shl TAB_OFFSET_BITS, // taTail, 2 shl TAB_OFFSET_BITS, // tabTail,
3 shl TAB_OFFSET_BITS, // taDecimal, 3 shl TAB_OFFSET_BITS, // tabDecimal,
4 shl TAB_OFFSET_BITS // taWordBar 4 shl TAB_OFFSET_BITS // tabWordBar
); );
begin begin
@ -926,12 +926,12 @@ begin
v:=para.rgxTabs[i]; v:=para.rgxTabs[i];
AStopList.Tabs[i].Offset:=(v and TAB_OFFSET_MASK) / TWIP_PT; AStopList.Tabs[i].Offset:=(v and TAB_OFFSET_MASK) / TWIP_PT;
case (v shr TAB_OFFSET_BITS) and TAB_ALIGN_MASK of case (v shr TAB_OFFSET_BITS) and TAB_ALIGN_MASK of
TAB_CENTER : al:=taCenter; TAB_CENTER : al:=tabCenter;
TAB_RIGHT : al:=taRight; TAB_RIGHT : al:=tabRight;
TAB_DECIMAL: al:=taDecimal; TAB_DECIMAL: al:=tabDecimal;
TAB_WORD : al:=taWordBar; TAB_WORD : al:=tabWordBar;
else else
al:=taLeft; al:=tabLeft;
end; end;
AStopList.Tabs[i].Align:=al; AStopList.Tabs[i].Align:=al;
end; end;