diff --git a/components/spktoolbar/SpkToolbar/SpkToolbar.pas b/components/spktoolbar/SpkToolbar/SpkToolbar.pas index 3e38e2eef..0e029570d 100644 --- a/components/spktoolbar/SpkToolbar/SpkToolbar.pas +++ b/components/spktoolbar/SpkToolbar/SpkToolbar.pas @@ -2716,12 +2716,13 @@ end; procedure TSpkToolbar.SetBiDiMode(Value: TBiDiMode); begin - if BiDiMode = Value then exit; - inherited SetBiDiMode(Value); - FTabs.IsRightToLeft := IsRightToLeft; - SetMetricsInvalid; - if not (FInternalUpdating or FUpdating) then - Repaint; + if BiDiMode <> Value then + begin + inherited SetBiDiMode(Value); + SetMetricsInvalid; + if not (FInternalUpdating or FUpdating) then + Repaint; + end; end; end. diff --git a/components/spktoolbar/SpkToolbar/spkt_Items.pas b/components/spktoolbar/SpkToolbar/spkt_Items.pas index 4dfe65b7f..1a51271d7 100644 --- a/components/spktoolbar/SpkToolbar/spkt_Items.pas +++ b/components/spktoolbar/SpkToolbar/spkt_Items.pas @@ -31,7 +31,6 @@ type FDisabledLargeImages: TImageList; FImagesWidth: Integer; FLargeImagesWidth: Integer; - FIsRightToLeft: Boolean; // *** Getters and setters *** procedure SetToolbarDispatch(const Value: TSpkBaseToolbarDispatch); @@ -43,7 +42,6 @@ type procedure SetDisabledLargeImages(const Value: TImageList); procedure SetImagesWidth(const Value: Integer); procedure SetLargeImagesWidth(const Value: Integer); - procedure SetIsRightToLeft(const Value: Boolean); public function AddLargeButton: TSpkLargeButton; @@ -64,7 +62,6 @@ type property DisabledLargeImages: TImageList read FDisabledLargeImages write SetDisabledLargeImages; property ImagesWidth: Integer read FImagesWidth write SetImagesWidth; property LargeImagesWidth: Integer read FLargeImagesWidth write SetLargeImagesWidth; - property IsRightToLeft: Boolean read FIsRightToLeft write SetIsRightToLeft; end; implementation @@ -184,12 +181,6 @@ begin Items[i].ImagesWidth := Value; end; -procedure TSpkItems.SetIsRightToLeft(const Value: Boolean); -begin - if FIsRightToLeft = Value then exit; - FIsRightToLeft := Value; -end; - procedure TSpkItems.SetLargeImages(const Value: TImageList); var i: Integer; diff --git a/components/spktoolbar/SpkToolbar/spkt_Pane.pas b/components/spktoolbar/SpkToolbar/spkt_Pane.pas index 30f602df5..1741beb98 100644 --- a/components/spktoolbar/SpkToolbar/spkt_Pane.pas +++ b/components/spktoolbar/SpkToolbar/spkt_Pane.pas @@ -146,8 +146,6 @@ type end; TSpkPanes = class(TSpkCollection) - private - FIsRightToLeft: Boolean; protected FToolbarDispatch: TSpkBaseToolbarDispatch; FAppearance: TSpkToolbarAppearance; @@ -168,7 +166,6 @@ type procedure SetDisabledLargeImages(const Value: TImageList); procedure SetImagesWidth(const Value: Integer); procedure SetLargeImagesWidth(const Value: Integer); - procedure SetIsRightToLeft(const Value: Boolean); public // *** Adding and inserting elements *** @@ -187,7 +184,6 @@ type property LargeImages: TImageList read FLargeImages write SetLargeImages; property DisabledLargeImages: TImageList read FDisabledLargeImages write SetDisabledLargeImages; property ImagesWidth: Integer read FImagesWidth write SetImagesWidth; - property IsRightToLeft: Boolean read FIsRightToLeft write SetIsRightToLeft; property LargeImagesWidth: Integer read FLargeImagesWidth write SetLargeImagesWidth; end; @@ -1373,16 +1369,6 @@ begin Items[i].ImagesWidth := Value; end; -procedure TSpkPanes.SetIsRightToLeft(const Value: Boolean); -var - i: Integer; -begin - if FIsRightToLeft = Value then exit; - FIsRightToLeft := Value; - for i := 0 to Count-1 do - Items[i].Items.IsRightToLeft := Value; -end; - procedure TSpkPanes.SetLargeImages(const Value: TImageList); var I: Integer; diff --git a/components/spktoolbar/SpkToolbar/spkt_Tab.pas b/components/spktoolbar/SpkToolbar/spkt_Tab.pas index 265b187a3..db8691dd6 100644 --- a/components/spktoolbar/SpkToolbar/spkt_Tab.pas +++ b/components/spktoolbar/SpkToolbar/spkt_Tab.pas @@ -151,7 +151,6 @@ type FDisabledLargeImages: TImageList; FImagesWidth: Integer; FLargeImagesWidth: Integer; - FIsRightToLeft: Boolean; procedure SetToolbarDispatch(const Value: TSpkBaseToolbarDispatch); function GetItems(AIndex: integer): TSpkTab; reintroduce; procedure SetAppearance(const Value: TSpkToolbarAppearance); @@ -160,7 +159,6 @@ type procedure SetLargeImages(const Value: TImageList); procedure SetDisabledLargeImages(const Value: TImageList); procedure SetImagesWidth(const Value: Integer); - procedure SetIsRightToLeft(const Value: Boolean); procedure SetLargeImagesWidth(const Value: Integer); public function Add: TSpkTab; @@ -177,7 +175,6 @@ type property DisabledLargeImages: TImageList read FDisabledLargeImages write SetDisabledLargeImages; property ImagesWidth: Integer read FImagesWidth write SetImagesWidth; property LargeImagesWidth: Integer read FLargeImagesWidth write SetLargeImagesWidth; - property IsRightToLeft: boolean read FIsRightToLeft write SetIsRightToLeft; end; @@ -767,16 +764,6 @@ begin Items[i].ImagesWidth := Value; end; -procedure TSpkTabs.SetIsRightToLeft(const Value: Boolean); -var - i: Integer; -begin - if FIsRightToLeft = Value then exit; - FIsRightToLeft := Value; - for i := 0 to Count-1 do - Items[i].Panes.IsRightToLeft := Value; -end; - procedure TSpkTabs.SetLargeImages(const Value: TImageList); var i: Integer;