From f7152825d1f8eb5cc4ffb29c8d26aa2cad2172df Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 6 Sep 2013 09:49:37 +0000 Subject: [PATCH] LCL: TabControl, inherit internal tabs from PageControl git-svn-id: trunk@42632 - --- lcl/comctrls.pp | 3 ++- lcl/include/tabcontrol.inc | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp index d6fd7425ea..31f4afa997 100644 --- a/lcl/comctrls.pp +++ b/lcl/comctrls.pp @@ -687,10 +687,11 @@ type { TNoteBookStringsTabControl } - TNoteBookStringsTabControl = class(TCustomTabControl) + TNoteBookStringsTabControl = class(TPageControl) // TCustomTabControl, TODO TCustomTabControl, and fix all widgetsets protected FHandelCreated: TNotifyEvent; procedure CreateHandle; override; + class procedure WSRegisterClass; override; end; TNoteBookStringsTabControlClass = class of TNoteBookStringsTabControl; diff --git a/lcl/include/tabcontrol.inc b/lcl/include/tabcontrol.inc index 98ebf168f7..ffdeb2a54e 100644 --- a/lcl/include/tabcontrol.inc +++ b/lcl/include/tabcontrol.inc @@ -148,6 +148,13 @@ begin FHandelCreated(self); end; +class procedure TNoteBookStringsTabControl.WSRegisterClass; +begin + inherited WSRegisterClass; + // TODO: + //RegisterWSComponent(TNoteBookStringsTabControl, TWSPageControl); +end; + { TTabControlNoteBookStrings } procedure TTabControlNoteBookStrings.NBGetImageIndex(Sender: TObject; @@ -648,6 +655,7 @@ var TabAreaSize: LongInt; begin TabAreaSize := TTabControlStrings(FTabs).GetSize; + case TabPosition of tpTop: ARect.Top:=Min(TabAreaSize,ARect.Bottom); tpBottom: ARect.Bottom:=Max(ARect.Bottom-TabAreaSize,ARect.Top);