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

GradControls, make it compile again

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2658 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
jesusr
2013-02-05 18:32:07 +00:00
parent 84775a80a0
commit b4fadb7ad8
5 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/gradcontrols/gradcontrols.lpk
View File

@ -1,10 +1,11 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<CONFIG> <CONFIG>
<Package Version="3"> <Package Version="4">
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Name Value="gradcontrols"/> <Name Value="gradcontrols"/>
<AddToProjectUsesSection Value="True"/>
<CompilerOptions> <CompilerOptions>
<Version Value="9"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="src"/> <IncludeFiles Value="src"/>
@ -57,10 +58,7 @@
</Item4> </Item4>
</RequiredPkgs> </RequiredPkgs>
<UsageOptions> <UsageOptions>
<IncludePath Value="$(PkgOutDir);$(PkgOutDir)\.."/> <UnitPath Value="$(PkgOutDir)"/>
<LibraryPath Value="$(PkgOutDir);$(PkgOutDir)\.."/>
<ObjectPath Value="$(PkgOutDir);$(PkgOutDir)\.."/>
<UnitPath Value="$(PkgOutDir);$(PkgOutDir)\.."/>
</UsageOptions> </UsageOptions>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>

4
components/gradcontrols/src/dummylogger.pas
View File

@ -17,8 +17,8 @@ type
procedure ExitMethod(AStr: string); procedure ExitMethod(AStr: string);
procedure EnterMethod(AObj: TObject; AStr: string); procedure EnterMethod(AObj: TObject; AStr: string);
procedure ExitMethod(AObj: TObject; AStr: string); procedure ExitMethod(AObj: TObject; AStr: string);
procedure Send(AStr: string; AVar: Variant = 0); procedure Send(AStr: string; AVar: Variant);
procedure Watch(AStr: string; AVar: Variant = 0); procedure Watch(AStr: string; AVar: Variant);
end; end;
var var

4
components/gradcontrols/src/gradtabcontroleditor.pas
View File

@ -5,7 +5,7 @@ unit gradtabcontroleditor;
interface interface
uses uses
Classes, SysUtils, ugradtabcontrol, ComponentEditors, Menus, PropEdits; Classes, SysUtils, ComCtrls, ugradtabcontrol, ComponentEditors, Menus, PropEdits;
type type
{ TGradTabControlComponentEditor { TGradTabControlComponentEditor
@ -111,7 +111,7 @@ begin
if (OldIndex>=0) and (OldIndex<GradTabControl.PageCount) then begin if (OldIndex>=0) and (OldIndex<GradTabControl.PageCount) then begin
if not GetHook(Hook) then exit; if not GetHook(Hook) then exit;
PageComponent:=TComponent(GradTabControl.Tabs.Objects[OldIndex]); PageComponent:=TComponent(GradTabControl.Tabs.Objects[OldIndex]);
Hook.DeletePersistent(PageComponent); Hook.DeletePersistent(TPersistent(PageComponent));
end; end;
end; end;

2
components/gradcontrols/src/gradtabstyle.pas
View File

@ -11,7 +11,7 @@ Style-Class for TGradTabControl
interface interface
uses uses
Classes, SysUtils, Controls, Graphics, Buttons, ExtCtrls, ugradbtn Classes, SysUtils, Controls, Graphics, Buttons, ComCtrls, ExtCtrls, ugradbtn
{$IFDEF DEBUGTAB} {$IFDEF DEBUGTAB}
, sharedloggerlcl , sharedloggerlcl
{$ELSE} {$ELSE}

17
components/gradcontrols/src/ugradtabcontrol.pas
View File

@ -16,7 +16,7 @@ unit ugradtabcontrol;
interface interface
uses uses
Classes, LResources, SysUtils, Menus, LCLType, Classes, LResources, SysUtils, Menus, LCLType, ComCtrls,
LCLProc, LCLIntf, ExtCtrls, Graphics, ugradbtn, Controls, LCLProc, LCLIntf, ExtCtrls, Graphics, ugradbtn, Controls,
uRotateBitmap, Buttons, Forms, ImgList, gradtabstyle uRotateBitmap, Buttons, Forms, ImgList, gradtabstyle
{$IFDEF DEBUGTAB} {$IFDEF DEBUGTAB}
@ -580,7 +580,8 @@ var
begin begin
if not HasParent then Exit; if not HasParent then Exit;
GetBackgroundRect(TheRect); //GetBackgroundRect(TheRect);
GetContentRect(TheRect);
DisplayWidth:= TheRect.Right-TheRect.Left; DisplayWidth:= TheRect.Right-TheRect.Left;
DisplayHeight:=TheRect.Bottom-TheRect.Top; DisplayHeight:=TheRect.Bottom-TheRect.Top;
@ -1461,7 +1462,7 @@ begin
B.BorderSides := NewBorderSides; B.BorderSides := NewBorderSides;
B.GradientType := NewGradientType; B.GradientType := NewGradientType;
Logger.Send('Before'); Logger.Send('Before', 0);
Logger.Send('i', i); Logger.Send('i', i);
Logger.Send('Width', B.Width); Logger.Send('Width', B.Width);
Logger.Send('Height', B.Height); Logger.Send('Height', B.Height);
@ -1555,7 +1556,7 @@ begin
end; end;
end; end;
Logger.Send('After'); Logger.Send('After', 0);
Logger.Send('i', i); Logger.Send('i', i);
Logger.Send('Width', B.Width); Logger.Send('Width', B.Width);
Logger.Send('Height', B.Height); Logger.Send('Height', B.Height);
@ -1853,7 +1854,7 @@ begin
OrderButtons; OrderButtons;
if IsVisible(PIndex) then if IsVisible(PIndex) then
begin begin
Logger.Send('Tab is Visible'); Logger.Send('Tab is Visible', 0);
Logger.ExitMethod(Self, 'ScrollToTab('+IntToStr(PIndex)+')'); Logger.ExitMethod(Self, 'ScrollToTab('+IntToStr(PIndex)+')');
Exit; Exit;
end; end;
@ -2276,7 +2277,7 @@ begin
if FPagesBar.NeedOrderButtons then if FPagesBar.NeedOrderButtons then
begin begin
Logger.Send('OrderButtonsNeeded'); Logger.Send('OrderButtonsNeeded', 0);
FPagesBar.OrderButtons; FPagesBar.OrderButtons;
end; end;
Logger.ExitMethod(Self, 'EndUpdate'); Logger.ExitMethod(Self, 'EndUpdate');
@ -2951,9 +2952,7 @@ begin
if (pfAdded in APage.FFlags) then exit; if (pfAdded in APage.FFlags) then exit;
Include(APage.FFlags,pfAdding); Include(APage.FFlags,pfAdding);
APage.FFlags:=APage.FFlags+[pfAdded]-[pfAdding]; APage.FFlags:=APage.FFlags+[pfAdded]-[pfAdding];
{$IFNDEF DARWIN} APage.AdjustSize;
APage.ResizeDelayedAutoSizeChildren;
{$ENDIF}
end else begin end else begin
{$IFDEF NOTEBOOK_DEBUG} {$IFDEF NOTEBOOK_DEBUG}
DebugLn(['TGradTabControl.AddRemovePageHandle REMOVE ',DbgSName(APage),' pfAdded=',pfAdded in APage.FFlags]); DebugLn(['TGradTabControl.AddRemovePageHandle REMOVE ',DbgSName(APage),' pfAdded=',pfAdded in APage.FFlags]);