git-svn-id: https://svn.code.sf.net/p/kolmck/code@59 91bb2d04-0c0c-4d2d-88a5-bbb6f4c1fa07

This commit is contained in:
dkolmck
2010-03-28 07:53:45 +00:00
parent 549ca7c6b5
commit fd477233b5
10 changed files with 1355 additions and 617 deletions

1197
KOL.pas

File diff suppressed because it is too large Load Diff

View File

@@ -198,6 +198,17 @@ That is all to have full compatibility.
{$ENDIF}
{$ENDIF}
//{$DEFINE USE_CONSTRUCTORS}
// Comment this line to produce smaller code if constructors are not used.
// When uncommented, this definition allows to create descendant controls
// and objects overriding constructors, which are actually members of objects.
// Otherwise, global functions (usually named New<ObjectName>) are used to
// create and initialize object instances. This gives smaller code, but
// prevents from using OOP inheritance.
// Note: creating descendant objects derived from TObj does not require using
// of this option. It is actually needed only for deriving new controls on
// base of TControl. See also option USE_CUSTOMEXTENSIONS below.
//{$DEFINE USE_CUSTOMEXTENSIONS}
// Uncomment this option or add it to your project conditional defines,
// if You wish to extend existing TControl object from
@@ -216,10 +227,6 @@ That is all to have full compatibility.
// Another way to turn this option off is to define symbol NOT_UNLOAD_RICHEDITLIB
// in your project options.
//{$IFNDEF INPACKAGE}
// {$DEFINE NOT_USE_RICHEDIT}
//{$ENDIF}
//{$DEFINE TEST_VERSION}
{$IFNDEF _D6orHigher}
{$DEFINE PARANOIA} //seems not needed under D6 !!! Inprise fixed this, finally...

View File

@@ -4180,14 +4180,15 @@ end;
{$ENDIF}
{$IFDEF ASM_STREAM}
function TStream.Write(var Buffer; const Count: TStrmSize): TStrmSize;
function TStream.Write(var Buffer; {$IFNDEF STREAM_COMPAT} const {$ENDIF} Count: TStrmSize): TStrmSize;
asm
CALL [EAX].fMethods.fWrite
end;
{$ENDIF}
{$IFDEF ASM_STREAM}
function TStream.Seek(const MoveTo: TStrmMove; MoveMethod: TMoveMethod): TStrmSize;
function TStream.Seek({$IFNDEF STREAM_COMPAT} const {$ENDIF} MoveTo: TStrmMove; MoveMethod: TMoveMethod): TStrmSize;
//function TStream.Seek(MoveTo: TStrmMove; MoveMethod: TMoveMethod): TStrmSize;
asm
CALL [EAX].fMethods.fSeek
end;
@@ -4218,7 +4219,8 @@ end;
{$ENDIF}
{$IFDEF ASM_STREAM}
function SeekMemStream( Strm: PStream; {$IFNDEF STREAM_COMPAT} const {$ENDIF} MoveTo: TStrmMove; MoveFrom: TMoveMethod ): TStrmSize;
function SeekMemStream( Strm: PStream; {$IFNDEF STREAM_COMPAT} const {$ENDIF}
MoveTo: TStrmMove; MoveFrom: TMoveMethod ): TStrmSize;
asm
PUSH EBX
MOV EBX, EDX
@@ -17898,54 +17900,59 @@ asm //cmd //opd
//@@exit: XCHG EAX, ECX
end;
{function WinVer : TWindowsVersion;
// by MTsv DN - v2.90 -- chg by VK
function WinVer : TWindowsVersion;
asm
MOVSX EAX, byte ptr [SaveWinVer]
INC AH // ���� <> 0 ����� ����������, �� AL �������� ����������� ������
JNZ @@exit
CALL GetVersion // EAX < 0 ��� ��������� 9�, ����� NT; AL=MajorVersion; AH=MinorVersion
XCHG EDX, EAX
XOR EAX, EAX
TEST EDX, EDX
XCHG DL, DH // DH=MajorVersion; DL=MinorVersion
JL @@platform_9x
MOV AL, wvNT
CMP DX, $0400
JZ @@save_exit
MOVSX EAX, byte ptr [SaveWinVer]
INC AH // ���� <> 0 ����� ����������, �� AL �������� ����������� ������
JNZ @@exit
CALL GetVersion // EAX < 0 ��� ��������� 9�, ����� NT; AL=MajorVersion; AH=MinorVersion
XCHG EDX, EAX
XOR EAX, EAX
TEST EDX, EDX
XCHG DL, DH // DH=MajorVersion; DL=MinorVersion
INC AL // wvY2K
CMP DX, $0500
JZ @@save_exit
JL @@platform_9x
MOV AL, wvNT
CMP DX, $0400
JZ @@save_exit
INC AL // wvXP
CMP DX, $0501
JZ @@save_exit
INC AL // wvY2K
SUB DX, $0500
JZ @@save_exit
INC AL // wvWin2003Server
CMP DX, $0502
JZ @@save_exit
INC AL // wvXP
//CMP DX, $0501
DEC DX
JZ @@save_exit
INC AL // wvVista
CMP DX, $0600
JZ @@save_exit
INC AL // wvWin2003Server
//CMP DX, $0502
DEC DX
JZ @@save_exit
INC AL // wvSeven
CMP DX, $0601
JZ @@save_exit
INC AL // wvVista
CMP DX, $0600 - $0502
JZ @@save_exit
INC AL // wvSeven
//CMP DX, $0601
//DEC DX
JMP @@save_exit
@@platform_9x:
CMP DH, 4
JB @@save_exit // wv31
INC AL // wv95
CMP DX, $040A
JB @@save_exit
INC AL // wv98
CMP DX, $045A
JB @@save_exit
INC AL // wvME
CMP DH, 4
JB @@save_exit // wv31
INC AL // wv95
CMP DX, $040A
JB @@save_exit
INC AL // wv98
CMP DX, $045A
JB @@save_exit
INC AL // wvME
@@save_exit:
MOV byte ptr [SaveWinVer], AL
MOV byte ptr [SaveWinVer], AL
@@exit:
end;}
end;
//======================================== THE END OF FILE KOL_ASM.inc

