paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-03 09:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: Allow specified PopupMenu in TabControl when page-selector menu disabled. Issue #37171

Browse Source 
git-svn-id: branches/fixes_2_0@63478 -
This commit is contained in:
mattias 2020-06-28 17:02:16 +00:00
parent 981a213c56
commit 279ac8e978
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/comctrls.pp
View File

@ -734,6 +734,7 @@ type
procedure MouseUp(Button: TMouseButton; Shift:TShiftState; X,Y:Integer); override; procedure MouseUp(Button: TMouseButton; Shift:TShiftState; X,Y:Integer); override;
procedure MouseEnter; override; procedure MouseEnter; override;
procedure MouseLeave; override; procedure MouseLeave; override;
function GetPopupMenu: TPopupMenu; override;
class procedure WSRegisterClass; override; class procedure WSRegisterClass; override;
end; end;
TNoteBookStringsTabControlClass = class of TNoteBookStringsTabControl; TNoteBookStringsTabControlClass = class of TNoteBookStringsTabControl;
@ -909,6 +910,7 @@ type
property OnStartDock; property OnStartDock;
property OnStartDrag; property OnStartDrag;
property OnUnDock; property OnUnDock;
property Options;
property ParentBiDiMode; property ParentBiDiMode;
property ParentFont; property ParentFont;
property ParentShowHint; property ParentShowHint;

8
lcl/include/tabcontrol.inc
View File

@ -198,6 +198,14 @@ begin
TTabControl(Parent).OnMouseLeave(Parent); TTabControl(Parent).OnMouseLeave(Parent);
end; end;
function TNoteBookStringsTabControl.GetPopupMenu: TPopupMenu;
begin
if (Parent is TTabControl) and (nboHidePageListPopup in Self.Options) then
Result:=TTabControl(Parent).PopupMenu
else
Result:=inherited GetPopupMenu;
end;
class procedure TNoteBookStringsTabControl.WSRegisterClass; class procedure TNoteBookStringsTabControl.WSRegisterClass;
begin begin
inherited WSRegisterClass; inherited WSRegisterClass;