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

jvcllaz: Fix compilation on macOS and on 64-bit.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7431 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-05-06 10:40:05 +00:00
parent 6952568642
commit f2502d8ad3
15 changed files with 73 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/jvcllaz/design/JvPageComps/jvpagecompsreg.pas
View File

@ -15,12 +15,12 @@ implementation
uses
ImgList,
PropEdits, ComponentEditors,
PropEdits, ComponentEditors, TreeViewPropEdit,
JvDsgnConsts, JvPageList,
JvNavigationPane, JvNavPaneEditors,
JvTabBar, JvTabBarXPPainter,
JvNotebookPageList,
JvPageListEditors,
JvPageListEditors, JvPageLinkEditorForm,
JvPageListTreeView;
procedure Register;
@ -67,7 +67,10 @@ begin
TJvSettingsTreeView
]);
RegisterClasses([TJvSettingsTreeView, TJvPageListTreeView]);
RegisterComponentEditor(TJvCustomPageListTreeView, TTreeViewComponentEditor);
RegisterPropertyEditor(TypeInfo(TJvPageLinks),
TJvCustomPageListTreeView, '', TJvPageLinksProperty);
RegisterPropertyEditor(TypeInfo(TImageIndex), TJvSettingsTreeImages, '',
TJvSettingsTreeImagesProperty);

1
components/jvcllaz/design/JvPageComps/jvpagelinkeditorform.lfm
View File

@ -61,7 +61,6 @@ object frmJvTreeViewLinksEditor: TfrmJvTreeViewLinksEditor
Width = 155
Height = 167
Align = alClient
ChangeDelay = 60
HideSelection = False
Indent = 19
PopupMenu = popTree

17
components/jvcllaz/design/JvPageComps/jvpagelinkeditorform.pas
View File

@ -31,7 +31,8 @@ $Id$
unit JvPageLinkEditorForm;
{$I jvcl.inc}
{$mode objfpc}{$H+}
//{$I jvcl.inc}
interface
@ -39,7 +40,8 @@ uses
Classes, SysUtils, Windows, Forms, Controls, StdCtrls, ExtCtrls, ComCtrls,
ActnList, Menus,
Variants,
DesignEditors, DesignIntf,
//DesignEditors, DesignIntf,
PropEdits,
JvPageList, JvPageListTreeView, JvComponent;
type
@ -50,7 +52,7 @@ type
procedure Edit; override;
end;
TfrmJvTreeViewLinksEditor = class(TJvForm)
TfrmJvTreeViewLinksEditor = class(TForm) //TJvForm)
tvItems: TTreeView;
btnLink: TButton;
lbPages: TListBox;
@ -69,8 +71,7 @@ type
Splitter2: TSplitter;
procedure tvItemsChange(Sender: TObject; Node: TTreeNode);
procedure acLinkExecute(Sender: TObject);
procedure acMainUpdate(Action: TBasicAction;
var Handled: Boolean);
procedure acMainUpdate(AnAction: TBasicAction; var Handled: Boolean);
procedure FormResize(Sender: TObject);
private
FTreeView:TCustomTreeView;
@ -89,7 +90,7 @@ implementation
uses
JvDsgnConsts;
{$R *.dfm}
{$R *.lfm}
type
THackTreeView = class(TJvCustomPageListTreeView);
@ -154,7 +155,7 @@ begin
else
if (Index >= 10) and (Index < 36) then
Result.ShortCut := ShortCut(Ord('A') + Index - 10, [ssCtrl]);
Result.OnClick := DoPopClick;
Result.OnClick := @DoPopClick;
end;
procedure TfrmJvTreeViewLinksEditor.AssignComponents(TreeView: TCustomTreeView;
@ -258,7 +259,7 @@ begin
N.Text := GetNewTreeText(N.Text, lbPages.ItemIndex);
end;
procedure TfrmJvTreeViewLinksEditor.acMainUpdate(Action: TBasicAction;
procedure TfrmJvTreeViewLinksEditor.acMainUpdate(AnAction: TBasicAction;
var Handled: Boolean);
begin
acLink.Enabled := (tvItems.Selected <> nil) and (lbPages.ItemIndex > -1);