View File

@@ -701,6 +701,10 @@ type
function GetTotal: Integer;
function GetIndexAmongSiblings: Integer;
protected
{$IFDEF USE_CONSTRUCTORS}
constructor CreateTree( AParent: PTree; const AName: AnsiString );
{* }
{$ENDIF}
{++}(*public*){--}
destructor Destroy; {-}virtual;{+}{++}(*override;*){--}
{* }
@@ -1381,7 +1385,7 @@ procedure InitUpper;
var c: AnsiChar;
begin
for c := #0 to #255 do
Upper[ c ] := AnsiUpperCase( AnsiString(c + #0) )[ 1 ];
Upper[ c ] := AnsiUpperCase( {$IFDEF _D3orHigher}AnsiString{$ENDIF}(c + #0) )[ 1 ];
Upper_Initialized := TRUE;
end;
@@ -2711,7 +2715,9 @@ var
arr1_DoOnMenuItem: array[ 0..0 ] of TOnMenuItem;
{$ENDIF _FPC}
begin
LinkCtrl(Menu, ckMenu, MenuItemIdx, UpdateMenu);
//LinkCtrl(Menu, ckMenu, MenuItemIdx, UpdateMenu); -- replaced by mdw to:
LinkCtrl(Menu, ckMenu, Menu.Items[MenuItemIdx].MenuId, UpdateMenu);
{$IFDEF _FPC}
arr1_DoOnMenuItem[ 0 ] := DoOnMenuItem;
Menu.AssignEvents(MenuItemIdx, arr1_DoOnMenuItem);
@@ -2974,6 +2980,14 @@ end;
{ -- TTree -- }
{$IFDEF USE_CONSTRUCTORS}
//[function NewTree]
function NewTree( AParent: PTree; const AName: AnsiString ): PTree;
begin
New( Result, CreateTree( AParent, AName ) );
end;
//[END NewTree]
{$ELSE not_USE_CONSTRUCTORS}
//[function NewTree]
{$IFDEF TREE_NONAME}
function NewTree( AParent: PTree ): PTree;
@@ -3011,6 +3025,7 @@ end;
{$ENDIF}
{$ENDIF}
//[END NewTree]
{$ENDIF USE_CONSTRUCTORS}
{ TTree }
@@ -3043,6 +3058,18 @@ begin
PTree( fChildren.Items[ I ] ).Free;
end;
{$IFDEF USE_CONSTRUCTORS}
//[constructor TTree.CreateTree]
constructor TTree.CreateTree(AParent: PTree; const AName: AnsiString);
begin
inherited Create;
if AParent <> nil then
AParent.Add( @Self );
fParent := AParent;
fName := AName;
end;
{$ENDIF}
//[destructor TTree.Destroy]
destructor TTree.Destroy;
begin

View File

@@ -72,11 +72,7 @@ type
procedure FirstCreate; override;
function GenerateTransparentInits: String; override;
function P_GenerateTransparentInits: String; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupColor( SL: TStrings; const AName: String ); override;
procedure P_SetupColor( SL: TStrings; const AName: String; var ControlInStack: Boolean ); override;
@@ -168,11 +164,7 @@ type
procedure FirstCreate; override;
function GenerateTransparentInits: String; override;
function P_GenerateTransparentInits: String; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -262,11 +254,7 @@ type
protected
function AdjustVerticalAlign( Value: TVerticalAlign ): TVerticalAlign; virtual;
procedure FirstCreate; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nParams: Integer ): String; override;
function P_GenerateTransparentInits: String; override;
@@ -309,11 +297,7 @@ type
procedure SetColor2(const Value: TColor);
protected
function AdjustVerticalAlign( Value: TVerticalAlign ): TVerticalAlign; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupTextAlign( SL: TStrings; const AName: String ); override;
procedure P_SetupTextAlign( SL: TStrings; const AName: String ); override;
@@ -363,11 +347,7 @@ type
protected
function Get_VA: TVerticalAlign;
procedure Set_VA(const Value: TVerticalAlign); virtual;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -380,11 +360,7 @@ type
procedure Paint; override;
function WYSIWIGPaintImplemented: Boolean; override;
function NoDrawFrame: Boolean; override;
{$IFDEF _D2009orHigher}
procedure SetCaption(const Value: WideString); override;
{$ELSE}
procedure SetCaption(const Value: String); override;
{$ENDIF}
procedure SetCaption(const Value: TDelphiString); override;
public
constructor Create( AOwner: TComponent ); override;
destructor Destroy; override;
@@ -413,11 +389,7 @@ type
FTimer: TTimer;
procedure Tick( Sender: TObject );
protected
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
public
constructor Create( AOwner: TComponent ); override;
@@ -445,11 +417,7 @@ type
protected
function TabStopByDefault: Boolean; override;
function TypeName: String; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -493,11 +461,7 @@ type
procedure SetEdgeStyle(const Value: TEdgeStyle);
protected
function IsCursorDefault: Boolean; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -532,11 +496,7 @@ type
protected
function TabStopByDefault: Boolean; override;
procedure FirstCreate; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -577,11 +537,7 @@ type
protected
function TabStopByDefault: Boolean; override;
procedure FirstCreate; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -629,11 +585,7 @@ type
protected
function TabStopByDefault: Boolean; override;
procedure FirstCreate; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
function P_GenerateTransparentInits: String; override;
procedure SetupLast( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -687,24 +639,14 @@ type
FOptions: TKOLEditOptions;
FEdTransparent: Boolean;
procedure SetOptions(const Value: TKOLEditOptions);
{$IFDEF _D2009orHigher}
function GetCaption: WideString;
function GetText: WideString;
procedure SetText(const Value: WideString);
{$ELSE}
function GetCaption: String;
function GetText: String;
procedure SetText(const Value: String);
{$ENDIF}
function GetCaption: TDelphiString;
function GetText: TDelphiString;
procedure SetText(const Value: TDelphiString);
procedure SetEdTransparent(const Value: Boolean);
protected
function TabStopByDefault: Boolean; override;
procedure FirstCreate; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -723,21 +665,13 @@ type
function Pcode_Generate: Boolean; override;
published
property Transparent: Boolean read FEdTransparent write SetEdTransparent;
{$IFDEF _D2009orHigher}
property Text: WideString read GetText write SetText;
{$ELSE}
property Text: String read GetText write SetText;
{$ENDIF}
property Text: TDelphiString read GetText write SetText;
property Options: TKOLEditOptions read FOptions write SetOptions;
property TabStop;
property TabOrder;
property OnChange;
property OnSelChange;
{$IFDEF _D2009orHigher}
property Caption: WideString read GetCaption; // redefined as read only to remove from Object Inspector
{$ELSE}
property Caption: String read GetCaption; // redefined as read only to remove from Object Inspector
{$ENDIF}
property Caption: TDelphiString read GetCaption; // redefined as read only to remove from Object Inspector
property OnKeyDown;
property OnKeyUp;
property OnChar;
@@ -784,11 +718,7 @@ type
protected
function TabStopByDefault: Boolean; override;
procedure FirstCreate; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -887,11 +817,7 @@ type
protected
function TabStopByDefault: Boolean; override;
procedure FirstCreate; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -991,11 +917,7 @@ type
protected
function TabStopByDefault: Boolean; override;
procedure FirstCreate; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -1067,11 +989,7 @@ type
protected
function TabStopByDefault: Boolean; override;
procedure FirstCreate; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -1125,11 +1043,7 @@ type
private
fNotAvailable: Boolean;
protected
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
function BestEventName: String; override;
public
@@ -1164,11 +1078,7 @@ type
procedure SetImageListNormal(const Value: TKOLImageList);
procedure SetImgShwAutoSize(const Value: Boolean);
protected
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -1219,11 +1129,7 @@ type
protected
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
function TypeName: String; override;
procedure CreateKOLControl(Recreating: boolean); override;
@@ -1356,11 +1262,7 @@ type
FCols: TList;
FColCount: Integer;
function TabStopByDefault: Boolean; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -1480,11 +1382,7 @@ type
procedure SetTVIndent(const Value: Integer);
protected
function TabStopByDefault: Boolean; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -1694,11 +1592,7 @@ type
ValuesInStack: Integer;
procedure SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupFirst( SL: TStringList; const AName, AParent, Prefix: String ); override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupLast( SL: TStringList; const AName, AParent, Prefix: String ); override;
procedure P_SetupLast( SL: TStringList; const AName, AParent, Prefix: String ); override;
@@ -1826,11 +1720,7 @@ type
procedure SetOptions(const Value: TDateTimePickerOptions);
procedure SetFormat(const Value: String);
protected
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
function GenerateTransparentInits: String; override;
function P_GenerateTransparentInits: String; override;
@@ -1885,11 +1775,7 @@ type
fDestroyingTabControl: Boolean;
FAdjustingPages: Boolean;
function TabStopByDefault: Boolean; override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure SetupFirst(SL: TStringList; const AName, AParent, Prefix: String); override;
procedure P_SetupFirst(SL: TStringList; const AName, AParent, Prefix: String); override;
@@ -1964,11 +1850,7 @@ type
procedure SetControlContainer(const Value: Boolean);
procedure SetEdgeStyle(const Value: TEdgeStyle);
protected
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
function IsControlContainer: Boolean; virtual;
function TypeName: String; override;
@@ -2015,11 +1897,7 @@ type
protected
procedure SetupFirst(SL: TStringList; const AName, AParent, Prefix: String); override;
procedure P_SetupFirst(SL: TStringList; const AName, AParent, Prefix: String); override;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; override;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; override;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString): TDelphiString; override;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; override;
procedure AssignEvents( SL: TStringList; const AName: String ); override;
function P_AssignEvents( SL: TStringList; const AName: String;
@@ -2716,12 +2594,7 @@ begin
Font.GenerateCode( SL, AName, BFont );
end;
function TKOLButton.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLButton.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var
{$IFDEF _D2009orHigher}
C, C2: WideString;
@@ -2997,12 +2870,7 @@ begin
SL.Add( Prefix + AName + '.Style := ' + AName + '.Style and not SS_NOPREFIX;' );
end;
function TKOLLabel.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLLabel.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var
{$IFDEF _D2009orHigher}
C, C2: WideString;
@@ -3324,12 +3192,7 @@ begin
end;
end;
procedure TKOLPanel.
{$IFDEF _D2009orHigher}
SetCaption(const Value: WideString);
{$ELSE}
SetCaption(const Value: String);
{$ENDIF}
procedure TKOLPanel.SetCaption(const Value: TDelphiString);
begin
inherited;
if (Parent <> nil) and (Parent is TKOLTabControl) then
@@ -3406,13 +3269,7 @@ begin
SL.Add( Prefix + AName + '.Style := ' + AName + '.Style and not SS_NOPREFIX;' );
end;
function TKOLPanel.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLPanel.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
const EdgeStyles: array[ TEdgeStyle ] of String =
( 'esRaised', 'esLowered', 'esNone', 'esTransparent', 'esSolid' );
begin
@@ -4116,13 +3973,7 @@ begin
end;
function TKOLBitBtn.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLBitBtn.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
const Layouts: array[ TGlyphLayout ] of String = ( 'glyphLeft', 'glyphTop',
'glyphRight', 'glyphBottom', 'glyphOver' );
var
@@ -4563,13 +4414,7 @@ begin
SL.Add( Prefix + AName + '.HasBorder := TRUE;' );
end;
function TKOLGradientPanel.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLGradientPanel.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
begin
asm
jmp @@e_signature
@@ -4740,12 +4585,7 @@ begin
SL.Add( Prefix + AName + '.TextAlign := ' + TextAligns[ TextAlign ] + ';' );}
end;
function TKOLGroupBox.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLGroupBox.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var
{$IFDEF _D2009orHigher}
C, C2: WideString;
@@ -4936,12 +4776,7 @@ begin
SL.Add( Prefix + AName + '.WordWrap := TRUE;' );}
end;
function TKOLCheckBox.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLCheckBox.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var
{$IFDEF _D2009orHigher}
C, C2: WideString;
@@ -5130,12 +4965,7 @@ begin
end;
end;
function TKOLRadioBox.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLRadioBox.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var
{$IFDEF _D2009orHigher}
C, C2: WideString;
@@ -5228,12 +5058,7 @@ begin
inherited;
end;
function TKOLEditBox.
{$IFDEF _D2009orHigher}
GetCaption: WideString;
{$ELSE}
GetCaption: String;
{$ENDIF}
function TKOLEditBox.GetCaption: TDelphiString;
begin
asm
jmp @@e_signature
@@ -5244,12 +5069,7 @@ begin
Result := inherited Caption;
end;
function TKOLEditBox.
{$IFDEF _D2009orHigher}
GetText: WideString;
{$ELSE}
GetText: String;
{$ENDIF}
function TKOLEditBox.GetText: TDelphiString;
begin
asm
jmp @@e_signature
@@ -5415,12 +5235,7 @@ begin
Change;
end;
procedure TKOLEditBox.
{$IFDEF _D2009orHigher}
SetText(const Value: WideString);
{$ELSE}
SetText(const Value: String);
{$ENDIF}
procedure TKOLEditBox.SetText(const Value: TDelphiString);
begin
asm
jmp @@e_signature
@@ -5456,13 +5271,7 @@ begin
SL.Add( Prefix + AName + '.Ed_Transparent := TRUE;' );
end;
function TKOLEditBox.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLEditBox.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var S: String;
begin
asm
@@ -5805,13 +5614,7 @@ begin
SL.Add( Prefix + AName + '.Ed_Transparent := TRUE;' );
end;
function TKOLMemo.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLMemo.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var S: String;
begin
asm
@@ -6196,13 +5999,7 @@ begin
SL.Add( Prefix + AName + '.Count := ' + IntToStr( Count ) + ';' );
end;
function TKOLListBox.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLListBox.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var S: String;
begin
asm
@@ -6528,13 +6325,7 @@ begin
SL.Add( Prefix + AName + '.DroppedWidth := ' + IntToStr( FDroppedWidth ) + ';' );
end;
function TKOLComboBox.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLComboBox.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var S: String;
begin
asm
@@ -6763,13 +6554,7 @@ begin
inherited;
end;
function TKOLSplitter.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLSplitter.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
const Styles: array[ TEdgeStyle ] of String =
( 'esRaised', 'esLowered', 'esNone', 'esTransparent', 'esSolid' );
begin
@@ -6836,13 +6621,7 @@ begin
Result := ' DUP';
end;
function TKOLPaintBox.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLPaintBox.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
begin
asm
jmp @@e_signature
@@ -7272,13 +7051,7 @@ begin
SL.Add( Prefix + AName + '.LVCount := ' + IntToStr( LVCount ) + ';' );
end;
function TKOLListView.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLListView.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var S, O, ILSm, ILNr, ILSt: String;
begin
asm
@@ -7971,13 +7744,7 @@ begin
SL.Add( Prefix + AName + '.TVIndent := ' + IntToStr( TVIndent ) + ';' );
end;
function TKOLTreeView.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLTreeView.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var O, ILNr, ILSt: String;
begin
asm
@@ -8587,13 +8354,7 @@ begin
', ' + IntToStr( FRE_ZoomDenominator ) + ' );' );
end;
function TKOLRichEdit.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLRichEdit.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var S: String;
begin
asm
@@ -8894,13 +8655,7 @@ begin
SL.Add( Prefix + AName + '.ProgressBkColor := ' + Color2Str( ProgressBkColor ) + ';' );}
end;
function TKOLProgressBar.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLProgressBar.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var S: String;
begin
asm
@@ -9821,13 +9576,7 @@ begin
end;
end;
function TKOLTabControl.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLTabControl.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var O, IL: String;
I: Integer;
{$IFDEF _D2009orHigher}
@@ -10998,13 +10747,7 @@ begin
end;
end;
function TKOLToolbar.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLToolbar.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var
{$IFDEF _D2009orHigher}
C, C2: WideString;
@@ -13051,13 +12794,7 @@ begin
SL.Add( Prefix + AName + '.CurIndex := ' + IntToStr( CurIndex ) + ';' );
end;
function TKOLImageShow.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLImageShow.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
begin
asm
jmp @@e_signature
@@ -13276,12 +13013,7 @@ begin
SL.Add( Prefix + AName + '.Ctl3D := TRUE;' );
end;
function TKOLLabelEffect.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLLabelEffect.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var
{$IFDEF _D2009orHigher}
C, C2: WideString;
@@ -13448,13 +13180,7 @@ begin
Change;
end;
function TKOLScrollBox.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLScrollBox.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
const EdgeStyles: array[ TEdgeStyle ] of String =
( 'esRaised', 'esLowered', 'esNone', 'esTransparent', 'esSolid' );
var S: String;
@@ -13638,13 +13364,7 @@ begin
nparams := 2;
end;
function TKOLMDIClient.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLMDIClient.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
function FindWindowMenu( MI: TKOLMenuItem ): Integer;
var I: Integer;
@@ -14967,13 +14687,7 @@ begin
Color2Str( Color ) + ';' );
end;
function TKOLDateTimePicker.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLDateTimePicker.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
var S: String;
begin
S := '';
@@ -15181,13 +14895,7 @@ begin
SL.Add( Prefix + AName + '.SBPageSize := ' + IntToStr( SBPageSize ) + ';' );
end;
function TKOLScrollBar.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLScrollBar.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
const ScrollerBarNames: array[ TScrollerBar ] of String = (
'sbHorizontal', 'sbVertical' );
begin

