diff --git a/components/jvcllaz/design/JvCore/jvstringsform.pas b/components/jvcllaz/design/JvCore/jvstringsform.pas index aaf13ab33..0268172b8 100644 --- a/components/jvcllaz/design/JvCore/jvstringsform.pas +++ b/components/jvcllaz/design/JvCore/jvstringsform.pas @@ -36,9 +36,10 @@ uses LCLType, Classes, //Windows, - Forms, Controls, Dialogs, StdCtrls, ExtCtrls, + Forms, Controls, Dialogs, StdCtrls, ExtCtrls //DesignIntf, DesignEditors, - JvComponent; + //JvComponent + ; type TJvStrEditDlg = class(TForm) //TJvForm) @@ -56,7 +57,7 @@ type procedure FileSave(Sender: TObject); procedure UpdateStatus(Sender: TObject); procedure FormCreate(Sender: TObject); - procedure MemoKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); + procedure MemoKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState); procedure HelpBtnClick(Sender: TObject); private // (rom) removed string[15] to increase flexibility diff --git a/components/jvcllaz/design/JvCustomControls/jvoutlookbareditors.pas b/components/jvcllaz/design/JvCustomControls/jvoutlookbareditors.pas index 29249c404..6c9fafff2 100644 --- a/components/jvcllaz/design/JvCustomControls/jvoutlookbareditors.pas +++ b/components/jvcllaz/design/JvCustomControls/jvoutlookbareditors.pas @@ -31,7 +31,7 @@ interface uses // LazLogger, - SysUtils, Classes, Controls, Forms, ToolWin, Menus, ActnList, ComCtrls, ImgList, + SysUtils, Classes, Controls, Forms, Menus, ActnList, ComCtrls, ImgList, PropEdits, GraphPropEdits, ComponentEditors, JvOutlookBar; diff --git a/components/jvcllaz/design/JvCustomControls/jvoutlookbarform.pas b/components/jvcllaz/design/JvCustomControls/jvoutlookbarform.pas index 091e98a2b..57badd746 100644 --- a/components/jvcllaz/design/JvCustomControls/jvoutlookbarform.pas +++ b/components/jvcllaz/design/JvCustomControls/jvoutlookbarform.pas @@ -54,17 +54,17 @@ type procedure AcShowToolbarCaptionsExecute(Sender: TObject); procedure AcToolbarExecute(Sender: TObject); procedure AcUpdateExecute(Sender: TObject); - procedure AlActionsUpdate(AAction: TBasicAction; var Handled: Boolean); + procedure AlActionsUpdate({%H-}AAction: TBasicAction; var {%H-}Handled: Boolean); procedure FormActivate(Sender: TObject); - procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); + procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction); procedure FormCreate(Sender: TObject); procedure FormDestroy(Sender: TObject); procedure FormShow(Sender: TObject); procedure TvItemsChange(Sender: TObject; Node: TTreeNode); - procedure TvItemsCollapsing(Sender: TObject; Node: TTreeNode; - var AllowCollapse: Boolean); + procedure TvItemsCollapsing(Sender: TObject; {%H-}Node: TTreeNode; + var {%H-}AllowCollapse: Boolean); procedure TvItemsEdited(Sender: TObject; Node: TTreeNode; var S: string); - procedure TvItemsKeyPress(Sender: TObject; var Key: char); + procedure TvItemsKeyPress(Sender: TObject; var {%H-}Key: char); private FUpdateSelectionCount: Integer; FLargeToolBtnSize: Integer; @@ -113,11 +113,11 @@ implementation {$R *.lfm} uses - PropEditUtils, IDEWindowIntf, IDEImagesIntf, ObjInspStrConsts, + PropEditUtils, IDEWindowIntf, IDEImagesIntf, ObjInspStrConsts {$IF LCL_FullVersion < 1080000} - JvJVCLUtils, + , JvJVCLUtils {$ENDIF} - JvConsts; + ; type THackOutlookBar = class(TJvCustomOutlookBar); @@ -418,8 +418,8 @@ end; procedure TFrmOLBEditor.ExchangeItems(Node1, Node2: TTreeNode); var I: Integer; - page1, page2: TJvOutlookBarPage; - btn1, btn2: TJvOutlookBarButton; + //page1, page2: TJvOutlookBarPage; + //btn1, btn2: TJvOutlookBarButton; begin (* if TObject(Node1.Data) is TJvOutlookBarButton then @@ -678,8 +678,6 @@ end; procedure TFrmOLBEditor.RefreshNames; var pageNode, buttonNode: TTreeNode; - obj: TObject; - s: string; begin if (FOutlookBar = nil) or (FDesigner = nil) then exit; @@ -728,7 +726,6 @@ end; procedure TFrmOLBEditor.SelectPageInObjectInspector(APage: TJvOutlookbarPage; ForceUpdate: Boolean); var - I: Integer; NewSelection: TPersistentSelectionList; begin if (FOutlookBar = nil) or (GlobalDesignHook = nil) then @@ -749,7 +746,6 @@ end; procedure TFrmOLBEditor.SelectButtonInObjectInspector(AButton: TJvOutlookBarButton; ForceUpdate: Boolean); var - I: Integer; NewSelection: TPersistentSelectionList; begin if (FOutlookBar = nil) or (GlobalDesignHook = nil) then diff --git a/components/jvcllaz/design/JvPageComps/jvpagecompsreg.pas b/components/jvcllaz/design/JvPageComps/jvpagecompsreg.pas index bc6b522ba..0b6f8a23f 100644 --- a/components/jvcllaz/design/JvPageComps/jvpagecompsreg.pas +++ b/components/jvcllaz/design/JvPageComps/jvpagecompsreg.pas @@ -19,7 +19,7 @@ uses JvDsgnConsts, JvNavigationPane, JvNavPaneEditors, JvTabBar, JvTabBarXPPainter, - JvPageList, JvNotebookPageList, + JvNotebookPageList, JvPageListEditors, JvPageListTreeView; diff --git a/components/jvcllaz/design/JvPageComps/jvpagelisteditors.pas b/components/jvcllaz/design/JvPageComps/jvpagelisteditors.pas index 0706f00a8..c8f5a8c67 100644 --- a/components/jvcllaz/design/JvPageComps/jvpagelisteditors.pas +++ b/components/jvcllaz/design/JvPageComps/jvpagelisteditors.pas @@ -31,8 +31,7 @@ interface uses SysUtils, Classes, ImgList, Menus, - PropEdits, GraphPropEdits, ComponentEditors, - JvPageList; //, JvDsgnEditors; + PropEdits, GraphPropEdits, ComponentEditors; type (* @@ -98,12 +97,13 @@ implementation uses TypInfo, - JvDsgnConsts, JvPageListTreeView; //, JvPageListEditorForm; + JvPageListTreeView; type - THackPageList = class(TJvPageList); +// THackPageList = class(TJvPageList); THackTreeView = class(TJvCustomPageListTreeView); +{ const cShowEditor = 0; cDash = 1; @@ -118,7 +118,7 @@ const unbvAddPage = 0; unbvDeletePage = 1; unbvShowPage = 2; - +} { TJvCustomPageListEditor } (****************************************** NOT WORKING diff --git a/components/jvcllaz/design/JvWizard/jvwizardeditorform.pas b/components/jvcllaz/design/JvWizard/jvwizardeditorform.pas index 717dd9921..b7274e5ef 100644 --- a/components/jvcllaz/design/JvWizard/jvwizardeditorform.pas +++ b/components/jvcllaz/design/JvWizard/jvwizardeditorform.pas @@ -125,9 +125,9 @@ type procedure FormShow(Sender: TObject); procedure lbxWizardPagesClick(Sender: TObject); procedure lbxWizardPagesMouseDown(Sender: TObject; - Button: TMouseButton; Shift: TShiftState; X, Y: Integer); + {%H-}Button: TMouseButton; {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer); procedure lbxWizardPagesDragOver(Sender, Source: TObject; X, Y: Integer; - State: TDragState; var Accept: Boolean); + {%H-}State: TDragState; var Accept: Boolean); procedure lbxWizardPagesDragDrop(Sender, Source: TObject; X, Y: Integer); procedure actWizardPagesUpdate(AAction: TBasicAction; var Handled: Boolean); diff --git a/components/jvcllaz/examples/JvDesigner/jvDesignerDemo.lpi b/components/jvcllaz/examples/JvDesigner/jvDesignerDemo.lpi index 736b843b2..d870e0890 100644 --- a/components/jvcllaz/examples/JvDesigner/jvDesignerDemo.lpi +++ b/components/jvcllaz/examples/JvDesigner/jvDesignerDemo.lpi @@ -50,6 +50,7 @@ + @@ -224,8 +225,8 @@ - - + + @@ -264,10 +265,9 @@ - - + @@ -275,123 +275,123 @@ - + - + - + - + - + - + - + - + - + - - - - - - + + + + + + - + - - + + - + - + - + - + - - + + - + - - + + - + - + - + - + - + - - + + - + - + - - + + @@ -414,15 +414,6 @@ - - - - - - - - - diff --git a/components/jvcllaz/examples/JvDialButton/jvdialbuttondemoform.lfm b/components/jvcllaz/examples/JvDialButton/jvdialbuttondemoform.lfm index 1ce87ad57..2bec62138 100644 --- a/components/jvcllaz/examples/JvDialButton/jvdialbuttondemoform.lfm +++ b/components/jvcllaz/examples/JvDialButton/jvdialbuttondemoform.lfm @@ -17,6 +17,7 @@ object Form1: TForm1 Color = clMoneyGreen DefaultPos = 0 ParentColor = False + Position = 40 Radius = 48 TickStyle = tsAuto TabOrder = 0 @@ -137,7 +138,7 @@ object Form1: TForm1 end object cbColor: TColorBox Left = 192 - Height = 24 + Height = 22 Top = 201 Width = 128 Selected = clMoneyGreen diff --git a/components/jvcllaz/examples/JvDialButton/jvdialbuttondemoform.pas b/components/jvcllaz/examples/JvDialButton/jvdialbuttondemoform.pas index 06e242680..342421bbf 100644 --- a/components/jvcllaz/examples/JvDialButton/jvdialbuttondemoform.pas +++ b/components/jvcllaz/examples/JvDialButton/jvdialbuttondemoform.pas @@ -77,6 +77,7 @@ begin FReady := true; cmbPointerShapeChange(nil); + JvDialButton1Change(nil); end; procedure TForm1.cmbPointerShapeChange(Sender: TObject); diff --git a/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi b/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi index a40618f26..8c4393fec 100644 --- a/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi +++ b/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi @@ -16,9 +16,6 @@ - - - @@ -88,8 +85,8 @@ - - + + @@ -139,7 +136,7 @@ - + @@ -238,6 +235,18 @@ + + + + + + + + + + + + diff --git a/components/jvcllaz/examples/JvSpecialProgress/main.lfm b/components/jvcllaz/examples/JvSpecialProgress/main.lfm index f97f8cb14..2865dabbc 100644 --- a/components/jvcllaz/examples/JvSpecialProgress/main.lfm +++ b/components/jvcllaz/examples/JvSpecialProgress/main.lfm @@ -55,8 +55,8 @@ object MainForm: TMainForm Left = 245 Height = 15 Top = 60 - Width = 57 - Caption = 'Start color:' + Width = 53 + Caption = 'End color:' ParentColor = False end object CbEndColor: TColorBox diff --git a/components/jvcllaz/examples/JvTabBar/JvTabBarDemo.lpi b/components/jvcllaz/examples/JvTabBar/JvTabBarDemo.lpi index d67ffa0ee..b442d1cfc 100644 --- a/components/jvcllaz/examples/JvTabBar/JvTabBarDemo.lpi +++ b/components/jvcllaz/examples/JvTabBar/JvTabBarDemo.lpi @@ -1,11 +1,13 @@ - + + + + - <Scaled Value="True"/> <ResourceType Value="res"/> diff --git a/components/jvcllaz/examples/JvTabBar/main.lfm b/components/jvcllaz/examples/JvTabBar/main.lfm index 84a8b3e90..c6addcd81 100644 --- a/components/jvcllaz/examples/JvTabBar/main.lfm +++ b/components/jvcllaz/examples/JvTabBar/main.lfm @@ -9,12 +9,13 @@ object Form1: TForm1 Menu = MainMenu1 OnCreate = FormCreate OnDestroy = FormDestroy - LCLVersion = '1.9.0.0' + LCLVersion = '2.1.0.0' object JvTabBar1: TJvTabBar Left = 0 Height = 24 Top = 42 Width = 614 + AutoSize = False Visible = False HotTracking = True Painter = JvModernTabBarPainter1 diff --git a/components/jvcllaz/examples/JvWizard/uformmain.lfm b/components/jvcllaz/examples/JvWizard/uformmain.lfm index 4fe95c7e5..b5ba9e306 100644 --- a/components/jvcllaz/examples/JvWizard/uformmain.lfm +++ b/components/jvcllaz/examples/JvWizard/uformmain.lfm @@ -1,17 +1,18 @@ object Form1: TForm1 Left = 366 - Height = 336 + Height = 317 Top = 212 - Width = 477 + Width = 756 + ActiveControl = JvWizardInteriorPage4 Caption = 'JvWizard demo' - ClientHeight = 336 - ClientWidth = 477 + ClientHeight = 317 + ClientWidth = 756 LCLVersion = '2.1.0.0' object JvWizard1: TJvWizard Left = 0 - Height = 336 + Height = 317 Top = 0 - Width = 477 + Width = 756 ActivePage = JvWizardInteriorPage4 ButtonBarHeight = 42 ButtonStart.Caption = 'To &Start Page' @@ -44,12 +45,12 @@ object Form1: TForm1 object JvWizardWelcomePage1: TJvWizardWelcomePage Header.ImageIndex = 0 Header.Title.Color = clNone - Header.Title.Text = 'Welcome' + Header.Title.Text = 'Welcome page' Header.Title.Anchors = [akTop, akLeft, akRight] Header.Title.Font.Height = -16 Header.Title.Font.Style = [fsBold] Header.Subtitle.Color = clNone - Header.Subtitle.Text = 'Subtitle of welcome page' + Header.Subtitle.Text = 'This is the JvWizard demo for Lazarus' Header.Subtitle.Anchors = [akTop, akLeft, akRight, akBottom] VisibleButtons = [bkNext, bkCancel] Caption = 'JvWizardWelcomePage1' @@ -2928,9 +2929,10 @@ object Form1: TForm1 01394E0FEDC22D466436238C189C00D8740600EF62B94ACCBC51680000000049 454E44AE426082 } - WaterMark.Width = 145 + WaterMark.Image.Layout = ilTile + WaterMark.Width = 300 object Label1: TLabel - Left = 162 + Left = 352 Height = 15 Top = 88 Width = 116 @@ -2941,13 +2943,14 @@ object Form1: TForm1 object JvWizardInteriorPage1: TJvWizardInteriorPage Header.ImageIndex = 1 Header.Title.Color = clNone - Header.Title.Text = 'Title of page 1' + Header.Title.Text = 'Page 1' Header.Title.Anchors = [akTop, akLeft, akRight] Header.Title.Font.Height = -16 Header.Title.Font.Style = [fsBold] Header.Subtitle.Color = clNone - Header.Subtitle.Text = 'Subtitle of page 1' + Header.Subtitle.Text = 'An edit control was added to page 1.' Header.Subtitle.Anchors = [akTop, akLeft, akRight, akBottom] + VisibleButtons = [bkStart, bkBack, bkNext, bkCancel] Caption = 'JvWizardInteriorPage1' object Label2: TLabel Left = 24 @@ -2969,13 +2972,14 @@ object Form1: TForm1 object JvWizardInteriorPage2: TJvWizardInteriorPage Header.ImageIndex = 2 Header.Title.Color = clNone - Header.Title.Text = 'Title of page 2' + Header.Title.Text = 'Page 2' Header.Title.Anchors = [akTop, akLeft, akRight] Header.Title.Font.Height = -16 Header.Title.Font.Style = [fsBold] Header.Subtitle.Color = clNone - Header.Subtitle.Text = 'Subtitle' + Header.Subtitle.Text = 'A checkbox and a radiobutton were added to page 2.' Header.Subtitle.Anchors = [akTop, akLeft, akRight, akBottom] + VisibleButtons = [bkStart, bkBack, bkNext, bkCancel] Caption = 'JvWizardInteriorPage2' object CheckBox1: TCheckBox Left = 32 @@ -2997,18 +3001,19 @@ object Form1: TForm1 object JvWizardInteriorPage3: TJvWizardInteriorPage Header.ImageIndex = 3 Header.Title.Color = clNone - Header.Title.Text = 'Title of page 3' + Header.Title.Text = 'Page 3' Header.Title.Anchors = [akTop, akLeft, akRight] Header.Title.Font.Height = -16 Header.Title.Font.Style = [fsBold] Header.Subtitle.Color = clNone - Header.Subtitle.Text = 'Subtitle' + Header.Subtitle.Text = 'A listbox was added to page 3.' Header.Subtitle.Anchors = [akTop, akLeft, akRight, akBottom] + VisibleButtons = [bkStart, bkBack, bkNext, bkCancel] Caption = 'JvWizardInteriorPage3' object ListBox1: TListBox - Left = 21 + Left = 16 Height = 187 - Top = 85 + Top = 80 Width = 187 Items.Strings = ( '123' @@ -3024,27 +3029,27 @@ object Form1: TForm1 object JvWizardInteriorPage4: TJvWizardInteriorPage Header.ImageIndex = 4 Header.Title.Color = clNone - Header.Title.Text = 'Title of page 4' + Header.Title.Text = 'Finished' Header.Title.Anchors = [akTop, akLeft, akRight] Header.Title.Font.Height = -16 Header.Title.Font.Style = [fsBold] Header.Subtitle.Color = clNone - Header.Subtitle.Text = 'Subtitle' + Header.Subtitle.Text = 'This completes this little demo.' Header.Subtitle.Anchors = [akTop, akLeft, akRight, akBottom] - VisibleButtons = [bkBack, bkFinish, bkCancel] + VisibleButtons = [bkStart, bkBack, bkFinish, bkCancel] Caption = 'JvWizardInteriorPage4' object Label3: TLabel Left = 27 Height = 15 Top = 94 - Width = 31 - Caption = 'Finish' + Width = 51 + Caption = 'Good bye' ParentColor = False end end object JvWizardRouteMapNodes1: TJvWizardRouteMapNodes Left = 0 - Height = 294 + Height = 275 Top = 0 Width = 145 Color = clBlack diff --git a/components/jvcllaz/packages/jvappfrmlazd.lpk b/components/jvcllaz/packages/jvappfrmlazd.lpk index ed5eaa0d9..0fca8066a 100644 --- a/components/jvcllaz/packages/jvappfrmlazd.lpk +++ b/components/jvcllaz/packages/jvappfrmlazd.lpk @@ -17,7 +17,7 @@ - animated icons, animated title, form wallpaper "/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="1"> <Item1> <Filename Value="..\design\JvAppFrm\jvappfrmreg.pas"/> diff --git a/components/jvcllaz/packages/jvappfrmlazr.lpk b/components/jvcllaz/packages/jvappfrmlazr.lpk index d7c2b8702..b9575ce2d 100644 --- a/components/jvcllaz/packages/jvappfrmlazr.lpk +++ b/components/jvcllaz/packages/jvappfrmlazr.lpk @@ -2,7 +2,7 @@ <CONFIG> <Package Version="4"> <PathDelim Value="\"/> - <Name Value="JvAppFrmLazR"/> + <Name Value="jvappfrmlazr"/> <Author Value="Various authors - see unit headers for details."/> <CompilerOptions> <Version Value="11"/> @@ -16,7 +16,7 @@ - animated icons, animated title, form wallpaper "/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="4"> <Item1> <Filename Value="..\run\JvAppFrm\jvformanimatedicon.pas"/> diff --git a/components/jvcllaz/packages/jvcllaz_all.lpg b/components/jvcllaz/packages/jvcllaz_all.lpg index 70dcd3d14..90b2614ca 100644 --- a/components/jvcllaz/packages/jvcllaz_all.lpg +++ b/components/jvcllaz/packages/jvcllaz_all.lpg @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectGroup FileVersion="1"> - <Targets Count="22"> - <Target0 FileName="JvCoreLazR.lpk"/> - <Target1 FileName="JvCoreLazD.lpk"/> - <Target2 FileName="JvCtrlsLazR.lpk"/> - <Target3 FileName="JvCtrlsLazD.lpk"/> - <Target4 FileName="JvStdCtrlsLazR.lpk"/> - <Target5 FileName="JvStdCtrlsLazD.lpk"/> - <Target6 FileName="JvDBLazR.lpk"/> - <Target7 FileName="JvDBLazD.lpk"/> - <Target8 FileName="JvPageCompsR.lpk"/> - <Target9 FileName="JvPageCompsD.lpk"/> - <Target10 FileName="JvValidatorsLazR.lpk"/> - <Target11 FileName="JvValidatorsLazD.lpk"/> - <Target12 FileName="JvXPCtrlsLazR.lpk"/> - <Target13 FileName="JvXPCtrlsLazD.lpk"/> + <Targets Count="24"> + <Target0 FileName="jvcorelazr.lpk"/> + <Target1 FileName="jvcorelazd.lpk"/> + <Target2 FileName="jvctrlslazr.lpk"/> + <Target3 FileName="jvctrlslazd.lpk"/> + <Target4 FileName="jvstdctrlslazr.lpk"/> + <Target5 FileName="jvstdctrlslazd.lpk"/> + <Target6 FileName="jvdblazr.lpk"/> + <Target7 FileName="jvdblazd.lpk"/> + <Target8 FileName="jvpagecompsr.lpk"/> + <Target9 FileName="jvpagecompsd.lpk"/> + <Target10 FileName="jvvalidatorslazr.lpk"/> + <Target11 FileName="jvvalidatorslazd.lpk"/> + <Target12 FileName="jvxpctrlslazr.lpk"/> + <Target13 FileName="jvxpctrlslazd.lpk"/> <Target14 FileName="jvruntimedesignlazr.lpk"/> <Target15 FileName="jvruntimedesignlazd.lpk"/> <Target16 FileName="jvcustomlazr.lpk"/> @@ -24,6 +24,8 @@ <Target19 FileName="jvcmpd.lpk"/> <Target20 FileName="jvjanslazr.lpk"/> <Target21 FileName="jvjanslazd.lpk"/> + <Target22 FileName="jvwizardlazr.lpk"/> + <Target23 FileName="jvwizardlazd.lpk"/> </Targets> </ProjectGroup> </CONFIG> diff --git a/components/jvcllaz/packages/jvcmpd.lpk b/components/jvcllaz/packages/jvcmpd.lpk index 2beca9fac..4e71c08f1 100644 --- a/components/jvcllaz/packages/jvcmpd.lpk +++ b/components/jvcllaz/packages/jvcmpd.lpk @@ -17,7 +17,7 @@ - Spellchecker component - StringHolder (easier access to TStrings at designtime)."/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="2"> <Item1> <Filename Value="..\design\JvCmp\jvcmpreg.pas"/> diff --git a/components/jvcllaz/packages/jvcmpr.lpk b/components/jvcllaz/packages/jvcmpr.lpk index 7d0da4d93..31d731dd6 100644 --- a/components/jvcllaz/packages/jvcmpr.lpk +++ b/components/jvcllaz/packages/jvcmpr.lpk @@ -17,7 +17,7 @@ - Spellchecker component - StringHolder (easier access to TStrings at designtime)."/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="5"> <Item1> <Filename Value="..\run\JvCmp\jvspellchecker.pas"/> diff --git a/components/jvcllaz/packages/jvcorelazd.lpk b/components/jvcllaz/packages/jvcorelazd.lpk index b8251ccb1..216fe37a3 100644 --- a/components/jvcllaz/packages/jvcorelazd.lpk +++ b/components/jvcllaz/packages/jvcorelazd.lpk @@ -14,9 +14,9 @@ <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\design\JvCore"/> </SearchPaths> </CompilerOptions> - <Description Value="JVCL Core Components (Designtime). Must be installed before any of the other JvXXX packages can be installed."/> + <Description Value="JVCL Core Components (Designtime). Must be compiled before any of the other JvXXX packages can be installed."/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="3"> <Item1> <Filename Value="..\design\JvCore\jvcorereg.pas"/> diff --git a/components/jvcllaz/packages/jvcorelazr.lpk b/components/jvcllaz/packages/jvcorelazr.lpk index d3115592d..bf0b7ba33 100644 --- a/components/jvcllaz/packages/jvcorelazr.lpk +++ b/components/jvcllaz/packages/jvcorelazr.lpk @@ -22,7 +22,7 @@ <Description Value="JVCL Core Components (Runtime). Must be compiled before any of the other JvXXX packages can be installed. "/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="9"> <Item1> <Filename Value="..\run\JvCore\jvtypes.pas"/> diff --git a/components/jvcllaz/packages/jvctrlslazd.lpk b/components/jvcllaz/packages/jvctrlslazd.lpk index 12e1c4119..9aa000e6d 100644 --- a/components/jvcllaz/packages/jvctrlslazd.lpk +++ b/components/jvcllaz/packages/jvctrlslazd.lpk @@ -18,7 +18,7 @@ Movable bevel and panel, ruler, expandable panel (RollOut), group header, hypertext components "/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="3"> <Item1> <Filename Value="..\design\JvCtrls\jvctrlsreg.pas"/> diff --git a/components/jvcllaz/packages/jvctrlslazr.lpk b/components/jvcllaz/packages/jvctrlslazr.lpk index 737edb325..809209788 100644 --- a/components/jvcllaz/packages/jvctrlslazr.lpk +++ b/components/jvcllaz/packages/jvctrlslazr.lpk @@ -16,7 +16,7 @@ Movable bevel and panel, ruler, exandable panel (RollOut), group header, hypertext components "/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="9"> <Item1> <Filename Value="..\run\JvCtrls\jvhint.pas"/> diff --git a/components/jvcllaz/packages/jvcustomlazd.lpk b/components/jvcllaz/packages/jvcustomlazd.lpk index 897a63973..fcf2e016a 100644 --- a/components/jvcllaz/packages/jvcustomlazd.lpk +++ b/components/jvcllaz/packages/jvcustomlazd.lpk @@ -17,7 +17,7 @@ TimeLine, OutlookBar, Thumbnail viewer, ImageViewer, ImageListViewer, OwnerDrawViewer "/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="4"> <Item1> <Filename Value="..\design\JvCustomControls\jvcustomreg.pas"/> diff --git a/components/jvcllaz/packages/jvcustomlazr.lpk b/components/jvcllaz/packages/jvcustomlazr.lpk index 489aa3c9f..7991ff764 100644 --- a/components/jvcllaz/packages/jvcustomlazr.lpk +++ b/components/jvcllaz/packages/jvcustomlazr.lpk @@ -15,7 +15,7 @@ <Description Value="Custom components of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code): TimeLine, OutlookBar, Thumbnail viewer, ImageViewer, ImageListViewer, OwnerDrawViewer"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="12"> <Item1> <Filename Value="..\run\JvCustomControls\jvtimeline.pas"/> diff --git a/components/jvcllaz/packages/jvdblazd.lpk b/components/jvcllaz/packages/jvdblazd.lpk index c5a2b404f..bf9b3325a 100644 --- a/components/jvcllaz/packages/jvdblazd.lpk +++ b/components/jvcllaz/packages/jvdblazd.lpk @@ -19,7 +19,7 @@ - Hypertext components "/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="1"> <Item1> <Filename Value="..\design\JvDB\jvdbreg.pas"/> diff --git a/components/jvcllaz/packages/jvdblazr.lpk b/components/jvcllaz/packages/jvdblazr.lpk index b84fea0a9..03097a75c 100644 --- a/components/jvcllaz/packages/jvdblazr.lpk +++ b/components/jvcllaz/packages/jvdblazr.lpk @@ -19,7 +19,7 @@ - Hypertext components "/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="8"> <Item1> <Filename Value="..\run\JvDB\jvdbhtlabel.pas"/> diff --git a/components/jvcllaz/packages/jvhmilazd.lpk b/components/jvcllaz/packages/jvhmilazd.lpk index bee9f4009..e9dafa9b0 100644 --- a/components/jvcllaz/packages/jvhmilazd.lpk +++ b/components/jvcllaz/packages/jvhmilazd.lpk @@ -19,7 +19,7 @@ - TJvLED - TJvSegmentedLEDDisplay"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="1"> <Item1> <Filename Value="..\design\JvHMI\jvhmireg.pas"/> diff --git a/components/jvcllaz/packages/jvhmilazr.lpk b/components/jvcllaz/packages/jvhmilazr.lpk index 9bbac52e2..ac704c184 100644 --- a/components/jvcllaz/packages/jvhmilazr.lpk +++ b/components/jvcllaz/packages/jvhmilazr.lpk @@ -18,7 +18,7 @@ - TJvLED - TJvSegmentedLEDDisplay"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="2"> <Item1> <Filename Value="..\run\JvHMI\jvdialbutton.pas"/> diff --git a/components/jvcllaz/packages/jvjanslazd.lpk b/components/jvcllaz/packages/jvjanslazd.lpk index 24429dbc9..da557faa0 100644 --- a/components/jvcllaz/packages/jvjanslazd.lpk +++ b/components/jvcllaz/packages/jvjanslazd.lpk @@ -13,11 +13,11 @@ <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\design\JvJans"/> </SearchPaths> </CompilerOptions> - <Description Value="Custom controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (designtime code of Jan's Components): + <Description Value="Custom controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (designtime code of Jan's Components): - YearGrid - Simulation components"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="1"> <Item1> <Filename Value="..\design\JvJans\jvjansreg.pas"/> diff --git a/components/jvcllaz/packages/jvjanslazr.lpk b/components/jvcllaz/packages/jvjanslazr.lpk index 00618638e..9ceb8f1be 100644 --- a/components/jvcllaz/packages/jvjanslazr.lpk +++ b/components/jvcllaz/packages/jvjanslazr.lpk @@ -12,11 +12,11 @@ <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\run\JvJans"/> </SearchPaths> </CompilerOptions> - <Description Value="Custom controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code of Jan's Components): + <Description Value="Custom controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code of Jan's Components): - YearGrid - Simulation components"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="12"> <Item1> <Filename Value="..\run\JvJans\jvyeargrid.pas"/> @@ -27,7 +27,7 @@ <UnitName Value="JvYearGridEditForm"/> </Item2> <Item3> - <Filename Value="..\run\JvJans/jvsimindicator.pas"/> + <Filename Value="..\run\JvJans\jvsimindicator.pas"/> <UnitName Value="JvSimIndicator"/> </Item3> <Item4> diff --git a/components/jvcllaz/packages/jvmmlazd.lpk b/components/jvcllaz/packages/jvmmlazd.lpk index ffa6733ca..a4f2d16f6 100644 --- a/components/jvcllaz/packages/jvmmlazd.lpk +++ b/components/jvcllaz/packages/jvmmlazd.lpk @@ -16,7 +16,7 @@ </CompilerOptions> <Description Value="JVCL Multimedia and image components (Design-time package): bmp animator, id3v1 and id3v2 tags, full color components and dialogs, gradient, gradient header, special progress bar, animated image"/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="5"> <Item1> <Filename Value="..\design\JvMM\jvmmreg.pas"/> diff --git a/components/jvcllaz/packages/jvmmlazr.lpk b/components/jvcllaz/packages/jvmmlazr.lpk index 33251c979..8cd379ff7 100644 --- a/components/jvcllaz/packages/jvmmlazr.lpk +++ b/components/jvcllaz/packages/jvmmlazr.lpk @@ -15,7 +15,7 @@ </CompilerOptions> <Description Value="JVCL Multimedia and image components (Run-time package): bmp animator, id3v1 and id3v2 tags, full color components and dialogs, gradient, gradient header, special progress bar, animated image"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="17"> <Item1> <Filename Value="..\run\JvMM\jvspecialprogress.pas"/> diff --git a/components/jvcllaz/packages/jvnetlazd.lpk b/components/jvcllaz/packages/jvnetlazd.lpk index 6944f79df..2579a7872 100644 --- a/components/jvcllaz/packages/jvnetlazd.lpk +++ b/components/jvcllaz/packages/jvnetlazd.lpk @@ -16,7 +16,7 @@ </CompilerOptions> <Description Value="JVCL net components (design-time)."/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="1"> <Item1> <Filename Value="..\design\JvNet\jvnetreg.pas"/> diff --git a/components/jvcllaz/packages/jvnetlazr.lpk b/components/jvcllaz/packages/jvnetlazr.lpk index 87fa91a49..58b2b9aef 100644 --- a/components/jvcllaz/packages/jvnetlazr.lpk +++ b/components/jvcllaz/packages/jvnetlazr.lpk @@ -14,7 +14,7 @@ </CompilerOptions> <Description Value="JVCL net components (Run-time): HTML parser, FormToHtml converter"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="4"> <Item1> <Filename Value="..\run\JvNet\jvhtmlparser.pas"/> diff --git a/components/jvcllaz/packages/jvpagecompsd.lpk b/components/jvcllaz/packages/jvpagecompsd.lpk index 51152737a..58bbdb64e 100644 --- a/components/jvcllaz/packages/jvpagecompsd.lpk +++ b/components/jvcllaz/packages/jvpagecompsd.lpk @@ -15,7 +15,7 @@ </CompilerOptions> <Description Value="Page style components of the JVCL library (https://sourceforge.net/projects/jvcl/) (designtime code)"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="3"> <Item1> <Filename Value="..\design\JvPageComps\jvpagecompsreg.pas"/> diff --git a/components/jvcllaz/packages/jvpagecompsr.lpk b/components/jvcllaz/packages/jvpagecompsr.lpk index 9e1afbd68..8b8ebe8bb 100644 --- a/components/jvcllaz/packages/jvpagecompsr.lpk +++ b/components/jvcllaz/packages/jvpagecompsr.lpk @@ -14,7 +14,7 @@ </CompilerOptions> <Description Value="Page style components of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code)"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="6"> <Item1> <Filename Value="..\run\JvPageComps\jvnavigationpane.pas"/> diff --git a/components/jvcllaz/packages/jvruntimedesignlazd.lpk b/components/jvcllaz/packages/jvruntimedesignlazd.lpk index 8119db4ac..1d335ddbb 100644 --- a/components/jvcllaz/packages/jvruntimedesignlazd.lpk +++ b/components/jvcllaz/packages/jvruntimedesignlazd.lpk @@ -14,7 +14,7 @@ </CompilerOptions> <Description Value="Runtime form designer"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="1"> <Item1> <Filename Value="..\design\JvRuntimeDesign\jvruntimedesignreg.pas"/> diff --git a/components/jvcllaz/packages/jvruntimedesignlazr.lpk b/components/jvcllaz/packages/jvruntimedesignlazr.lpk index 38f043c5b..88d2c516c 100644 --- a/components/jvcllaz/packages/jvruntimedesignlazr.lpk +++ b/components/jvcllaz/packages/jvruntimedesignlazr.lpk @@ -14,7 +14,7 @@ </CompilerOptions> <Description Value="Runtime form designer"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="4"> <Item1> <Filename Value="..\run\JvRuntimeDesign\jvdesignclip.pas"/> diff --git a/components/jvcllaz/packages/jvstdctrlslazd.lpk b/components/jvcllaz/packages/jvstdctrlslazd.lpk index 5ab3babe7..2c99da79b 100644 --- a/components/jvcllaz/packages/jvstdctrlslazd.lpk +++ b/components/jvcllaz/packages/jvstdctrlslazd.lpk @@ -16,7 +16,7 @@ <Description Value="Enhanced standard controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (designtime code) CalcEdit, button, checkbox, linked controls"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="1"> <Item1> <Filename Value="..\design\JvStdCtrls\jvstdctrlsreg.pas"/> diff --git a/components/jvcllaz/packages/jvstdctrlslazr.lpk b/components/jvcllaz/packages/jvstdctrlslazr.lpk index 946fc4c2e..b633145e9 100644 --- a/components/jvcllaz/packages/jvstdctrlslazr.lpk +++ b/components/jvcllaz/packages/jvstdctrlslazr.lpk @@ -16,7 +16,7 @@ CalcEdit, button, checkbox, linked controls "/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="4"> <Item1> <Filename Value="..\run\JvStdCtrls\jvbutton.pas"/> diff --git a/components/jvcllaz/packages/jvvalidatorslazd.lpk b/components/jvcllaz/packages/jvvalidatorslazd.lpk index d43193467..45a7d2a3f 100644 --- a/components/jvcllaz/packages/jvvalidatorslazd.lpk +++ b/components/jvcllaz/packages/jvvalidatorslazd.lpk @@ -16,7 +16,7 @@ </CompilerOptions> <Description Value="Validator components of the JVCL library (https://sourceforge.net/projects/jvcl/) (designtime code)"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="3"> <Item1> <Filename Value="..\design\JvValidators\jvvalidatorreg.pp"/> diff --git a/components/jvcllaz/packages/jvvalidatorslazr.lpk b/components/jvcllaz/packages/jvvalidatorslazr.lpk index 659cde2ff..4a3ae11ef 100644 --- a/components/jvcllaz/packages/jvvalidatorslazr.lpk +++ b/components/jvcllaz/packages/jvvalidatorslazr.lpk @@ -14,7 +14,7 @@ </CompilerOptions> <Description Value="Validator components of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code)"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="2"> <Item1> <Filename Value="..\run\JvValidators\jverrorindicator.pas"/> diff --git a/components/jvcllaz/packages/jvwizardlazd.lpk b/components/jvcllaz/packages/jvwizardlazd.lpk index 763b128c1..71e63f91f 100644 --- a/components/jvcllaz/packages/jvwizardlazd.lpk +++ b/components/jvcllaz/packages/jvwizardlazd.lpk @@ -15,7 +15,7 @@ </CompilerOptions> <Description Value=""Wizard" component (Designtime package)"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="2"> <Item1> <Filename Value="..\design\JvWizard\jvwizardeditorform.pas"/> diff --git a/components/jvcllaz/packages/jvwizardlazr.lpk b/components/jvcllaz/packages/jvwizardlazr.lpk index dec3a3dfd..943069b10 100644 --- a/components/jvcllaz/packages/jvwizardlazr.lpk +++ b/components/jvcllaz/packages/jvwizardlazr.lpk @@ -3,7 +3,6 @@ <Package Version="4"> <PathDelim Value="\"/> <Name Value="JvWizardLazR"/> - <Type Value="RunAndDesignTime"/> <Author Value="Various authors - see header of jvwizard.pas for original authors. Lazarus port by Michal Gawrycki."/> <CompilerOptions> <Version Value="11"/> @@ -15,7 +14,7 @@ </CompilerOptions> <Description Value=""Wizard" component (Runtime package)"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="5"> <Item1> <Filename Value="..\run\JvWizard\jvwizard.pas"/> diff --git a/components/jvcllaz/packages/jvxpctrlslazd.lpk b/components/jvcllaz/packages/jvxpctrlslazd.lpk index 35575079b..22b6158e6 100644 --- a/components/jvcllaz/packages/jvxpctrlslazd.lpk +++ b/components/jvcllaz/packages/jvxpctrlslazd.lpk @@ -15,7 +15,7 @@ </CompilerOptions> <Description Value="XP style controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (designtime code)"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="2"> <Item1> <Filename Value="..\design\JvXPCtrls\jvxpctrlsreg.pas"/> diff --git a/components/jvcllaz/packages/jvxpctrlslazr.lpk b/components/jvcllaz/packages/jvxpctrlslazr.lpk index 6a3608837..b67ef8e9b 100644 --- a/components/jvcllaz/packages/jvxpctrlslazr.lpk +++ b/components/jvcllaz/packages/jvxpctrlslazr.lpk @@ -14,7 +14,7 @@ </CompilerOptions> <Description Value="XP style controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code)"/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> - <Version Major="1" Release="4"/> + <Version Major="1" Release="5"/> <Files Count="6"> <Item1> <Filename Value="..\run\JvXPCtrls\jvxpbar.pas"/> diff --git a/components/jvcllaz/run/JvCmp/jvprofilerform.pas b/components/jvcllaz/run/JvCmp/jvprofilerform.pas index 6073e55d8..004d68286 100644 --- a/components/jvcllaz/run/JvCmp/jvprofilerform.pas +++ b/components/jvcllaz/run/JvCmp/jvprofilerform.pas @@ -130,6 +130,7 @@ const DefHeader2 = 'Profiler 32 - (C) 1996 Certified Software Corp, portions Copyright (C) 1997 by Peter Thörnqvist; all rights reserved.'; +{ type PProfType = ^TProfType; TProfType = record @@ -144,6 +145,7 @@ type CallerID: Integer; EntryTime: Integer; end; +} function GetUserName: String; // http://forum.lazarus.freepascal.org/index.php/topic,23171.msg138057.html#msg138057 @@ -262,7 +264,7 @@ var begin if FEnabled then begin - Snap := GetTickCount; + Snap := GetTickCount64; if FStackSize > MaxStackSize then raise EJVCLException.CreateResFmt(@RsEMaxStackSizeExceededd, [MaxStackSize]); Inc(FStackSize); @@ -297,7 +299,7 @@ var begin if Enabled then begin - Snap := GetTickCount; + Snap := GetTickCount64; with FProfileInfo[ID] do begin Elapsed := Snap - InOutTime; @@ -329,7 +331,7 @@ begin begin // Initialize; DoStart; - FStartTime := GetTickCount; + FStartTime := GetTickCount64; FStarted := True; end; end; @@ -338,7 +340,7 @@ procedure TJvProfiler.Stop; begin if FEnabled and FStarted then begin - FEndTime := GetTickCount; + FEndTime := GetTickCount64; DoStop; FStarted := False; end; diff --git a/components/jvcllaz/run/JvCmp/jvspellchecker.pas b/components/jvcllaz/run/JvCmp/jvspellchecker.pas index a72ad00b5..e6df296c0 100644 --- a/components/jvcllaz/run/JvCmp/jvspellchecker.pas +++ b/components/jvcllaz/run/JvCmp/jvspellchecker.pas @@ -70,9 +70,6 @@ type implementation -uses - JvTypes, JvResources; - // NOTE: hash table and soundex lookup code originally from Julian Bucknall's // "Algorithms Alfresco" column in The Delphi Magazine, Issue 52, December 1999 // Used with permission @@ -307,7 +304,7 @@ procedure TJvDefaultSpellChecker.BuildTables; var AFile: TextFile; Value: string; - LastValue: string; + LastValue: string = ''; SoundexVal: TSoundex; I: Integer; N: Integer; diff --git a/components/jvcllaz/run/JvCore/jvexcontrols.pas b/components/jvcllaz/run/JvCore/jvexcontrols.pas index e0a71e8f2..a448e64fa 100644 --- a/components/jvcllaz/run/JvCore/jvexcontrols.pas +++ b/components/jvcllaz/run/JvCore/jvexcontrols.pas @@ -453,7 +453,7 @@ begin if Assigned(AControl) and Assigned(AControl.Parent) then begin AHintInfo := HintInfo; - AControl.Parent.Perform(CM_HINTSHOW, 0, PtrInt(@AHintInfo)); + AControl.Parent.Perform(CM_HINTSHOW, 0, {%H-}PtrInt(@AHintInfo)); HintInfo.HintColor := AHintInfo.HintColor; end; end; diff --git a/components/jvcllaz/run/JvCore/jvjvclutils.pas b/components/jvcllaz/run/JvCore/jvjvclutils.pas index 311388248..9e4bfd997 100644 --- a/components/jvcllaz/run/JvCore/jvjvclutils.pas +++ b/components/jvcllaz/run/JvCore/jvjvclutils.pas @@ -3091,9 +3091,9 @@ type function CheckTaskWindow(Window: HWND; Data: PtrInt): LongBool; stdcall; begin Result := True; - if PCheckTaskInfo(Data)^.FocusWnd = Window then + if {%H-}PCheckTaskInfo(Data)^.FocusWnd = Window then begin - PCheckTaskInfo(Data)^.Found := True; + {%H-}PCheckTaskInfo(Data)^.Found := True; Result := False; end; end; @@ -3108,7 +3108,7 @@ begin {$IFDEF MSWINDOWS} Info.FocusWnd := GetActiveWindow; Info.Found := False; - EnumThreadWindows(GetCurrentThreadID, @CheckTaskWindow, PtrInt(@Info)); + EnumThreadWindows(GetCurrentThreadID, @CheckTaskWindow, {%H-}PtrInt(@Info)); Result := Info.Found; {$ELSE} {$IFDEF UNIX} @@ -7087,7 +7087,7 @@ const cTagEnd = '>'; cLT = '<'; cGT = '>'; - cQuote = '"'; + //cQuote = '"'; cCENTER = 'CENTER'; cRIGHT = 'RIGHT'; cHREF = 'HREF'; @@ -7581,7 +7581,7 @@ procedure HTMLDrawText(Canvas: TCanvas; Rect: TRect; var W: Integer; S: Boolean; - St: string; + St: string = ''; begin HTMLDrawTextEx(Canvas, Rect, State, Text, W, htmlShow, 0, 0, S, St, SuperSubScriptRatio, Scale); end; @@ -7594,7 +7594,7 @@ procedure HTMLDrawTextHL(Canvas: TCanvas; Rect: TRect; var W: Integer; S: Boolean; - St: string; + St: string = ''; begin HTMLDrawTextEx(Canvas, Rect, State, Text, W, htmlShow, MouseX, MouseY, S, St, SuperSubScriptRatio, Scale); end; @@ -7620,7 +7620,7 @@ function HTMLTextExtent(Canvas: TCanvas; Rect: TRect; const State: TOwnerDrawState; const Text: string; SuperSubScriptRatio: Double; Scale: Integer = 100): TSize; var S: Boolean; - St: string; + St: string = ''; begin HTMLDrawTextEx2(Canvas, Rect, State, Text, Result.cx, Result.cy, htmlCalcWidth, 0, 0, S, St, SuperSubScriptRatio, Scale); if Result.cy = 0 then @@ -7632,7 +7632,7 @@ function HTMLTextWidth(Canvas: TCanvas; Rect: TRect; const State: TOwnerDrawState; const Text: string; SuperSubScriptRatio: Double; Scale: Integer = 100): Integer; var S: Boolean; - St: string; + St: string = ''; begin HTMLDrawTextEx(Canvas, Rect, State, Text, Result, htmlCalcWidth, 0, 0, S, St, SuperSubScriptRatio, Scale); end; @@ -7640,7 +7640,7 @@ end; function HTMLTextHeight(Canvas: TCanvas; const Text: string; SuperSubScriptRatio: Double; Scale: Integer = 100): Integer; var S: Boolean; - St: string; + St: string = ''; R: TRect; begin R := Rect(0, 0, 0, 0); diff --git a/components/jvcllaz/run/JvCore/jvthemes.pas b/components/jvcllaz/run/JvCore/jvthemes.pas index a15465a10..3fd8d22c3 100644 --- a/components/jvcllaz/run/JvCore/jvthemes.pas +++ b/components/jvcllaz/run/JvCore/jvthemes.pas @@ -35,7 +35,7 @@ interface uses LCLType, LCLIntf, LMessages, //Types, - SysUtils, Classes, Contnrs, + SysUtils, Classes, {$IFDEF JVCLThemesEnabled} Themes, {$ENDIF JVCLThemesEnabled} @@ -500,7 +500,7 @@ end; procedure PerformEraseBackground(Control: TControl; DC: HDC; Offset: TPoint; const R: TRect); var - WindowOrg: TPoint; + WindowOrg: TPoint = (X:0; Y:0); OrgRgn, Rgn: THandle; {$IFDEF COMPILER16_UP} OldPen: HPEN; diff --git a/components/jvcllaz/run/JvCtrls/jvautocomplete.pas b/components/jvcllaz/run/JvCtrls/jvautocomplete.pas index a4118ea24..2fbcefba4 100644 --- a/components/jvcllaz/run/JvCtrls/jvautocomplete.pas +++ b/components/jvcllaz/run/JvCtrls/jvautocomplete.pas @@ -296,7 +296,7 @@ var LT: Int64; Msg: TMsg; - function HasSelectedText(var StartPos, EndPos: Integer): Boolean; + function HasSelectedText(out StartPos, EndPos: Integer): Boolean; begin GetEditSel(StartPos, EndPos); Result := EndPos > StartPos; @@ -356,12 +356,12 @@ begin if ListSearch then begin - LT := GetTickCount; + LT := GetTickCount64; if FLastTime > LT then LT := $100000000 + LT; // double limit. if LT - FLastTime >= MaxFilterTime then FFilter := ''; - FLastTime := GetTickCount; + FLastTime := GetTickCount64; end else FFilter := GetText; @@ -412,7 +412,7 @@ begin if CharInSet(Key, LeadBytes) then begin - if PeekMessage(Msg, GetEditHandle, 0, 0, PM_NOREMOVE) and (Msg.Message = LM_CHAR) then + if PeekMessage(Msg{%H-}, GetEditHandle, 0, 0, PM_NOREMOVE) and (Msg.Message = LM_CHAR) then begin if SelectItem(SaveText + Char(Msg.WParam)) then begin diff --git a/components/jvcllaz/run/JvCtrls/jvgroupheader.pas b/components/jvcllaz/run/JvCtrls/jvgroupheader.pas index a0f45ddd5..305bd94f2 100644 --- a/components/jvcllaz/run/JvCtrls/jvgroupheader.pas +++ b/components/jvcllaz/run/JvCtrls/jvgroupheader.pas @@ -26,7 +26,7 @@ interface uses LCLIntf, LCLType, Classes, Graphics, Controls, ExtCtrls, - JvJCLUtils, JvComponent, JvTypes; + JvComponent, JvTypes; type TJvGroupHeaderOptions = class(TPersistent) diff --git a/components/jvcllaz/run/JvCtrls/jvhtcontrols.pas b/components/jvcllaz/run/JvCtrls/jvhtcontrols.pas index 32d8a5ccd..3a89fac15 100644 --- a/components/jvcllaz/run/JvCtrls/jvhtcontrols.pas +++ b/components/jvcllaz/run/JvCtrls/jvhtcontrols.pas @@ -693,7 +693,7 @@ end; procedure TJvCustomHTListBox.MouseMove(Shift: TShiftState; X, Y: Integer); var R: TRect; - LinkName: string; + LinkName: string = ''; State: TOwnerDrawState; I: Integer; begin @@ -725,7 +725,7 @@ procedure TJvCustomHTListBox.MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); var R: TRect; - LinkName: string; + LinkName: string = ''; State: TOwnerDrawState; I: Integer; begin @@ -968,7 +968,7 @@ end; procedure TJvCustomHTLabel.MouseMove(Shift: TShiftState; X, Y: Integer); var R: TRect; - LinkName: string; + LinkName: string = ''; LastHovered: Boolean; begin FMouseX := X; @@ -1002,7 +1002,7 @@ end; procedure TJvCustomHTLabel.MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); var R: TRect; - LinkName: string; + LinkName: string = ''; begin FMouseX := X; FMouseY := Y; diff --git a/components/jvcllaz/run/JvCtrls/jvrollout.pas b/components/jvcllaz/run/JvCtrls/jvrollout.pas index a84f4f1a0..6ec969c45 100644 --- a/components/jvcllaz/run/JvCtrls/jvrollout.pas +++ b/components/jvcllaz/run/JvCtrls/jvrollout.pas @@ -511,8 +511,6 @@ end; //=== { TJvCustomRollOut } =================================================== constructor TJvCustomRollOut.Create(AOwner: TComponent); -var - R: TRect; begin inherited Create(AOwner); IncludeThemeStyle(Self, [csNeedsBorderPaint, csParentBackground]); @@ -1405,7 +1403,7 @@ end; } function TJvCustomRollOut.MouseIsOnButton: Boolean; var - P: TPoint; + P: TPoint = (x:0; y:0); R: TRect; begin GetCursorPos(P); diff --git a/components/jvcllaz/run/JvCtrls/jvruler.pas b/components/jvcllaz/run/JvCtrls/jvruler.pas index 00fde8d22..75d08d7ee 100644 --- a/components/jvcllaz/run/JvCtrls/jvruler.pas +++ b/components/jvcllaz/run/JvCtrls/jvruler.pas @@ -31,7 +31,7 @@ unit JvRuler; interface uses - LCLIntf, LCLType, Types, + LCLIntf, LCLType, Classes, SysUtils, Graphics, Controls, JvComponent; type diff --git a/components/jvcllaz/run/JvCustomControls/jvoutlookbar.pas b/components/jvcllaz/run/JvCustomControls/jvoutlookbar.pas index 4f843fc3c..b34ad18f7 100644 --- a/components/jvcllaz/run/JvCustomControls/jvoutlookbar.pas +++ b/components/jvcllaz/run/JvCustomControls/jvoutlookbar.pas @@ -518,8 +518,8 @@ const cMinTextWidth = 32; cButtonLeftOffset = 4; cButtonTopOffset = 2; - cInitRepeatPause = 400; - cRepeatPause = 100; +// cInitRepeatPause = 400; +// cRepeatPause = 100; UP_DOWN_DEFAULT_SIZE = 14; diff --git a/components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas b/components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas index b413f4ab5..dd42623b1 100644 --- a/components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas +++ b/components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas @@ -33,9 +33,8 @@ unit JvTMTimeLine; interface uses - LCLIntf, LCLType, LMessages, LCLVersion, Types, - SysUtils, Classes, Controls, Buttons, Graphics, ExtCtrls, Forms, ImgList, - JvExControls; + LCLIntf, LCLType, LCLVersion, Types, + SysUtils, Classes, Controls, Buttons, Graphics, ExtCtrls, Forms, ImgList; const cTMTimeLineDayWidth = 19; @@ -341,8 +340,8 @@ type implementation uses - LCLStrConsts, Themes, - JvConsts, JvJCLUtils, JvJVCLUtils, JvResources; + Themes, + JvJCLUtils, JvJVCLUtils, JvResources; {$R ..\..\resource\jvtmtimeline.res} diff --git a/components/jvcllaz/run/JvCustomControls/jvvalidateedit.pas b/components/jvcllaz/run/JvCustomControls/jvvalidateedit.pas index fc6c33916..f841d6461 100644 --- a/components/jvcllaz/run/JvCustomControls/jvvalidateedit.pas +++ b/components/jvcllaz/run/JvCustomControls/jvvalidateedit.pas @@ -365,7 +365,7 @@ type implementation uses - Math, StrUtils, VarUtils, Variants, + Math, StrUtils, Variants, JvJCLUtils, JvResources; // JclStrings, JvJCLUtils, JvResources, JclSysUtils; @@ -396,7 +396,7 @@ var ABcd: TBcd; begin if Truncate and (BcdScale(Bcd) > 0) then - NormalizeBcd(Bcd, ABcd, Bcd.Precision, 0) + NormalizeBcd(Bcd, ABcd{%H-}, Bcd.Precision, 0) else ABcd := Bcd; Result := StrToInt64(BcdToStr(ABcd)); @@ -499,10 +499,12 @@ end; //=== { TJvCustomValidateEdit } ============================================== constructor TJvCustomValidateEdit.Create(AOwner: TComponent); +{ var MappedDecimal: Cardinal; const MAPVK_VK_TO_CHAR = 2; +} begin inherited Create(AOwner); FSelfChange := False; @@ -793,8 +795,8 @@ begin end; function TJvCustomValidateEdit.GetAsFloat: Double; -var - Cur: Currency; +//var +// Cur: Currency; begin case FDisplayFormat of dfBinary: @@ -917,7 +919,7 @@ end; function TJvCustomValidateEdit.GetValue: Variant; var DisplayedText: string; - Cur: Currency; + //Cur: Currency; Bcd: TBcd; begin case FDisplayFormat of @@ -941,7 +943,7 @@ begin dfHex: Result := IntRangeValue(StrToIntDef('$' + FEditText, 0)); dfBcd: - if TryStrToBcd(FEditText, Bcd) then + if TryStrToBcd(FEditText, Bcd{%H-}) then Result := VarFMTBcdCreate(Bcd) else Result := VarFMTBcdCreate; // Null @@ -1354,10 +1356,9 @@ procedure TJvCustomValidateEdit.DisplayText; function FormatedValue(Value: Double): Double; begin + Result := Value; if Assigned(FOnDecimalRounding) then - FOnDecimalRounding(Self, Result, Value) - else - Result := Value; + FOnDecimalRounding(Self, Result, Value); end; begin @@ -1475,10 +1476,9 @@ end; function TJvCustomValidateEdit.GetText: TCaption; begin + Result := inherited Text; if (Result = EmptyValue) and (EmptyValue <> '') then - Result := '' - else - Result := inherited Text; + Result := ''; end; procedure TJvCustomValidateEdit.SetText(const NewValue: TCaption); diff --git a/components/jvcllaz/run/JvJans/jvmarkuplabel.pas b/components/jvcllaz/run/JvJans/jvmarkuplabel.pas index 81b70ce3e..b9b7aec4c 100644 --- a/components/jvcllaz/run/JvJans/jvmarkuplabel.pas +++ b/components/jvcllaz/run/JvJans/jvmarkuplabel.pas @@ -104,8 +104,7 @@ type implementation uses - Themes, - JvJCLUtils, JvConsts; + Themes; constructor TJvMarkupLabel.Create(AOwner: TComponent); begin diff --git a/components/jvcllaz/run/JvJans/jvmarkupviewer.pas b/components/jvcllaz/run/JvJans/jvmarkupviewer.pas index 4d95ed45b..dfae2ed22 100644 --- a/components/jvcllaz/run/JvJans/jvmarkupviewer.pas +++ b/components/jvcllaz/run/JvJans/jvmarkupviewer.pas @@ -99,7 +99,7 @@ type implementation uses - JvConsts, Themes; + Themes; constructor TJvMarkupViewer.Create(AOwner: TComponent); begin diff --git a/components/jvcllaz/run/JvJans/jvsimlogic.pas b/components/jvcllaz/run/JvJans/jvsimlogic.pas index 0a6bc7bff..e38697ddc 100644 --- a/components/jvcllaz/run/JvJans/jvsimlogic.pas +++ b/components/jvcllaz/run/JvJans/jvsimlogic.pas @@ -125,9 +125,9 @@ type procedure DisconnectFinal; protected procedure DblClick; override; - procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; + procedure MouseDown({%H-}Button: TMouseButton; {%H-}Shift: TShiftState; X, Y: Integer); override; procedure MouseMove(Shift: TShiftState; X, Y: Integer); override; - procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; + procedure MouseUp({%H-}Button: TMouseButton; {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer); override; public constructor Create(AOwner: TComponent); override; destructor Destroy; override; @@ -187,9 +187,9 @@ type protected procedure DblClick; override; class function GetControlClassDefaultSize: TSize; override; - procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; + procedure MouseDown({%H-}Button: TMouseButton; {%H-}Shift: TShiftState; X, Y: Integer); override; procedure MouseMove(Shift: TShiftState; X, Y: Integer); override; - procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; + procedure MouseUp({%H-}Button: TMouseButton; {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer); override; procedure Resize; override; public constructor Create(AOwner: TComponent); override; @@ -235,9 +235,9 @@ type procedure SetOutput3(const Value: Boolean); protected class function GetControlClassDefaultSize: TSize; override; - procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; + procedure MouseDown({%H-}Button: TMouseButton; {%H-}Shift: TShiftState; X, Y: Integer); override; procedure MouseMove(Shift: TShiftState; X, Y: Integer); override; - procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; + procedure MouseUp({%H-}Button: TMouseButton; {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer); override; procedure Resize; override; public constructor Create(AOwner: TComponent); override; @@ -274,7 +274,7 @@ type class function GetControlClassDefaultSize: TSize; override; procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; procedure MouseMove(Shift: TShiftState; X, Y: Integer); override; - procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; + procedure MouseUp({%H-}Button: TMouseButton; {%H-}Shift: TShiftState; X, Y: Integer); override; procedure Resize; override; public constructor Create(AOwner: TComponent); override; @@ -314,7 +314,7 @@ type class function GetControlClassDefaultSize: TSize; override; procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; procedure MouseMove(Shift: TShiftState; X, Y: Integer); override; - procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; + procedure MouseUp({%H-}Button: TMouseButton; {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer); override; procedure Resize; override; public constructor Create(AOwner: TComponent); override; @@ -464,12 +464,11 @@ end; procedure TJvSimControl.DrawLED(ARect: TRect; ASurfColor, ALitColor, ABkColor: TColor); var - d, one, four: Integer; + one, four: Integer; begin if Parent = nil then exit; - d := Scale96ToForm(LED_SIZE); one := Scale96ToForm(1); four := Scale96ToForm(4); @@ -1953,7 +1952,7 @@ var SurfCol, LitCol: TColor; P: TPoint; X, Y: Integer; - d, one, three, five, eight, nine: Integer; + d: Integer; Lit: Boolean; begin if not Gates[Index].Active then @@ -2012,13 +2011,11 @@ var R: TRect; S: string; ts: TTextStyle; - h: Integer; begin with Canvas do begin Font.Assign(Self.Font); if Font.Size = 0 then Font.Size := 9; - h := TextHeight('Tj'); Brush.Color := clSilver; R := ClientRect; @@ -2293,7 +2290,6 @@ end; procedure TJvSimButton.MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); var - R: TRect; h2: Integer; begin FMdp := Point(X, Y); @@ -2343,9 +2339,7 @@ begin R := ClientRect; InflateRect(R, -15, -15); if PtInRect(R, P) then - begin - Down := not FDown; - end + Down := not FDown else BinCheck(Self); end; @@ -2642,7 +2636,7 @@ end; procedure TJvSimLight.Paint; var - TlPoly, BrPoly: array [0..2] of TPoint; +// TlPoly, BrPoly: array [0..2] of TPoint; xw, yh: Integer; R: TRect; HiColor, LoColor, SurfCol: TColor; @@ -2660,6 +2654,7 @@ var Ellipse(FLEDRect); // Ellipse(15, 15, xw - 15, yh - 15); end; + // SelectClipRgn(Canvas.handle,0); // DeleteObject(rgn); // rgn := CreatePolygonRgn(BrPoly,3,WINDING); @@ -2707,6 +2702,7 @@ begin yh := Height - 1; // cr := Width div 4; // x4 := Width div 4; + { // topleft region TlPoly[0] := Point(Left, Top + yh); TlPoly[1] := Point(Left, Top); @@ -2715,6 +2711,7 @@ begin BrPoly[0] := Point(Left + xw, Top); BrPoly[1] := Point(Left + xw, Top + yh); BrPoly[2] := Point(Left, Top + yh); +} Canvas.Pen.Style := psSolid; HiColor := clBtnHighlight; LoColor := clBtnShadow; @@ -3188,7 +3185,7 @@ procedure TJvSimReverse.InitDimensions; const MARGIN = 1; var - m, d, h: Integer; + m, d: Integer; begin if Parent = nil then exit; diff --git a/components/jvcllaz/run/JvJans/jvsimscope.pas b/components/jvcllaz/run/JvJans/jvsimscope.pas index 40478bd41..f827654b8 100644 --- a/components/jvcllaz/run/JvJans/jvsimscope.pas +++ b/components/jvcllaz/run/JvJans/jvsimscope.pas @@ -228,9 +228,6 @@ type implementation -uses - InterfaceBase; - //=== { TJvScopeLineValues } ================================================= procedure TJvScopeLineValues.Add(Value: Integer); diff --git a/components/jvcllaz/run/JvJans/jvyeargrid.pas b/components/jvcllaz/run/JvJans/jvyeargrid.pas index 6074a6a01..4d4948be8 100644 --- a/components/jvcllaz/run/JvJans/jvyeargrid.pas +++ b/components/jvcllaz/run/JvJans/jvyeargrid.pas @@ -170,10 +170,10 @@ type protected procedure DrawColumnText(aCol, aRow: Integer; aRect: TRect; aState: TGridDrawState); override; - procedure DrawTextInCell(aCol, aRow: Integer; aRect: TRect; aState: TGridDrawState); override; + procedure DrawTextInCell(aCol, aRow: Integer; aRect: TRect; {%H-}aState: TGridDrawState); override; function SelectCell(ACol, ARow: Integer): Boolean; override; procedure DblClick; override; - procedure DoPrepareCanvas(aCol,aRow:Integer; aState: TGridDrawState); override; + procedure DoPrepareCanvas(aCol,aRow:Integer; {%H-}aState: TGridDrawState); override; procedure SetAutoSize(Value: Boolean); override; procedure UpdateAllSizes; procedure AdjustBounds; @@ -186,7 +186,7 @@ type // this component before its rewrite. The writer does nothing // because the value is now stored as Year. procedure ReadGridYear(Reader: TReader); - procedure WriteGridYear(Writer: TWriter); + procedure WriteGridYear({%H-}Writer: TWriter); procedure DefineProperties(Filer: TFiler); override; public @@ -379,7 +379,7 @@ end; procedure TJvYearGrid.MakeHTML(AList: TStringList; Border, Filter: Boolean); var - ACol, ARow, W: Integer; + ACol, ARow: Integer; DS, Tbs, Infs: string; Month, Day: Word; ADate: TDate; @@ -691,7 +691,7 @@ end; procedure TJvYearGrid.mnuCopyClick(Sender: TObject); var - S: string; + S: string = ''; begin if GetCellData(S) then Clipboard.AsText := S; @@ -699,7 +699,7 @@ end; procedure TJvYearGrid.mnuCutClick(Sender: TObject); var - S: string; + S: string = ''; begin if GetCellData(S) then begin @@ -728,7 +728,7 @@ end; procedure TJvYearGrid.mnuPasteClick(Sender: TObject); var - S: string; + S: string = ''; begin if GetCellData(S) then if Clipboard.HasFormat(CF_TEXT) then @@ -737,7 +737,7 @@ end; procedure TJvYearGrid.mnuDeleteClick(Sender: TObject); var - S: string; + S: string = ''; begin if GetCellData(S) then SetCellData(''); @@ -1561,7 +1561,7 @@ end; procedure TJvYearGrid.DrawColumnText(ACol,ARow: Integer; ARect: TRect; AState: TGridDrawState); begin - DrawTextInCell(ACol, 0, ARect, AState); + DrawTextInCell(ACol, ARow, ARect, AState); end; procedure TJvYearGrid.DrawTextInCell(ACol,ARow: Integer; diff --git a/components/jvcllaz/run/JvJans/jvyeargrideditform.pas b/components/jvcllaz/run/JvJans/jvyeargrideditform.pas index 4b255ad86..bbf24976a 100644 --- a/components/jvcllaz/run/JvJans/jvyeargrideditform.pas +++ b/components/jvcllaz/run/JvJans/jvyeargrideditform.pas @@ -30,8 +30,7 @@ unit JvYearGridEditForm; interface uses - SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, Buttons, ExtCtrls, - JvComponent; + SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, Buttons, ExtCtrls; type diff --git a/components/jvcllaz/run/JvPageComps/jvnavigationpane.pas b/components/jvcllaz/run/JvPageComps/jvnavigationpane.pas index c999c08cb..fe5201370 100644 --- a/components/jvcllaz/run/JvPageComps/jvnavigationpane.pas +++ b/components/jvcllaz/run/JvPageComps/jvnavigationpane.pas @@ -90,8 +90,8 @@ type procedure SetAlignment(const Value: TAlignment); procedure SetWordWrap(const Value: Boolean); procedure ParentStyleManagerChanged(var Msg: TMsgStyleManagerChange); message CM_PARENTSTYLEMANAGERCHANGED; - procedure ParentStyleManagerChange(var Msg: TLMessage); message CM_PARENTSTYLEMANAGERCHANGE; - procedure CMControlChange(var Msg: TLMessage); message CM_CONTROLCHANGE; + procedure ParentStyleManagerChange(var {%H-}Msg: TLMessage); message CM_PARENTSTYLEMANAGERCHANGE; + procedure CMControlChange(var {%H-}Msg: TLMessage); message CM_CONTROLCHANGE; procedure SetParentStyleManager(const Value: Boolean); protected procedure Notification(AComponent: TComponent; Operation: TOperation); override; @@ -204,7 +204,6 @@ type procedure DoStyleChange(Sender: TObject); procedure ParentStyleManagerChanged(var Msg: TMsgStyleManagerChange); message CM_PARENTSTYLEMANAGERCHANGED; procedure SetParentStyleManager(const Value: Boolean); - procedure SetCursor(const Value: TCursor); function GetDragZoneRect: TRect; function MouseInDragZone(X, Y: Integer): Boolean; protected @@ -214,6 +213,7 @@ type procedure WMLButtonDown(var Msg: TLMLButtonDown); message LM_LBUTTONDOWN; procedure WMMouseMove(var Msg: TLMMouseMove); message LM_MOUSEMOVE; procedure RequestAlign; override; + procedure SetCursor(Value: TCursor); //override; // FIX ME: Crash when override is active !!! public constructor Create(AOwner: TComponent); override; destructor Destroy; override; @@ -353,8 +353,8 @@ type procedure SetStyleManager(const Value: TJvNavPaneStyleManager); procedure DoStyleChange(Sender: TObject); procedure ParentStyleManagerChanged(var Msg: TMsgStyleManagerChange); message CM_PARENTSTYLEMANAGERCHANGED; - procedure ParentStyleManagerChange(var Msg: TLMessage); message CM_PARENTSTYLEMANAGERCHANGE; - procedure CMControlChange(var Msg: TLMessage); message CM_CONTROLCHANGE; + procedure ParentStyleManagerChange(var {%H-}Msg: TLMessage); message CM_PARENTSTYLEMANAGERCHANGE; + procedure CMControlChange(var {%H-}Msg: TLMessage); message CM_CONTROLCHANGE; procedure WMEraseBkgnd(var Msg: TLMEraseBkgnd); message LM_ERASEBKGND; procedure SetParentStyleManager(const Value: Boolean); protected @@ -596,15 +596,12 @@ type FImageIndex: TImageIndex; FParentStyleManager: Boolean; FBackground: TJvNavPaneBackgroundImage; - procedure SetCaption(const Value: TCaption); procedure SetIconic(const Value: Boolean); procedure SetImageIndex(const Value: TImageIndex); - function GetCaption: TCaption; function GetIconic: Boolean; function GetImageIndex: TImageIndex; procedure DoButtonClick(Sender: TObject); - function GetHint: string; - procedure SetHint(const Value: string); + function GetHint: TTranslateString; procedure SetIconPanel(const Value: TJvIconPanel); function GetColors: TJvNavPanelColors; procedure SetColors(const Value: TJvNavPanelColors); @@ -617,10 +614,9 @@ type procedure SetAlignment(const Value: TAlignment); procedure SetWordWrap(const Value: Boolean); procedure ParentStyleManagerChanged(var Msg: TMsgStyleManagerChange); message CM_PARENTSTYLEMANAGERCHANGED; - procedure ParentStyleManagerChange(var Msg: TLMessage); message CM_PARENTSTYLEMANAGERCHANGE; - procedure CMControlChange(var Msg: TLMessage); message CM_CONTROLCHANGE; + procedure ParentStyleManagerChange(var {%H-}Msg: TLMessage); message CM_PARENTSTYLEMANAGERCHANGE; + procedure CMControlChange(var {%H-}Msg: TLMessage); message CM_CONTROLCHANGE; procedure SetParentStyleManager(const Value: Boolean); - procedure SetAction(const Value: TBasicAction); // override; procedure SetBackground(const Value: TJvNavPaneBackgroundImage); procedure DoBackgroundChange(Sender: TObject); protected @@ -641,6 +637,10 @@ type property WordWrap: Boolean read GetWordWrap write SetWordWrap; procedure ActionChange(Sender: TObject; CheckDefaults: Boolean); override; procedure Paint; override; + function GetCaption: TCaption; override; + procedure SetCaption(Value: TCaption); override; + procedure SetAction(Value: TBasicAction); override; + procedure SetHint(const AValue: TTranslateString); override; public constructor Create(AOwner: TComponent); override; destructor Destroy; override; @@ -661,7 +661,7 @@ type property DragMode; property Iconic: Boolean read GetIconic write SetIconic default False; property ImageIndex: TImageIndex read GetImageIndex write SetImageIndex default -1; - property Hint: string read GetHint write SetHint; + property Hint: TTranslateString read GetHint write SetHint; property OnClick: TNotifyEvent read FOnClick write FOnClick; property OnContextPopup; property OnDragDrop; @@ -769,7 +769,7 @@ type procedure DoCloseClick(Sender: TObject); procedure SetShowGrabber(const Value: Boolean); procedure ParentStyleManagerChanged(var Msg: TMsgStyleManagerChange); message CM_PARENTSTYLEMANAGERCHANGED; - procedure ParentStyleManagerChange(var Msg: TLMessage); message CM_PARENTSTYLEMANAGERCHANGE; + procedure ParentStyleManagerChange(var {%H-}Msg: TLMessage); message CM_PARENTSTYLEMANAGERCHANGE; procedure SetParentStyleManager(const Value: Boolean); function GetDrawPartialMenuFrame: Boolean; procedure SetDrawPartialMenuFrame(const Value: Boolean); @@ -777,7 +777,7 @@ type procedure SetColors(const Value: TJvNavPanelColors); procedure SetHeaderVisible(const Value: Boolean); function IsColorsStored: Boolean; - procedure CMControlChange(var Msg: TLMessage); message CM_CONTROLCHANGE; + procedure CMControlChange(var {%H-}Msg: TLMessage); message CM_CONTROLCHANGE; procedure WMEraseBkgnd(var Msg: TLMEraseBkgnd); message LM_ERASEBKGND; procedure WMNCPaint(var Msg: TWMNCPaint); message LM_NCPAINT; procedure AlignButtons; @@ -916,8 +916,8 @@ type procedure SetAlignment(const Value: TAlignment); procedure SetWordWrap(const Value: Boolean); procedure ParentStyleManagerChanged(var Msg: TMsgStyleManagerChange); message CM_PARENTSTYLEMANAGERCHANGED; - procedure ParentStyleManagerChange(var Msg: TLMessage); message CM_PARENTSTYLEMANAGERCHANGE; - procedure CMControlChange(var Msg: TLMessage); message CM_CONTROLCHANGE; + procedure ParentStyleManagerChange(var {%H-}Msg: TLMessage); message CM_PARENTSTYLEMANAGERCHANGE; + procedure CMControlChange(var {%H-}Msg: TLMessage); message CM_CONTROLCHANGE; procedure WMNCPaint(var Msg: TWMNCPaint); message LM_NCPAINT; procedure WMEraseBkgnd(var Msg: TLMEraseBkgnd); message LM_ERASEBKGND; procedure SetParentStyleManager(const Value: Boolean); @@ -1668,8 +1668,8 @@ begin end; function TJvCustomNavigationPane.IsNavPanelFontStored: Boolean; -var - F: TFont; +//var +// F: TFont; begin //TODO: (* @@ -2087,8 +2087,6 @@ var Rect: TRect; P: TPoint; I: Integer; - - h, w: integer; begin with Canvas do begin @@ -2926,7 +2924,7 @@ begin Result := NavPanel.Colors; end; -function TJvNavPanelPage.GetHint: string; +function TJvNavPanelPage.GetHint: TTranslateString; begin if NavPanel = nil then Result := '' @@ -2964,7 +2962,7 @@ begin end; end; -procedure TJvNavPanelPage.SetCaption(const Value: TCaption); +procedure TJvNavPanelPage.SetCaption(Value: TCaption); begin if NavPanel <> nil then NavPanel.Caption := Value; @@ -3007,10 +3005,10 @@ begin // Header.StyleManager := Value; end; -procedure TJvNavPanelPage.SetHint(const Value: string); +procedure TJvNavPanelPage.SetHint(const AValue: TTranslateString); begin - NavPanel.Hint := Value; - IconButton.Hint := Value; + NavPanel.Hint := AValue; + IconButton.Hint := AValue; end; procedure TJvNavPanelPage.SetIconic(const Value: Boolean); @@ -3205,7 +3203,7 @@ begin Result := inherited GetAction; end; -procedure TJvNavPanelPage.SetAction(const Value: TBasicAction); +procedure TJvNavPanelPage.SetAction(Value: TBasicAction); begin inherited Action := Value; FNavPanel.Action := Value; @@ -3440,7 +3438,7 @@ begin end; end; -procedure TJvOutlookSplitter.SetCursor(const Value: TCursor); +procedure TJvOutlookSplitter.SetCursor(Value: TCursor); begin inherited Cursor := Value; FOldCursor := Value; @@ -5133,12 +5131,12 @@ begin end; procedure TJvNavPaneBackgroundImage.PictureChanged(Sender: TObject); -var - G: TGraphic; +//var +// G: TGraphic; begin - G := Picture.Graphic; //TODO: (* + G := Picture.Graphic; if G <> nil then if not ( (G is TMetaFile) or (G is TIcon)) then G.Transparent := FTransparent; diff --git a/components/jvcllaz/run/JvPageComps/jvpagelist.pas b/components/jvcllaz/run/JvPageComps/jvpagelist.pas index 6f78791e1..8ba3c005c 100644 --- a/components/jvcllaz/run/JvPageComps/jvpagelist.pas +++ b/components/jvcllaz/run/JvPageComps/jvpagelist.pas @@ -462,11 +462,6 @@ function TJvCustomPage.DoEraseBackground(ACanvas: TCanvas; Param: Integer): Bool begin exit; - - - - - ACanvas.Brush.Color := Self.Color; ACanvas.Brush.Style := bsSolid; ACanvas.FillRect(Rect(0, 0, Width, Height)); diff --git a/components/jvcllaz/run/JvPageComps/jvpagelisttreeview.pas b/components/jvcllaz/run/JvPageComps/jvpagelisttreeview.pas index 1bac0d388..35b007457 100644 --- a/components/jvcllaz/run/JvPageComps/jvpagelisttreeview.pas +++ b/components/jvcllaz/run/JvPageComps/jvpagelisttreeview.pas @@ -169,7 +169,7 @@ type FNodeImages: TJvSettingsTreeImages; FOnGetImageIndex: TTVExpandedEvent; FOnGetSelectedIndex: TTVExpandedEvent; - procedure SetImageSelection(const Value: TJvSettingsTreeImages); + procedure SetImageSelection(const {%H-}Value: TJvSettingsTreeImages); protected FLastSelected: TTreeNode; procedure Delete(Node: TTreeNode); override; @@ -584,7 +584,8 @@ end; procedure TJvPageIndexNodes.ReadData(Stream: TStream); var - APageIndex, ACount: Integer; + APageIndex: Integer = 0; + ACount: Integer = 0; LNode: TTreeNode; LHandleAllocated: Boolean; begin diff --git a/components/jvcllaz/run/JvPageComps/jvtabbar.pas b/components/jvcllaz/run/JvPageComps/jvtabbar.pas index e58bc98c9..0f1ee87ce 100644 --- a/components/jvcllaz/run/JvPageComps/jvtabbar.pas +++ b/components/jvcllaz/run/JvPageComps/jvtabbar.pas @@ -163,7 +163,7 @@ type function GetDividerWidth(Canvas: TCanvas; LeftTab: TJvTabBarItem): Integer; virtual; abstract; function GetPixelsPerInch: Integer; virtual; abstract; function GetRealImageSize(ATab: TJvTabBarItem): TSize; - procedure GetScrollButtons(TabBar: TJvCustomTabBar; var LeftButton, RightButton: TRect); {virtual; reserved for future use } + procedure GetScrollButtons({%H-}TabBar: TJvCustomTabBar; var {%H-}LeftButton, {%H-}RightButton: TRect); {virtual; reserved for future use } function GetTabBar(ATab: TJvTabBarItem): TJvCustomTabBar; function GetTabSize(Canvas: TCanvas; Tab: TJvTabBarItem): TSize; virtual; abstract; function Options: TJvTabBarPainterOptions; virtual; abstract; @@ -220,7 +220,7 @@ type procedure DrawMoveDivider(Canvas: TCanvas; Tab: TJvTabBarItem; MoveLeft: Boolean); override; procedure DrawTab(Canvas: TCanvas; Tab: TJvTabBarItem; ATabRect: TRect); override; function GetCloseRect(Canvas: TCanvas; Tab: TJvTabBarItem; ATabRect: TRect): TRect; override; - function GetDividerWidth(Canvas: TCanvas; LeftTab: TJvTabBarItem): Integer; override; + function GetDividerWidth({%H-}Canvas: TCanvas; {%H-}LeftTab: TJvTabBarItem): Integer; override; function GetPixelsPerInch: Integer; override; function GetTabSize(Canvas: TCanvas; Tab: TJvTabBarItem): TSize; override; function Options: TJvTabBarPainterOptions; override; @@ -324,7 +324,6 @@ type procedure SetClosingTab(Tab: TJvTabBarItem); procedure UpdateScrollButtons; function FindSelectableTab(Tab: TJvTabBarItem): TJvTabBarItem; - procedure SetHint(const Value: TCaption); procedure SetFlatScrollButtons(const Value: Boolean); procedure SetPageList(const Value: TCustomControl); procedure SetOrientation(const Value: TJvTabBarOrientation); @@ -346,7 +345,7 @@ type procedure PaintTab(ACanvas: TCanvas; Tab: TJvTabBarItem); virtual; procedure Resize; override; - class function GetControlClassDefaultSize: TSize; + class function GetControlClassDefaultSize: TSize; override; function GetTabHeight(Tab: TJvTabBarItem): Integer; function GetTabWidth(Tab: TJvTabBarItem): Integer; @@ -380,6 +379,8 @@ type procedure WMEraseBkgnd(var Msg: TLMEraseBkgnd); message LM_ERASEBKGND; procedure Loaded; override; + procedure SetHint(const Value: TCaption); override; + public constructor Create(AOwner: TComponent); override; destructor Destroy; override; @@ -1427,13 +1428,15 @@ end; procedure TJvCustomTabBar.CalculatePreferredSize( var PreferredWidth, PreferredHeight: integer; WithThemeSpace: Boolean); var - tabSize: TSize; - imgSize: TSize; +// tabSize: TSize; +// imgSize: TSize; h: Integer; {$IF LCL_FullVersion >= 1090000} imgRes: TScaledImageListResolution; {$ENDIF} begin + inherited CalculatePreferredSize(PreferredWidth,PreferredHeight,WithThemeSpace); + CurrentPainter.AutoSize; // Text height diff --git a/components/jvcllaz/run/JvRuntimeDesign/jvdesignclip.pas b/components/jvcllaz/run/JvRuntimeDesign/jvdesignclip.pas index ff61e2d78..df01cd7a3 100644 --- a/components/jvcllaz/run/JvRuntimeDesign/jvdesignclip.pas +++ b/components/jvcllaz/run/JvRuntimeDesign/jvdesignclip.pas @@ -5,7 +5,7 @@ unit JvDesignClip; interface uses - LCLProc, LCLType, LResources, LCLIntf, LMessages, Classes; + LCLProc, LCLType, LResources, LCLIntf, Classes; type TJvDesignComponentClipboard = class(TObject) @@ -14,7 +14,7 @@ type FParentComponent: TComponent; procedure Close; procedure Open; - procedure ReadError(Reader: TReader; const Msg: string; var Handled: Boolean); + procedure ReadError({%H-}Reader: TReader; const {%H-}Msg: string; var Handled: Boolean); public constructor Create(ParentComponent: TComponent); @@ -36,8 +36,7 @@ procedure DesignCopyStreamToClipboard(InFmt: Cardinal; InS: TStream); implementation uses - SysUtils, Clipbrd, - JvDesignUtils; + SysUtils, Clipbrd; var CF_COMPONENTSTREAM: UINT; @@ -63,7 +62,7 @@ function DesignLoadComponentFromBinaryStream(InStream: TStream; InComponent: TComponent; InOnError: TReaderError): TComponent; var MS: TMemoryStream; - SZ: Int64; + SZ: Int64 = 0; begin InStream.Read(SZ, SizeOf(SZ)); MS := TMemoryStream.Create; @@ -84,9 +83,11 @@ begin end; procedure DesignCopyStreamToClipboard(InFmt: Cardinal; InS: TStream); +{ var HMem: THandle; PMem: Pointer; +} begin Clipboard.Open; Clipboard.AddFormat( InFmt, InS); @@ -118,9 +119,11 @@ begin end; procedure DesignCopyStreamFromClipboard(InFmt: Cardinal; InS: TStream); +{ var HMem: THandle; PMem: Pointer; + } begin Clipboard.GetFormat(InFmt, InS); { HMem := Clipboard.GetAsHandle(InFmt); diff --git a/components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas b/components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas index dfeb2cdf6..475b13e2c 100644 --- a/components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas +++ b/components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas @@ -141,10 +141,10 @@ type procedure PaintDragRects; public constructor Create(AOwner: TJvDesignSurface); override; - procedure MouseDown(Button: TMouseButton; Shift: TShiftState; + procedure MouseDown({%H-}Button: TMouseButton; {%H-}Shift: TShiftState; X, Y: Integer); override; - procedure MouseMove(Shift: TShiftState; X, Y: Integer); override; - procedure MouseUp(Button: TMouseButton; Shift: TShiftState; + procedure MouseMove({%H-}Shift: TShiftState; X, Y: Integer); override; + procedure MouseUp({%H-}Button: TMouseButton; {%H-}Shift: TShiftState; X, Y: Integer); override; end; @@ -155,11 +155,11 @@ type procedure CalcDragRect; virtual; procedure PaintDragRect; virtual; public - procedure MouseDown(Button: TMouseButton; Shift: TShiftState; - X, Y: Integer); override; - procedure MouseMove(Shift: TShiftState; X, Y: Integer); override; - procedure MouseUp(Button: TMouseButton; Shift: TShiftState; + procedure MouseDown({%H-}Button: TMouseButton; {%H-}Shift: TShiftState; X, Y: Integer); override; + procedure MouseMove({%H-}Shift: TShiftState; X, Y: Integer); override; + procedure MouseUp({%H-}Button: TMouseButton; {%H-}Shift: TShiftState; + {%H-}X, {%H-}Y: Integer); override; end; TJvDesignSizer = class(TJvDesignBander) @@ -184,7 +184,7 @@ type // IDesignerNotify interface procedure Modified; override; // procedure Notification(AnObject: TPersistent; Operation: TOperation); reintroduce; - procedure Notification(AComponent: TComponent; Operation: TOperation); override; + procedure Notification({%H-}AComponent: TComponent; {%H-}Operation: TOperation); override; // IDesigner, IDesignerHook interface function GetCustomForm: TCustomForm; @@ -193,13 +193,13 @@ type function GetShiftState: TShiftState; override; function IsDesignMsg(Sender: TControl; var Msg: TLMessage): Boolean; override; procedure PaintGrid; override; - procedure PrepareFreeDesigner(AFreeComponent: boolean); override; - procedure SelectOnlyThisComponent(AComponent: TComponent);override; - procedure SetCustomForm(Value: TCustomForm); - procedure SetIsControl(Value: Boolean); - function UniqueName(const BaseName: string): string; override; - procedure UTF8KeyPress(var UTF8Key: TUTF8Char); override; - procedure ValidateRename(AComponent: TComponent; const CurName, NewName: string); override; //reintroduce; + procedure PrepareFreeDesigner({%H-}AFreeComponent: boolean); override; + procedure SelectOnlyThisComponent({%H-}AComponent: TComponent);override; + procedure SetCustomForm({%H-}Value: TCustomForm); + procedure SetIsControl({%H-}Value: Boolean); + function UniqueName(const {%H-}BaseName: string): string; override; + procedure UTF8KeyPress(var {%H-}UTF8Key: TUTF8Char); override; + procedure ValidateRename({%H-}AComponent: TComponent; const {%H-}CurName, {%H-}NewName: string); override; //reintroduce; //{$IFDEF COMPILER9_UP} //procedure PaintMenu; @@ -210,7 +210,8 @@ type end; - {TJvDesignDesigner = class(TIDesigner) //class(TComponent, IDesignerHook) + (* + TJvDesignDesigner = class(TIDesigner) //class(TComponent, IDesignerHook) private FMessenger: TJvDesignCustomMessenger; public @@ -235,7 +236,8 @@ type property Messenger: TJvDesignCustomMessenger read FMessenger write FMessenger; property IsControl: Boolean read GetIsControl write SetIsControl; property Form: TCustomForm read GetCustomForm write SetCustomForm; - end; } + end; + *) TJvDesignDesignerMessenger = class(TJvDesignCustomMessenger) private @@ -1304,7 +1306,7 @@ end; function TJvDesignDesigner.UniqueName(const BaseName: string): string; begin - // + Result := ''; end; procedure TJvDesignDesigner.UTF8KeyPress(var UTF8Key: TUTF8Char); diff --git a/components/jvcllaz/run/JvRuntimeDesign/jvdesignsurface.pas b/components/jvcllaz/run/JvRuntimeDesign/jvdesignsurface.pas index e728376cc..1460b460e 100644 --- a/components/jvcllaz/run/JvRuntimeDesign/jvdesignsurface.pas +++ b/components/jvcllaz/run/JvRuntimeDesign/jvdesignsurface.pas @@ -41,9 +41,7 @@ interface uses Classes, SysUtils, LCLProc, LCLType, LResources, LCLIntf, LMessages, - Forms, Controls, Graphics, - Dialogs, - ExtCtrls, Contnrs; + Forms, Controls, Graphics, Dialogs, ExtCtrls; type TJvDesignSurface = class; @@ -63,7 +61,7 @@ type function IsDesignMessage(ASender: TControl; var AMessage: TLMessage): Boolean; virtual; procedure Clear; virtual; procedure DesignChildren(AContainer: TWinControl; ADesigning: Boolean); - procedure DesignComponent(AComponent: TComponent; ADesigning: Boolean); virtual; + procedure DesignComponent({%H-}AComponent: TComponent; {%H-}ADesigning: Boolean); virtual; property Container: TWinControl read FContainer write SetContainer; property OnDesignMessage: TJvDesignMessage read FOnDesignMessage write FOnDesignMessage; end; @@ -172,7 +170,7 @@ type procedure NeedMessenger; procedure NeedSelector; //procedure PaintContainerBkgnd(ADC: HDC); - procedure ReaderError(Reader: TReader; const Msg: string; var Handled: Boolean); + procedure ReaderError({%H-}Reader: TReader; const {%H-}Msg: string; var Handled: Boolean); procedure SetActive(AValue: Boolean); procedure SetContainer(AValue: TWinControl); //procedure SetDrawGrid(const Value: Boolean); @@ -228,7 +226,7 @@ type TJvDesignScrollBox = class(TScrollBox) protected - procedure AutoScrollInView(AControl: TControl); //CV override; + procedure AutoScrollInView({%H-}AControl: TControl); //CV override; end; TJvDesignPanel = class(TPanel) @@ -818,9 +816,10 @@ begin end; } +{ type TAccessWinControl = class(TWinControl); - +} function TJvDesignSurface.IsDesignMessage(ASender: TControl; var AMsg: TLMessage; const APt: TPoint): Boolean; @@ -845,11 +844,12 @@ function TJvDesignSurface.IsDesignMessage(ASender: TControl; Result := True; end; end; -} + var PosChangedHandle: HWND; I: Integer; Control: TAccessWinControl; +} begin if not Active then Result := False diff --git a/components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas b/components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas index 0018ad490..ea6d20470 100644 --- a/components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas +++ b/components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas @@ -25,11 +25,11 @@ type FCanvas: TCanvas; FDC: HDC; FDCControl: TWinControl; - FDCOrigin: TPoint; // DC origin on desktop + // FDCOrigin: TPoint; // DC origin on desktop FFlags: TDesignerDCFlags; - FFormClientOrigin: TPoint; // Form client origin on desktop - FFormOrigin: TPoint; // DC origin relative to designer Form - FDcSize: TPoint; + // FFormClientOrigin: TPoint; // Form client origin on desktop + // FFormOrigin: TPoint; // DC origin relative to designer Form + // FDcSize: TPoint; FForm: TCustomForm; FSavedDC: HDC; FPaintCount: integer; @@ -44,7 +44,7 @@ type procedure Clear; procedure BeginPainting; procedure EndPainting; - function RectVisible(ALeft, ATop, ARight, ABottom: integer): boolean; + function RectVisible({%H-}ALeft, {%H-}ATop, {%H-}ARight, {%H-}ABottom: integer): boolean; property Canvas: TCanvas read FCanvas; property DC: HDC read FDC; property Form: TCustomForm read FForm; @@ -351,22 +351,23 @@ end; function TDesignerDeviceContext.GetDCOrigin: TPoint; begin - + Result := Point(0, 0); end; function TDesignerDeviceContext.GetDCSize: TPoint; begin - + Result := Point(0, 0); end; function TDesignerDeviceContext.GetFormClientOrigin: TPoint; begin + Result := Point(0, 0); end; function TDesignerDeviceContext.GetFormOrigin: TPoint; begin - + Result := Point(0, 0); end; constructor TDesignerDeviceContext.Create; @@ -412,7 +413,7 @@ end; function TDesignerDeviceContext.RectVisible(ALeft, ATop, ARight, ABottom: integer): boolean; begin - + Result := false; end; diff --git a/components/jvcllaz/run/JvStdCtrls/jvbaseedits.pas b/components/jvcllaz/run/JvStdCtrls/jvbaseedits.pas index 6c2acfd20..f2de5120a 100644 --- a/components/jvcllaz/run/JvStdCtrls/jvbaseedits.pas +++ b/components/jvcllaz/run/JvStdCtrls/jvbaseedits.pas @@ -477,7 +477,7 @@ function TJvCustomNumEdit.IsValidChar(Key: Char): Boolean; var S: string; FSelStart, SelStop, DecPos: Integer; - RetValue: Double; + RetValue: Double = 0.0; begin Result := False; S := EditText; diff --git a/components/jvcllaz/run/JvStdCtrls/jvbutton.pas b/components/jvcllaz/run/JvStdCtrls/jvbutton.pas index 7f237a692..878f5b2ca 100644 --- a/components/jvcllaz/run/JvStdCtrls/jvbutton.pas +++ b/components/jvcllaz/run/JvStdCtrls/jvbutton.pas @@ -85,7 +85,7 @@ type procedure MouseLeave(Control: TControl); override; procedure Paint; override; procedure PaintButton(ACanvas: TCanvas); virtual; - procedure PaintFrame(ACanvas: TCanvas); virtual; + procedure PaintFrame({%H-}ACanvas: TCanvas); virtual; function InsideBtn(X, Y: Integer): Boolean; virtual; function WantKey(Key: Integer; Shift: TShiftState; const KeyText: WideString): Boolean; override; @@ -419,7 +419,7 @@ begin else Exit; { wait 'til menu is done } - while PeekMessage(Msg, 0, LM_MOUSEFIRST, LM_MOUSELAST, PM_REMOVE) do + while PeekMessage(Msg{%H-}, 0, LM_MOUSEFIRST, LM_MOUSELAST, PM_REMOVE) do {nothing}; { release button } MouseUp(Button, Shift, X, Y); diff --git a/components/jvcllaz/run/JvStdCtrls/jvcheckbox.pas b/components/jvcllaz/run/JvStdCtrls/jvcheckbox.pas index 4000f5fb8..b5abae173 100644 --- a/components/jvcllaz/run/JvStdCtrls/jvcheckbox.pas +++ b/components/jvcllaz/run/JvStdCtrls/jvcheckbox.pas @@ -34,10 +34,9 @@ unit JvCheckBox; interface uses - LCLIntf, LCLType, LMessages, - Classes, Graphics, Controls, StdCtrls, Types, - JvTypes, JvLinkedControls; -// JvTypes, JvExStdCtrls, JvLinkedControls, JvDataSourceIntf; + LCLIntf, LCLType, + Classes, Graphics, Controls, StdCtrls, + JvLinkedControls; const DefaultValueChecked = '1'; diff --git a/components/jvcllaz/run/JvWizard/jvwizard.pas b/components/jvcllaz/run/JvWizard/jvwizard.pas index 27e2637e3..9c743840d 100644 --- a/components/jvcllaz/run/JvWizard/jvwizard.pas +++ b/components/jvcllaz/run/JvWizard/jvwizard.pas @@ -411,7 +411,7 @@ type FOnDisplaying: TJvWizardRouteMapDisplayEvent; function GetPage(Index: Integer): TJvWizardCustomPage; function GetPageCount: Integer; - procedure SetAlign(Value: TJvWizardAlign); + procedure SetAlign(Value: TJvWizardAlign); reintroduce; procedure SetPageIndex(Value: Integer); procedure SetImage(const Value: TJvWizardImage); procedure CMDesignHitTest(var Msg: TCMDesignHitTest); message CM_DESIGNHITTEST; @@ -425,12 +425,12 @@ type function HasPicture: Boolean; procedure SetParent(AParent: TWinControl); override; procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; - function PageAtPos(Pt: TPoint): TJvWizardCustomPage; virtual; - procedure WizardPageAdded(const APage: TJvWizardCustomPage); virtual; - procedure WizardPageDeleted(const APage: TJvWizardCustomPage); virtual; - procedure WizardPageUpdated(const APage: TJvWizardCustomPage); virtual; - procedure WizardPageActivated(const APage: TJvWizardCustomPage); virtual; - procedure WizardPageMoved(const APage: TJvWizardCustomPage; const OldIndex: Integer); virtual; + function PageAtPos({%H-}Pt: TPoint): TJvWizardCustomPage; virtual; + procedure WizardPageAdded(const {%H-}APage: TJvWizardCustomPage); virtual; + procedure WizardPageDeleted(const {%H-}APage: TJvWizardCustomPage); virtual; + procedure WizardPageUpdated(const {%H-}APage: TJvWizardCustomPage); virtual; + procedure WizardPageActivated(const {%H-}APage: TJvWizardCustomPage); virtual; + procedure WizardPageMoved(const {%H-}APage: TJvWizardCustomPage; const {%H-}OldIndex: Integer); virtual; function CanDisplay(const APage: TJvWizardCustomPage): Boolean; virtual; property Wizard: TJvWizard read FWizard write FWizard; property Align: TJvWizardAlign read FAlign write SetAlign default alLeft; @@ -659,7 +659,7 @@ type procedure ImageChanged(Sender: TObject); procedure WMEraseBkgnd(var Msg: TLMEraseBkgnd); message LM_ERASEBKGND; procedure CMFontChanged(var Msg: TLMessage); message CM_FONTCHANGED; - procedure CMTextChanged(var Msg: TLMessage); message CM_TEXTCHANGED; + procedure CMTextChanged(var {%H-}Msg: TLMessage); message CM_TEXTCHANGED; procedure CMEnabledChanged(var Msg: TLMessage); message CM_ENABLEDCHANGED; function GetSubtitle: TJvWizardPageTitle; function GetTitle: TJvWizardPageTitle; @@ -673,7 +673,7 @@ type { DrawPage is called by paint method. all the derived page controls should call this method to paint itsself rather than the overrided paint method. } - procedure DrawPage(ACanvas: TCanvas; var ARect: TRect); virtual; + procedure DrawPage({%H-}ACanvas: TCanvas; var {%H-}ARect: TRect); virtual; { called before the page shows up. Page: From page } procedure Enter(const FromPage: TJvWizardCustomPage); virtual; { called after the page shows up. } diff --git a/components/jvcllaz/run/JvWizard/jvwizardroutemaplist.pas b/components/jvcllaz/run/JvWizard/jvwizardroutemaplist.pas index bda8efe5c..8857e06e0 100644 --- a/components/jvcllaz/run/JvWizard/jvwizardroutemaplist.pas +++ b/components/jvcllaz/run/JvWizard/jvwizardroutemaplist.pas @@ -96,7 +96,7 @@ type procedure CMCursorChanged(var Msg: TLMessage); message CM_CURSORCHANGED; procedure CMFontChanged(var Msg: TLMessage); message CM_FONTCHANGED; procedure CursorChanged; - procedure FontChanged; + procedure FontChanged; reintroduce; public constructor Create(AOwner: TComponent); override; destructor Destroy; override; @@ -229,7 +229,7 @@ procedure TJvWizardRouteMapList.Paint; var I: Integer; R: TRect; - P: TPoint; + P: TPoint = (X:0; Y:0); begin Canvas.Brush.Style := bsSolid; Canvas.Brush.Color := Color; diff --git a/components/jvcllaz/run/JvWizard/jvwizardroutemapsteps.pas b/components/jvcllaz/run/JvWizard/jvwizardroutemapsteps.pas index 54a7a51ea..9d8fa88d8 100644 --- a/components/jvcllaz/run/JvWizard/jvwizardroutemapsteps.pas +++ b/components/jvcllaz/run/JvWizard/jvwizardroutemapsteps.pas @@ -36,7 +36,7 @@ unit JvWizardRouteMapSteps; interface uses - Types, SysUtils, Classes, Graphics, Controls, Forms, LCLIntf, LCLType, + SysUtils, Classes, Graphics, Controls, Forms, LCLIntf, LCLType, JvWizard; type @@ -61,7 +61,7 @@ type procedure SetPreviousStepText(const Value: string); procedure SetShowDivider(const Value: Boolean); procedure SetShowNavigators(const Value: Boolean); - function DetectPageCount(var ActivePageIndex: Integer): Integer; // Add by Yu Wei + function DetectPageCount(out ActivePageIndex: Integer): Integer; // Add by Yu Wei function DetectPage(const Pt: TPoint): TJvWizardCustomPage; // Add by Yu Wei function StoreActiveStepFormat: Boolean; function StoreNextStepText: Boolean; @@ -156,7 +156,7 @@ begin Height - FIndent - 32 + Canvas.TextHeight('Wq')); end; -function TJvWizardRouteMapSteps.DetectPageCount(var ActivePageIndex: Integer): Integer; +function TJvWizardRouteMapSteps.DetectPageCount(out ActivePageIndex: Integer): Integer; var I: Integer; begin @@ -275,8 +275,10 @@ begin Canvas.Font.Style := []; if Self.ShowDivider then begin - SetRect(DividerRect, Left + Indent, TextRect.Bottom + 5, Width - Indent, - TextRect.Bottom + 6); + DividerRect := Rect( + Left + Indent, TextRect.Bottom + 5, + Width - Indent, TextRect.Bottom + 6 + ); DrawEdge(Canvas.Handle, DividerRect, EDGE_RAISED, BF_FLAT or BF_BOTTOM); end; diff --git a/components/jvcllaz/run/JvXPCtrls/jvxpcore.pas b/components/jvcllaz/run/JvXPCtrls/jvxpcore.pas index cb4b77d1f..109d3684b 100644 --- a/components/jvcllaz/run/JvXPCtrls/jvxpcore.pas +++ b/components/jvcllaz/run/JvXPCtrls/jvxpcore.pas @@ -143,7 +143,7 @@ type FModalResult: TModalResult; FOnMouseLeave: TNotifyEvent; FOnMouseEnter: TNotifyEvent; - procedure SetVersion(const Value: string); + procedure SetVersion(const {%H-}Value: string); procedure CMFocusChanged(var Msg: TLMessage); message CM_FOCUSCHANGED; procedure CMDialogChar(var Msg: TCMDialogChar); message CM_DIALOGCHAR; procedure CMBorderChanged(var Msg: TLMessage); message CM_BORDERCHANGED; @@ -170,7 +170,7 @@ type procedure HookMouseDown; dynamic; procedure HookMouseEnter; dynamic; procedure HookMouseLeave; dynamic; - procedure HookMouseMove(X: Integer = 0; Y: Integer = 0); dynamic; + procedure HookMouseMove({%H-}X: Integer = 0; {%H-}Y: Integer = 0); dynamic; procedure HookMouseUp; dynamic; procedure HookParentColorChanged; dynamic; procedure HookParentFontChanged; dynamic; @@ -617,7 +617,7 @@ end; procedure TJvXPCustomControl.HookMouseUp; var - CurrentPos: TPoint; + CurrentPos: TPoint = (X:0; Y: 0); NewControl: TWinControl; begin // this hook is called, if the user releases the left mouse button. diff --git a/components/jvcllaz/run/JvXPCtrls/jvxpcoreutils.pas b/components/jvcllaz/run/JvXPCtrls/jvxpcoreutils.pas index 91fd3184e..93e69d382 100644 --- a/components/jvcllaz/run/JvXPCtrls/jvxpcoreutils.pas +++ b/components/jvcllaz/run/JvXPCtrls/jvxpcoreutils.pas @@ -43,8 +43,8 @@ function JvXPMethodsEqual(const Method1, Method2: TMethod): Boolean; procedure JvXPDrawLine(const ACanvas: TCanvas; const X1, Y1, X2, Y2: Integer); procedure JvXPCreateGradientRect(const AWidth, AHeight: Integer; const StartColor, - EndColor: TColor; const AColors: TJvXPGradientColors; const Style: TJvXPGradientStyle; - const Dithered: Boolean; var Bitmap: TBitmap); + EndColor: TColor; const {%H-}AColors: TJvXPGradientColors; const Style: TJvXPGradientStyle; + const {%H-}Dithered: Boolean; var Bitmap: TBitmap); procedure JvXPAdjustBoundRect(const BorderWidth: Byte; const ShowBoundLines: Boolean; const BoundLines: TJvXPBoundLines; var Rect: TRect);