added new lcl/widgetset dir to codetools defines

git-svn-id: trunk@5316 -
This commit is contained in:
mattias 2004-03-17 13:23:34 +00:00
parent 38f2d182a4
commit ec7c457451
4 changed files with 28 additions and 22 deletions

View File

@ -3567,6 +3567,9 @@ begin
Format(ctsIncludeDirectoriesPlusDirs,['include']),
ExternalMacroStart+'IncPath',
'include',da_Define));
DirTempl.AddChild(TDefineTemplate.Create('LCL path addition',
Format(ctsAddsDirToSourcePath,['widgetset']),
ExternalMacroStart+'SrcPath',d('widgetset;'+SrcPath),da_Define));
MainDir.AddChild(DirTempl);
// <LazarusSrcDir>/lcl/units
@ -3578,7 +3581,7 @@ begin
begin
SplitLazarusCPUOSWidgetCombo(Lazarus_CPU_OS_Widget_Combinations[i],
CurCPU,CurOS,CurWidgetSet);
// <LazarusSrcDir>/lcl/units/TargetCPU
// <LazarusSrcDir>/lcl/units/<TargetCPU>
LCLUnitsCPUDir:=LCLUnitsDir.FindChildByName(CurCPU);
if LCLUnitsCPUDir=nil then begin
LCLUnitsCPUDir:=TDefineTemplate.Create(CurCPU,
@ -3586,7 +3589,7 @@ begin
'',CurCPU,da_Directory);
LCLUnitsDir.AddChild(LCLUnitsCPUDir);
end;
// <LazarusSrcDir>/lcl/units/TargetCPU/TargetOS
// <LazarusSrcDir>/lcl/units/<TargetCPU>/<TargetOS>
// these directories contain the output of the LCL (excluding the interfaces)
LCLUnitsCPUOSDir:=LCLUnitsCPUDir.FindChildByName(CurOS);
if LCLUnitsCPUOSDir=nil then begin
@ -3595,14 +3598,14 @@ begin
'',CurOS,da_Directory);
LCLUnitsCPUDir.AddChild(LCLUnitsCPUOSDir);
ExtraSrcPath:='../../..';
ExtraSrcPath:='../../..;../../../widgetset';
if CurOS<>'win32' then
ExtraSrcPath:=ExtraSrcPath+';../../../nonwin32';
LCLUnitsCPUOSDir.AddChild(TDefineTemplate.Create('CompiledSrcPath',
ctsSrcPathForCompiledUnits,CompiledSrcPathMacroName,
d(ExtraSrcPath),da_Define));
end;
// <LazarusSrcDir>/lcl/units/TargetCPU/TargetOS/WidgetSet
// <LazarusSrcDir>/lcl/units/<TargetCPU>/<TargetOS>/<WidgetSet>
// these directories contain the output of the LCL interfaces
LCLUnitsCPUOSWidgetSetDir:=LCLUnitsCPUOSDir.FindChildByName(CurWidgetSet);
if LCLUnitsCPUOSWidgetSetDir=nil then begin
@ -3626,7 +3629,8 @@ begin
// add lcl to the source path of all widget set directories
SubDirTempl.AddChild(TDefineTemplate.Create('LCL Path',
Format(ctsAddsDirToSourcePath,['lcl']),ExternalMacroStart+'SrcPath',
LazarusSrcDir+d('/lcl;')+SrcPath,da_DefineRecurse));
LazarusSrcDir+d('/lcl;')+LazarusSrcDir+d('/lcl/widgetset;')+SrcPath,
da_DefineRecurse));
DirTempl.AddChild(SubDirTempl);
// <LazarusSrcDir>/lcl/interfaces/gtk

View File

@ -20,14 +20,14 @@
* *
*****************************************************************************
}
unit lclclasses;
unit LCLClasses;
{$mode objfpc}{H+}
{$mode objfpc}{$H+}
interface
uses
classes, wslclclasses;
Classes, WSLCLClasses;
type

View File

@ -20,28 +20,28 @@
* *
*****************************************************************************
}
unit wslclclasses;
unit WSLCLClasses;
{$mode objfpc}{H+}
{$mode objfpc}{$H+}
interface
uses
classes;
Classes;
type
{ TWSLCLComponent }
TWSLCLComponentClass = class of TWSLCLComponent;
TWSLCLComponent = class(TObject)
private
protected
public
end;
TWSLCLComponentClass = class of TWSLCLComponent;
function FindWSComponentClass(const AComponent: TComponentClass): TWSLCLComponentClass;
procedure RegisterWSComponent(const AComponent: TComponentClass; const AWSComponent: TWSLCLComponentClass);
procedure RegisterWSComponent(const AComponent: TComponentClass;
const AWSComponent: TWSLCLComponentClass);
implementation
@ -51,7 +51,8 @@ uses
var
MWSComponentList: TStringList;
function FindWSComponentClass(const AComponent: TComponentClass): TWSLCLComponentClass;
function FindWSComponentClass(
const AComponent: TComponentClass): TWSLCLComponentClass;
var
idx: Integer;
cls: TClass;
@ -70,7 +71,8 @@ begin
end;
end;
procedure RegisterWSComponent(const AComponent: TComponentClass; const AWSComponent: TWSLCLComponentClass);
procedure RegisterWSComponent(const AComponent: TComponentClass;
const AWSComponent: TWSLCLComponentClass);
var
idx: Integer;
Name: String;

View File

@ -20,9 +20,9 @@
* *
*****************************************************************************
}
unit wstoolwin;
unit WSToolWin;
{$mode objfpc}{H+}
{$mode objfpc}{$H+}
interface
@ -30,7 +30,7 @@ uses
////////////////////////////////////////////////////
// I M P O R T A N T
////////////////////////////////////////////////////
// To get as litle as posible circles,
// To get as little as posible circles,
// Uncomment only when needed for registration
////////////////////////////////////////////////////
// toolwin,