View File

@@ -162,6 +162,11 @@ const
type
{$IFDEF _D2009orHigher}
TDelphiString = WideString;
{$ELSE}
TDelphiString = String;
{$ENDIF}
//////////////////////////////////////////////////////////
{$IFDEF _D6orHigher} //
@@ -706,11 +711,7 @@ type
FOnShow: TOnEvent;
FOnHide: TOnEvent;
FzOrderChildren: Boolean;
{$IFDEF _D2009orHigher}
FSimpleStatusText: WideString;
{$ELSE}
FSimpleStatusText: String;
{$ENDIF}
FSimpleStatusText: TDelphiString;
FStatusText: TStringList;
fOnMouseDblClk: TOnMouse;
FMarginLeft: Integer;
@@ -798,11 +799,7 @@ type
procedure SetOnShow(const Value: TOnEvent);
procedure SetOnHide(const Value: TOnEvent);
procedure SetzOrderChildren(const Value: Boolean);
{$IFDEF _D2009orHigher}
procedure SetSimpleStatusText(const Value: WideString);
{$ELSE}
procedure SetSimpleStatusText(const Value: String);
{$ENDIF}
procedure SetSimpleStatusText(const Value: TDelphiString);
function GetStatusText: TStrings;
procedure SetStatusText(const Value: TStrings);
procedure SetOnMouseDblClk(const Value: TOnMouse);
@@ -841,13 +838,9 @@ type
function AdditionalUnits: String; virtual;
function FormTypeName: String; virtual;
function AppletOnForm: Boolean;
{$IFDEF _D2009orHigher}
function GetCaption: WideString; virtual;
procedure SetFormCaption(const Value: WideString); virtual;
{$ELSE}
function GetCaption: String; virtual;
procedure SetFormCaption(const Value: String); virtual;
{$ENDIF}
function GetCaption: TDelphiString; virtual;
procedure SetFormCaption(const Value: TDelphiString); virtual;
function GetFormName: String;
procedure SetFormName(const Value: String);
function GenerateTransparentInits: String; virtual;
@@ -994,12 +987,7 @@ type
// ����� ��������� ������ ����, � ���� ����� �������� ����� ������
// Applet ��� ��� ����������).
property formMain: Boolean read GetFormMain write SetFormMain;
{$IFDEF _D2009orHigher}
property Caption: WideString read GetCaption write SetFormCaption;
{$ELSE}
property Caption: String read GetCaption write SetFormCaption;
{$ENDIF}
property Caption: TDelphiString read GetCaption write SetFormCaption;
property Visible;
property Enabled;
@@ -1058,11 +1046,7 @@ type
property RestoreNormalMaximized: Boolean read FRestoreNormalMaximized write SetRestoreNormalMaximized;
property zOrderChildren: Boolean read FzOrderChildren write SetzOrderChildren;
{$IFDEF _D2009orHigher}
property SimpleStatusText: WideString read FSimpleStatusText write SetSimpleStatusText;
{$ELSE}
property SimpleStatusText: String read FSimpleStatusText write SetSimpleStatusText;
{$ENDIF}
property SimpleStatusText: TDelphiString read FSimpleStatusText write SetSimpleStatusText;
property StatusText: TStrings read GetStatusText write SetStatusText;
property statusSizeGrip: Boolean read FStatusSizeGrip write SetStatusSizeGrip;
@@ -1372,11 +1356,7 @@ type
{$ENDIF}
TKOLMenuItem = class(TComponent)
private
{$IFDEF _D2009orHigher}
FCaption: WideString;
{$ELSE}
FCaption: String;
{$ENDIF}
FCaption: TDelphiString;
FBitmap: TBitmap;
FSubitems: TList;
FChecked: Boolean;
@@ -1399,11 +1379,7 @@ type
FTag: Integer;
Faction: TKOLAction;
procedure SetBitmap(Value: TBitmap);
{$IFDEF _D2009orHigher}
procedure SetCaption(const Value: WideString);
{$ELSE}
procedure SetCaption(const Value: String);
{$ENDIF}
procedure SetCaption(const Value: TDelphiString);
function GetCount: Integer;
function GetSubItems(Idx: Integer): TKOLMenuItem;
procedure SetChecked(const Value: Boolean);
@@ -1494,11 +1470,7 @@ type
function CheckOnMenuMethodExists: Boolean;
published
property Tag: Integer read FTag write SetTag;
{$IFDEF _D2009orHigher}
property caption: WideString read FCaption write SetCaption;
{$ELSE}
property caption: String read FCaption write SetCaption;
{$ENDIF}
property Caption: TDelphiString read FCaption write SetCaption;
property bitmap: TBitmap read FBitmap write SetBitmap;
property bitmapChecked: TBitmap read FbitmapChecked write SetbitmapChecked;
property bitmapItem: TBitmap read FbitmapItem write SetbitmapItem;
@@ -1802,11 +1774,7 @@ type
fClsStyle: DWORD;
fExStyle: DWORD;
fStyle: DWORD;
{$IFDEF _D2009orHigher}
fCaption: WideString;
{$ELSE}
fCaption: String;
{$ENDIF}
fCaption: TDelphiString;
FTextAlign: TTextAlign;
fMargin: Integer;
fOnClick: TOnEvent;
@@ -2081,11 +2049,7 @@ type
function TabStopByDefault: Boolean; virtual;
procedure SetMargin(const Value: Integer); virtual;
{$IFDEF _D2009orHigher}
procedure SetCaption(const Value: WideString); virtual;
{$ELSE}
procedure SetCaption(const Value: String); virtual;
{$ENDIF}
procedure SetCaption(const Value: TDelphiString); virtual;
procedure SetTextAlign(const Value: TTextAlign); virtual;
// This function returns margins between control edges and edges of client
@@ -2217,11 +2181,7 @@ type
// �������, ������� ��������� ���������� ��������� ��� ���������
// ��������������� ������� (�.�. ��, ��� ����� � ������� �������
// � ���������: Result.Button1 := NewButton( ... )...;
{$IFDEF _D2009orHigher}
function SetupParams( const AName, AParent: WideString ): WideString; virtual;
{$ELSE}
function SetupParams( const AName, AParent: String ): String; virtual;
{$ENDIF}
function SetupParams( const AName, AParent: TDelphiString ): TDelphiString; virtual;
function P_SetupParams( const AName, AParent: String; var nparams: Integer ): String; virtual;
// Method to assign values to assigned events. Is called in SetupFirst
@@ -2315,12 +2275,7 @@ type
procedure Loaded; override;
procedure Notification(AComponent: TComponent; Operation: TOperation); override;
{$IFDEF _D2009orHigher}
function StringConstant( const Propname, Value: WideString ): WideString;
{$ELSE}
function StringConstant( const Propname, Value: String ): String;
{$ENDIF}
function StringConstant( const Propname, Value: TDelphiString ): TDelphiString;
function P_StringConstant( const Propname, Value: String ): String;
function BestEventName: String; virtual;
function GetDefaultControlFont: HFONT; virtual;
@@ -2437,11 +2392,7 @@ type
property CenterOnParent: Boolean read fCenterOnParent write SetCenterOnParent;
{$IFDEF _D2009orHigher}
property Caption: WideString read fCaption write SetCaption;
{$ELSE}
property Caption: String read fCaption write SetCaption;
{$ENDIF}
property Caption: TDelphiString read fCaption write SetCaption;
property Ctl3D: Boolean read FCtl3D write SetCtl3D;
property Color: TColor read Get_Color write Set_Color;
@@ -2762,11 +2713,7 @@ type
procedure SetParentFont(const Value: Boolean);
protected
function AutoCaption: Boolean; override;
{$IFDEF _D2009orHigher}
function GetCaption: WideString; override;
{$ELSE}
function GetCaption: String; override;
{$ENDIF}
function GetCaption: TDelphiString; override;
function GenerateTransparentInits: String; override;
function P_GenerateTransparentInits: String; override;
procedure GenerateCreateForm( SL: TStringList ); override;
@@ -2970,13 +2917,8 @@ function Get_ProjectName: String;
function Get_ProjectGroup: IOTAProjectGroup;
{$ENDIF}
{$IFDEF _D2009orHigher}
procedure AddLongTextField( var SL: TStringList; const Prefix:String;
const Text:WideString; const Suffix:String; const LinePrefix: String );
{$ELSE}
procedure AddLongTextField( var SL: TStringList; const Prefix:String;
const Text:String; const Suffix:String; const LinePrefix: String );
{$ENDIF}
const Text:TDelphiString; const Suffix:String; const LinePrefix: String );
//*///////////////////////////////////////
{$IFDEF _D6orHigher} //
@@ -3926,13 +3868,8 @@ begin
END;
end;
{$IFDEF _D2009orHigher}
procedure AddLongTextField( var SL: TStringList; const Prefix:String;
const Text:WideString; const Suffix:String; const LinePrefix: String );
{$ELSE}
procedure AddLongTextField( var SL: TStringList; const Prefix:String;
const Text:String; const Suffix:String; const LinePrefix: String );
{$ENDIF}
const Text:TDelphiString; const Suffix:String; const LinePrefix: String );
var
{$IFDEF _D2009orHigher}
C, C2: WideString;
@@ -6074,12 +6011,7 @@ begin
end;
end;
procedure TKOLCustomControl.
{$IFDEF _D2009orHigher}
SetCaption(const Value: WideString);
{$ELSE}
SetCaption(const Value: String);
{$ENDIF}
procedure TKOLCustomControl.SetCaption(const Value: TDelphiString);
begin
asm
jmp @@e_signature
@@ -7925,13 +7857,7 @@ begin
Change;
end;
function TKOLCustomControl.
{$IFDEF _D2009orHigher}
SetupParams( const AName, AParent: WideString ): WideString;
{$ELSE}
SetupParams( const AName, AParent: String ): String;
{$ENDIF}
function TKOLCustomControl.SetupParams( const AName, AParent: TDelphiString ): TDelphiString;
begin
asm
jmp @@e_signature
@@ -8565,12 +8491,7 @@ begin
Change;
end;
function TKOLCustomControl.
{$IFDEF _D2009orHigher}
StringConstant( const Propname, Value: WideString ): WideString;
{$ELSE}
StringConstant( const Propname, Value: String ): String;
{$ENDIF}
function TKOLCustomControl.StringConstant( const Propname, Value: TDelphiString ): TDelphiString;
begin
Log( '->TKOLCustomControl.StringConstant' );
try
@@ -12776,8 +12697,7 @@ begin
end;
end;
{$IFDEF _D2009orHigher}
function TKOLForm.GetCaption: WideString;
function TKOLForm.GetCaption: TDelphiString;
begin
asm
jmp @@e_signature
@@ -12795,26 +12715,6 @@ begin
Log( '<-TKOLForm.GetCaption' );
end;
end;
{$ELSE}
function TKOLForm.GetCaption: String;
begin
asm
jmp @@e_signature
DB '#$signature$#', 0
DB 'TKOLForm.GetCaption', 0
@@e_signature:
end;
Log( '->TKOLForm.GetCaption' );
try
Result := FCaption;
if (Owner <> nil) and (Owner is TForm) then
Result := (Owner as TForm).Caption;
LogOK;
finally
Log( '<-TKOLForm.GetCaption' );
end;
end;
{$ENDIF}
function TKOLForm.GetFormMain: Boolean;
begin
@@ -13187,8 +13087,7 @@ begin
end;
{$IFDEF _D2009orHigher}
procedure TKOLForm.SetFormCaption(const Value: WideString);
procedure TKOLForm.SetFormCaption(const Value: TDelphiString);
begin
asm
jmp @@e_signature
@@ -13210,30 +13109,6 @@ begin
Log( '<-TKOLForm.SetFormCaption' );
end;
end;
{$ELSE}
procedure TKOLForm.SetFormCaption(const Value: String);
begin
asm
jmp @@e_signature
DB '#$signature$#', 0
DB 'TKOLForm.SetFormCaption', 0
@@e_signature:
end;
Log( '->TKOLForm.SetFormCaption' );
try
if not FLocked then
begin
inherited Caption := Value;
if (Owner <> nil) and (Owner is TForm) then
(Owner as TForm).Caption := Value;
end;
LogOK;
finally
Log( '<-TKOLForm.SetFormCaption' );
end;
end;
{$ENDIF}
procedure TKOLForm.SetFormMain(const Value: Boolean);
var I: Integer;
@@ -14566,8 +14441,7 @@ begin
end;
end;
{$IFDEF _D2009orHigher}
procedure TKOLForm.SetSimpleStatusText(const Value: WideString);
procedure TKOLForm.SetSimpleStatusText(const Value: TDelphiString);
begin
asm
jmp @@e_signature
@@ -14585,26 +14459,6 @@ begin
Log( '<-TKOLForm.SetSimpleStatusText' );
end;
end;
{$ELSE}
procedure TKOLForm.SetSimpleStatusText(const Value: String);
begin
asm
jmp @@e_signature
DB '#$signature$#', 0
DB 'TKOLForm.SetSimpleStatusText', 0
@@e_signature:
end;
Log( '->TKOLForm.SetSimpleStatusText' );
try
FSimpleStatusText := Value;
FStatusText.Text := Value;
Change( Self );
LogOK;
finally
Log( '<-TKOLForm.SetSimpleStatusText' );
end;
end;
{$ENDIF}
function TKOLForm.GetStatusText: TStrings;
begin
@@ -21279,12 +21133,7 @@ begin
end;
function TKOLFrame.
{$IFDEF _D2009orHigher}
GetCaption: WideString;
{$ELSE}
GetCaption: String;
{$ENDIF}
function TKOLFrame.GetCaption: TDelphiString;
begin
asm
jmp @@e_signature

