fix 32dib TBitmap
fix TIcon wipe classes ... git-svn-id: https://svn.code.sf.net/p/kolmck/code@51 91bb2d04-0c0c-4d2d-88a5-bbb6f4c1fa07
This commit is contained in:
28
KOLDEF.inc
28
KOLDEF.inc
@@ -198,17 +198,6 @@ 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
|
||||
@@ -218,20 +207,23 @@ That is all to have full compatibility.
|
||||
// directive there. (Search the word: USE_CUSTOMEXTENSIONS).
|
||||
// Please note, that this option is not fully supported now.
|
||||
|
||||
//{$IFNDEF NOT_UNLOAD_RICHEDITLIB}
|
||||
// {$DEFINE UNLOAD_RICHEDITLIB}
|
||||
//{$ENDIF}
|
||||
{$IFNDEF NOT_UNLOAD_RICHEDITLIB}
|
||||
{$DEFINE UNLOAD_RICHEDITLIB}
|
||||
{$ENDIF}
|
||||
// You can freely comment this directive. 1st, if the application does not
|
||||
// use richedit control. 2nd, even if it does, freeing the library handle
|
||||
// actually is not needed.
|
||||
// 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}
|
||||
//{$IFNDEF INPACKAGE}
|
||||
// {$DEFINE NOT_USE_RICHEDIT}
|
||||
//{$ENDIF}
|
||||
|
||||
//{$DEFINE TEST_VERSION}
|
||||
{$IFNDEF _D6orHigher}
|
||||
{$DEFINE PARANOIA} //seems not needed under D6 !!! Inprise fixed this, finally...
|
||||
{$ENDIF}
|
||||
{$ENDIF}
|
||||
|
||||
// use _SetDIBPixelsTrueColorWithAlpha for 32bit
|
||||
{$DEFINE FIXDIB32}
|
@@ -16977,7 +16977,11 @@ asm
|
||||
@@if32bit:
|
||||
LOOP @@iffin
|
||||
INC EDX
|
||||
{$IFDEF FIXDIB32}
|
||||
MOV EAX, offset[_GetDIBPixelsTrueColorWithAlpha]
|
||||
{$ELSE}
|
||||
MOV EAX, offset[_GetDIBPixelsTrueColor]
|
||||
{$ENDIF}
|
||||
@@iffin:
|
||||
MOV byte ptr [EBX].fPixelMask, DH
|
||||
MOV byte ptr [EBX].fPixelsPerByteMask, DL
|
||||
@@ -17181,7 +17185,11 @@ asm
|
||||
@@if32bit:
|
||||
LOOP @@ifend
|
||||
INC EDX
|
||||
{$IFDEF FIXDIB32}
|
||||
MOV EAX, offset[_SetDIBPixelsTrueColorWithAlpha]
|
||||
{$ELSE}
|
||||
MOV EAX, offset[_SetDIBPixelsTrueColor]
|
||||
{$ENDIF}
|
||||
@@ifend:
|
||||
MOV byte ptr [EBX].fPixelMask, DH
|
||||
MOV byte ptr [EBX].fPixelsPerByteMask, DL
|
||||
|
25
KOLadd.pas
25
KOLadd.pas
@@ -701,10 +701,6 @@ type
|
||||
function GetTotal: Integer;
|
||||
function GetIndexAmongSiblings: Integer;
|
||||
protected
|
||||
{$IFDEF USE_CONSTRUCTORS}
|
||||
constructor CreateTree( AParent: PTree; const AName: AnsiString );
|
||||
{* }
|
||||
{$ENDIF}
|
||||
{++}(*public*){--}
|
||||
destructor Destroy; {-}virtual;{+}{++}(*override;*){--}
|
||||
{* }
|
||||
@@ -2978,14 +2974,6 @@ 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;
|
||||
@@ -3023,7 +3011,6 @@ end;
|
||||
{$ENDIF}
|
||||
{$ENDIF}
|
||||
//[END NewTree]
|
||||
{$ENDIF USE_CONSTRUCTORS}
|
||||
|
||||
{ TTree }
|
||||
|
||||
@@ -3056,18 +3043,6 @@ 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
|
||||
|
Reference in New Issue
Block a user