From e1182fc49d89c14e05065d00c88fe560ac071c7f Mon Sep 17 00:00:00 2001 From: skalogryz Date: Mon, 18 May 2015 12:16:18 +0000 Subject: [PATCH] richmemo: renamed values of TTabAlignment from ta** to tab** to prevent name collision with Classes.TAlignment. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4140 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/richmemo/cocoa/cocoarichmemo.pas | 16 ++++++++-------- components/richmemo/richmemo.pas | 2 +- components/richmemo/win32/win32richmemo.pas | 20 ++++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/components/richmemo/cocoa/cocoarichmemo.pas b/components/richmemo/cocoa/cocoarichmemo.pas index bcdd0d3d1..f7fa9fb86 100644 --- a/components/richmemo/cocoa/cocoarichmemo.pas +++ b/components/richmemo/cocoa/cocoarichmemo.pas @@ -472,11 +472,11 @@ var rng : NSRange; const TabAlignMap : array [TTabAlignment] of NSTextTabType = ( - NSLeftTabStopType, // taLeft, - NSCenterTabStopType, // taCenter, - NSRightTabStopType, // taRight, - NSDecimalTabStopType, // taDecimal - NSLeftTabStopType // taWordBar - not supported + NSLeftTabStopType, // tabLeft, + NSCenterTabStopType, // tabCenter, + NSRightTabStopType, // tabRight, + NSDecimalTabStopType, // tabDecimal + NSLeftTabStopType // tabWordBar - not supported ); begin view:=MemoTextView(AWinControl); @@ -526,9 +526,9 @@ begin tab:=NSTextTab(tabs.objectAtIndex(i)); AStopList.Tabs[i].Offset:=tab.location; case tab.tabStopType of - NSCenterTabStopType: AStopList.Tabs[i].Align:= taCenter; - NSRightTabStopType: AStopList.Tabs[i].Align:= taRight; - NSDecimalTabStopType: AStopList.Tabs[i].Align:= taDecimal; + NSCenterTabStopType: AStopList.Tabs[i].Align:= tabCenter; + NSRightTabStopType: AStopList.Tabs[i].Align:= tabRight; + NSDecimalTabStopType: AStopList.Tabs[i].Align:= tabDecimal; else AStopList.Tabs[i].Align:=taLeft; end; diff --git a/components/richmemo/richmemo.pas b/components/richmemo/richmemo.pas index 3a0b8faad..ee941c99a 100644 --- a/components/richmemo/richmemo.pas +++ b/components/richmemo/richmemo.pas @@ -94,7 +94,7 @@ type end; type - TTabAlignment = (taLeft, taCenter, taRight, taDecimal, taWordBar); + TTabAlignment = (tabLeft, tabCenter, tabRight, tabDecimal, tabWordBar); TTabStop = record Offset : Double; diff --git a/components/richmemo/win32/win32richmemo.pas b/components/richmemo/win32/win32richmemo.pas index b025d59f5..4b7ca658b 100644 --- a/components/richmemo/win32/win32richmemo.pas +++ b/components/richmemo/win32/win32richmemo.pas @@ -874,11 +874,11 @@ var i : Integer; const PARAALIGN : array [TTabAlignment] of LongWord = ( - 0 shl TAB_OFFSET_BITS, // taHead, - 1 shl TAB_OFFSET_BITS, // taCenter, - 2 shl TAB_OFFSET_BITS, // taTail, - 3 shl TAB_OFFSET_BITS, // taDecimal, - 4 shl TAB_OFFSET_BITS // taWordBar + 0 shl TAB_OFFSET_BITS, // tabHead, + 1 shl TAB_OFFSET_BITS, // tabCenter, + 2 shl TAB_OFFSET_BITS, // tabTail, + 3 shl TAB_OFFSET_BITS, // tabDecimal, + 4 shl TAB_OFFSET_BITS // tabWordBar ); begin @@ -926,12 +926,12 @@ begin v:=para.rgxTabs[i]; AStopList.Tabs[i].Offset:=(v and TAB_OFFSET_MASK) / TWIP_PT; case (v shr TAB_OFFSET_BITS) and TAB_ALIGN_MASK of - TAB_CENTER : al:=taCenter; - TAB_RIGHT : al:=taRight; - TAB_DECIMAL: al:=taDecimal; - TAB_WORD : al:=taWordBar; + TAB_CENTER : al:=tabCenter; + TAB_RIGHT : al:=tabRight; + TAB_DECIMAL: al:=tabDecimal; + TAB_WORD : al:=tabWordBar; else - al:=taLeft; + al:=tabLeft; end; AStopList.Tabs[i].Align:=al; end;