View File

@@ -3,7 +3,7 @@ KEY OBJECTS LIBRARY for Delphi (and Free Pascal Compiler) - to make applications
Copyright (C) by Vladimir Kladov, 1999-2010.
Some parts of code are Copyright (C) intellectual property by other people, see comments in code and on KOL site. Thanks to all for help with KOL and MCK!
v. 2.89 (30-Mar-2010)
v. 2.90 (27-Mar-2010)
To get newer version, go to Web-page http://www.kolmck.net and get there updates.

View File

@@ -1,7 +1,7 @@
KEY OBJECTS LIBRARY ��� Delphi (� Free Pascal Compiler) - ������������ ��� ����, ����� ������� ���������, ������������� � �������������� ����� �������, ���������� � ����� ����������.
Copyright (C) by Vladimir Kladov, 1999-2007. ���������, � ��������� ��������.
������ 2.89 (30 ����� 2010 �.)
������ 2.90 (27 ����� 2010 �.)
_________________
������� ��������:

View File

@@ -2,7 +2,7 @@
// Rev.: 1.97
// Date: 09 aug 2009
// Author: MTsv DN
// Thanks: mdw, Vladimir Kladov, D[u]fa
// Thanks: mdw, Vladimir Kladov
{$IFDEF _FPC}
const

View File

@@ -135,8 +135,8 @@ MTsv DN
���������
=========
- �����: KOL_ansi.inc (� ���������� KOL_unicode.inc ����� ������� � ����������� ANSI API). �����: azsd (������� ������������� � �������� <= D3 D[u]fa)
MCKAppExpert200x.pas (������ ��� �������� �������� ������� KOLMCK � Delphi 7, 2005-2009 (� 5 ������ ����� �������� ����� �� ������������ ���������)). �����: D[u]fa
- �����: KOL_ansi.inc (� ���������� KOL_unicode.inc ����� ������� � ����������� ANSI API). �����: azsd (������� ������������� � ������� D3 D[u]fa, � ������� D2 - ������)
MCKAppExpert200x.pas (������ ��� �������� �������� ������� KOLMCK � Delphi 7, 2005-2009 (� 5 ������ ����� �������� ����� �������������� ���������)). �����: D[u]fa
MirrorKOLPackageD1x.dpk. ����� �������� ��� Delphi 2005-2009.
MirrorKOLPackageD1x.res. ����� �������� ��� Delphi 2005-2009.
MirrorKOLPackageD1x.dproj. ����� �������� ��� Delphi 2007-2009.
@@ -167,4 +167,3 @@ MTsv DN
mckToolbarEditorD3.pas (����� �� �������������),
mckToolbarEditorD4.pas (����� �� �������������)
P.S. ��������, azsd - ��� ��� ��������� ����. ��� ����������� �� ������ ������������� !!!KOL!!! � Delphi 2009 � ����. ICQ � Email ���� �� ������.