Commit 4ef4d64a authored by Martin Schreiber's avatar Martin Schreiber

* Delphi compatibility.

parent f12eaa07
......@@ -1004,7 +1004,8 @@ var
with aformat,info,canvas do begin
if newinfos * fontstylemask <> [] then begin
afontstyle:= afontstyle * fontstylesty(
not {$ifdef FPC}longword{$else}byte{$endif}(newinfos)) + style.fontstyle;
not {$ifdef FPC}longword({$else}byte(word{$endif}(newinfos))) +
style.fontstyle;
font.style:= afontstyle + overridefontstyle;
end;
if (ni_selected in newinfos) and not (tf_noselect in flags)then begin
......
......@@ -4377,7 +4377,7 @@ end;
procedure tcanvas.drawframe(const arect: rectty; awidth: framety;
const acolor: colorty = cl_default;
const hiddenedges: edgesty = []); overload;
const hiddenedges: edgesty = []);
var
rect1,rect2: rectty;
begin
......
......@@ -735,12 +735,16 @@ begin
getsystemtimeasfiletime(ft1);
lint1:= (int64(ft1.dwhighdatetime) shl 32) + ft1.dwlowdatetime;
lwo1:= lint1 div 10000000; //seconds
if lwo1 <> lastlocaltime then begin
if lwo1 <> longword(lastlocaltime) then begin
lastlocaltime:= lwo1;
gmtoff:= sys_localtimeoffset;
end;
{$ifdef FPC}
result:= real(lint1)/(24.0*60.0*60.0*1000000.0*10.0) + filetimeoffset + gmtoff;
end;
{$else}
result:= lint1/(24.0*60.0*60.0*1000000.0*10.0) + filetimeoffset + gmtoff;
{$endif}
end;
{
function sys_getlocaltime: tdatetime;
var
......
......@@ -101,6 +101,7 @@ begin
end
else begin
usemmtimer:= false;
result:= false;
end;
end;
......
......@@ -106,6 +106,12 @@ function setsinglebit(const new,old: word;
const mask: array of word): word; overload;
function setsinglebit(const new,old: longword;
const mask: array of longword): longword; overload;
{$ifndef FPC}
function setsinglebitar16(const new,old: word;
const mask: array of word): word; overload;
function setsinglebitar32(const new,old: longword;
const mask: array of longword): longword; overload;
{$endif}
function checkbit(const value: byte; const bitnum: integer): boolean; overload;
function checkbit(const value: word; const bitnum: integer): boolean; overload;
......@@ -468,7 +474,29 @@ begin
result:= setsinglebit(result,old,mask[int1]);
end;
end;
{$ifndef FPC}
function setsinglebitar16(const new,old: word;
const mask: array of word): word;
var
int1: integer;
begin
result:= new;
for int1:= 0 to high(mask) do begin
result:= setsinglebit(result,old,mask[int1]);
end;
end;
function setsinglebitar32(const new,old: longword;
const mask: array of longword): longword;
var
int1: integer;
begin
result:= new;
for int1:= 0 to high(mask) do begin
result:= setsinglebit(result,old,mask[int1]);
end;
end;
{$endif}
function setsinglebit(const new,old: longword;
const mask: array of longword): longword;
var
......
......@@ -808,9 +808,10 @@ procedure checkcorbainterface(const sender: tcomponent;
function isinterface(const actual: ptypeinfo; const wanted: ptypeinfo): boolean;
function isinterfaceornil(const actual: ptypeinfo; const wanted: ptypeinfo): boolean;
function checkcanevent(const acomponent: tcomponent; const event: tmethod): boolean;
function checkcanevent(const event: tmethod): boolean;
{$ifdef FPC}inline;{$endif}
function checkcanevent(const acomponent: tcomponent;
const event: tmethod): boolean; overload;
function checkcanevent(const event: tmethod): boolean;
{$ifdef FPC}inline;{$endif} overload;
procedure readstringar(const reader: treader; out ar: stringarty);
procedure writestringar(const writer: twriter; const ar: stringarty);
......
......@@ -810,7 +810,7 @@ type
procedure insert(const index: integer; const item: msestring);
overload; override;
procedure insert(const index: integer; const item: msestring;
const itemint: integer); overload;
const itemint: integer); reintroduce; overload;
procedure fill(const acount: integer; const defaultvalue: msestring;
const defaultint: integer);
......
......@@ -290,17 +290,16 @@ function bcdtoint(inp: byte): integer;
function inttobcd(inp: integer): byte;
function stringtotime(const avalue: msestring;
const convert: dateconvertty = dc_none): tdatetime; overload;
const convert: dateconvertty = dc_none): tdatetime; overload;
function stringtotime(const avalue: msestring;
const aformat: msestring;
const convert: dateconvertty = dc_none): tdatetime; overload;
const convert: dateconvertty = dc_none): tdatetime; overload;
function trystringtotime(const text: msestring;
out value: tdatetime;
const convert: dateconvertty = dc_none): boolean; overload;
const convert: dateconvertty = dc_none): boolean; overload;
function trystringtotime(const text: msestring;
const aformat: msestring;
out value: tdatetime;
const convert: dateconvertty = dc_none): boolean; overload;
const aformat: msestring; out value: tdatetime;
const convert: dateconvertty = dc_none): boolean; overload;
function timetostring(const avalue: tdatetime;
const format: msestring = 't'): msestring;
......@@ -1474,7 +1473,7 @@ begin
ps:= pointer(abinary);
int1:= length(abinary);
tail:= int1 mod 3;
pe:= ps+int1-tail;
pchar(pe):= pchar(ps)+int1-tail;
pd:= pointer(result);
if maxlinelength > 0 then begin
pline:= pd + linestep;
......@@ -1482,7 +1481,7 @@ begin
else begin
pline:= pointer(not ptruint(0));
end;
while ps < pe do begin
while pchar(ps) < pchar(pe) do begin
if pd >= pline then begin
pd^:= c_return;
inc(pd);
......@@ -1618,9 +1617,9 @@ begin
end;
end;
end;
(*
function stringtotime(const text: msestring; out value: tdatetime;
const convert: dateconvertty = dc_none): boolean;
const convert: dateconvertty = dc_none): boolean;
var
mstr1: msestring;
timesep: msechar;
......@@ -1663,7 +1662,7 @@ begin
end;
end;
end;
*)
function timetostring(const avalue: tdatetime; const format: msestring = 't'): msestring;
begin
if avalue = emptydatetime then begin
......@@ -2418,13 +2417,13 @@ begin
end;
function stringtotime(const avalue: msestring;
const convert: dateconvertty = dc_none): tdatetime;
const convert: dateconvertty = dc_none): tdatetime;
begin
if not trystringtotime(avalue,result,convert) then begin
formaterror(avalue);
end;
end;
end;
function timemse(const value: tdatetime): tdatetime;
//bringt timeanteil im mseformat
begin
......@@ -3640,7 +3639,7 @@ begin
if value > max then begin
exit;
end;
value:= value * 10 + (ord(po1^) - ord('0'));
value:= value * longword(10) + longword(word(po1^) - word('0'));
inc(po1);
end;
end;
......
......@@ -82,7 +82,7 @@ type
);
optionswidgetty = set of optionwidgetty;
optionwidget1ty = (
ow1_fontglyphheight,
ow1_fontglyphheight,
//track font.glyphheight,
//create fonthighdelta and childscaled events
ow1_fontlineheight,
......@@ -1565,7 +1565,7 @@ type
function canclose1: boolean;
public
constructor create(aowner: tcomponent); overload; override;
constructor create(const aowner: tcomponent;
constructor create(const aowner: tcomponent;
const aparentwidget: twidget;
const aiswidget: boolean = true); overload;
constructor createandinit(const aowner: tcomponent;
......@@ -2104,7 +2104,7 @@ type
procedure unregistermovenotification(sender: iobjectlink);
property options: windowoptionsty read foptions;
function ispopup: boolean; inline;
function ispopup: boolean; {$ifdef FPC}inline;{$endif}
property owner: twidget read fowner;
property focusedwidget: twidget read ffocusedwidget;
property transientfor: twindow read ftransientfor;
......@@ -5726,8 +5726,8 @@ begin
reverse:= false;
end;
with trealarrayprop1(fi.fade_pos) do begin
first:= 0;
if count > 1 then begin
first:= 0;
last:= count - 1;
for int1:= 1 to last do begin
if fitems[int1] < a then begin
......@@ -11124,6 +11124,10 @@ begin
end;
procedure twidget.setoptionswidget(const avalue: optionswidgetty);
{$ifndef FPC}
const
mask: optionswidgetty = [ow_hinton,ow_hintoff];
{$endif}
var
value,delta: optionswidgetty;
opt1: optionswidget1ty;
......@@ -11136,11 +11140,14 @@ begin
end;
if [ow_fontglyphheight,ow_fontlineheight,ow_autoscale] * avalue <>
[] then begin
updatebit1(longword(opt1),ord(ow1_fontglyphheight),
updatebit1({$ifdef FPC}longword{$else}word{$endif}(opt1),
ord(ow1_fontglyphheight),
ow_fontglyphheight in avalue);
updatebit1(longword(opt1),ord(ow1_fontlineheight),
updatebit1({$ifdef FPC}longword{$else}word{$endif}(opt1),
ord(ow1_fontlineheight),
ow_fontlineheight in avalue);
updatebit1(longword(opt1),ord(ow1_autoscale),ow_autoscale in avalue);
updatebit1({$ifdef FPC}longword{$else}word{$endif}(opt1),
ord(ow1_autoscale),ow_autoscale in avalue);
end;
if ow_autosize in avalue then begin
opt1:= opt1 + [ow1_autowidth,ow1_autoheight];
......@@ -11158,10 +11165,13 @@ begin
end;
value:= optionswidgetty(setsinglebit(longword(avalue),
longword(foptionswidget),
[{longword([ow_fontglyphheight,ow_fontlineheight]),}
longword([ow_hinton,ow_hintoff])]));
longword(foptionswidget),
{$ifdef FPC}
longword([ow_hinton,ow_hintoff])));
{$else}
longword(mask)));
{$endif}
delta:= optionswidgetty(longword(value) xor longword(foptionswidget));
foptionswidget:= value - deprecatedoptionswidget;
if (delta * [ow_background,ow_top] <> []) then begin
......@@ -11183,20 +11193,24 @@ begin
end;
procedure twidget.setoptionswidget1(const avalue: optionswidget1ty);
{$ifndef FPC}
const
mask1: optionswidget1ty = [ow1_fontglyphheight,ow1_fontlineheight];
mask2: optionswidget1ty = [ow1_autosizeanright,ow1_noautosizeanright];
mask3: optionswidget1ty = [ow1_autosizeanbottom,ow1_noautosizeanbottom];
{$endif}
var
value,delta: optionswidget1ty;
begin
value:= optionswidget1ty(setsinglebit(
{$ifdef FPC}longword{$else}word{$endif}(avalue),
{$ifdef FPC}longword{$else}word{$endif}(foptionswidget1),
[{$ifdef FPC}longword{$else}word{$endif}(
[ow1_fontglyphheight,ow1_fontlineheight]),
{$ifdef FPC}longword{$else}word{$endif}(
[ow1_autosizeanright,ow1_noautosizeanright]),
{$ifdef FPC}longword{$else}word{$endif}(
[ow1_autosizeanbottom,ow1_noautosizeanbottom])]));
{$ifdef FPC}
value:= optionswidget1ty(setsinglebit(longword(avalue),longword(foptionswidget1),
[longword([ow1_fontglyphheight,ow1_fontlineheight]),
longword([ow1_autosizeanright,ow1_noautosizeanright]),
longword([ow1_autosizeanbottom,ow1_noautosizeanbottom])]));
{$else}
value:= optionswidget1ty(setsinglebitar16(word(avalue),word(foptionswidget1),
[word(mask1),word(mask2),word(mask3)]));
{$endif}
delta:= optionswidget1ty({$ifdef FPC}longword{$else}word{$endif}(value) xor
{$ifdef FPC}longword{$else}word{$endif}(foptionswidget1));
if delta <> [] then begin
......@@ -12091,9 +12105,11 @@ begin
end;
procedure twidget.setoptionsskin(const avalue: optionsskinty);
//const
// mask1: optionsskinty = [osk_skin,osk_noskin];
// mask2: optionsskinty = [osk_colorcaptionframe,osk_nocolorcaptionframe];
{$ifndef FPC}
const
mask1: optionsskinty = [osk_skin,osk_noskin];
mask2: optionsskinty = [osk_colorcaptionframe,osk_nocolorcaptionframe];
{$endif}
var
{opt1,opt2,}valuebefore: optionsskinty;
begin
......@@ -12108,14 +12124,16 @@ begin
// {$ifdef FPC}longword{$else}word{$endif}(mask2)));
// foptionsskin:= avalue - (mask1+mask2) + opt1*mask1 + opt2*mask2;
{$ifdef FPC}
foptionsskin:= optionsskinty(setsinglebit(
{$ifdef FPC}longword{$else}word{$endif}(avalue),
{$ifdef FPC}longword{$else}word{$endif}(foptionsskin),
[{$ifdef FPC}longword{$else}word{$endif}(
[osk_skin,osk_noskin]),
{$ifdef FPC}longword{$else}word{$endif}(
[osk_colorcaptionframe,osk_nocolorcaptionframe])]));
longword(avalue),longword(foptionsskin),
[longword([osk_skin,osk_noskin]),
longword([osk_colorcaptionframe,osk_nocolorcaptionframe])]));
{$else}
foptionsskin:= optionsskinty(setsinglebitar16(
word(avalue),word(foptionsskin),
[word(mask1),word(mask2)]));
{$endif}
if (optionsskinty({$ifdef FPC}longword{$else}word{$endif}(valuebefore) xor
{$ifdef FPC}longword{$else}word{$endif}(avalue)) *
[osk_nopropwidth,osk_nopropheight] <> []) and (fparentwidget <> nil) then begin
......
......@@ -1047,7 +1047,7 @@ end;
function tmenuitem.doexec: boolean;
begin
result:= doactionexecute(self,finfo,true,
mao_nocandefocus in finfo.options{false},@befexec);
mao_nocandefocus in finfo.options{false},{$ifdef FPC}@{$endif}befexec);
end;
function tmenuitem.internalexecute(async: boolean): boolean;
......@@ -1871,6 +1871,7 @@ begin
if amenu = nil then begin
amenu:= tpopupmenu.createtransient(atransientfor,@mouseinfo);
end;
result:= -1; //compiler warning
if items <> nil then begin
if first then begin
result:= amenu.menu.submenu.insert(0,items);
......
......@@ -437,8 +437,12 @@ begin
{$ifdef FPC}longword{$else}byte{$endif}(fontstyles) xor
{$ifdef FPC}longword{$else}byte{$endif}(style.fontstyle));
newinfos:= newinfos -
newinfosty(not {$ifdef FPC}longword{$else}byte{$endif}(fontstylesdelta)) * fontstyleflags +
newinfosty({$ifdef FPC}longword{$else}byte{$endif}(fontstylesdelta)) * fontstyleflags;
newinfosty(not
{$ifdef FPC}longword({$else}
word(byte{$endif}(fontstylesdelta))) * fontstyleflags +
newinfosty(
{$ifdef FPC}longword({$else}
word(byte{$endif}(fontstylesdelta))) * fontstyleflags;
if ni_fontcolor in newinfos then begin
focopo:= style.fontcolor;
end;
......@@ -447,7 +451,7 @@ begin
end;
fontstyles:= fontstylesty({$ifdef FPC}longword{$else}byte{$endif}(fontstyles) xor
{$ifdef FPC}longword{$else}byte{$endif}(fontstylesdelta) and
{$ifdef FPC}longword{$else}byte{$endif}(newinfos));
{$ifdef FPC}longword({$else}byte(word{$endif}(newinfos)));
if newinfos <> [] then begin
if int1 <> int2 then begin
formats[int2]:= formats[int1];
......@@ -483,8 +487,10 @@ function setfontinfolen(var formats: formatinfoarty; aindex: integer; len: halfi
end;
afontstyle:= style.fontstyle;
style.fontstyle:= style.fontstyle -
fontstylesty({$ifdef FPC}longword{$else}byte{$endif}(flags * fontstyleflags)) +
astyle.fontstyle * fontstylesty({$ifdef FPC}longword{$else}byte{$endif}(flags));
fontstylesty({$ifdef FPC}longword({$else}
byte(word{$endif}(flags * fontstyleflags))) +
astyle.fontstyle * fontstylesty(
{$ifdef FPC}longword({$else}byte(word{$endif}(flags)));
result:= result or (afontstyle <> style.fontstyle);
end;
......@@ -577,7 +583,7 @@ begin
else begin
style.fontstyle:= [];
end;
newinfos:= newinfosty({$ifdef FPC}longword{$else}byte{$endif}([astyle]));
newinfos:= newinfosty({$ifdef FPC}longword({$else}word(byte{$endif}([astyle])));
result:= setfontinfolen(formats,aindex,len,style,newinfos);
end;
......
......@@ -1254,22 +1254,22 @@ var
begin
if findvar(name,str1) and trystrtointmse(str1,int2) then begin
try
if setcount <> nil then begin
if assigned(setcount) then begin
setcount(int2);
end;
if store <> nil then begin
if assigned(store) then begin
for int1:= 0 to int2-1 do begin
store(int1,readlistitem);
end;
end;
except
if setcount <> nil then begin
if assigned(setcount) then begin
setcount(0);
end;
end;
end
else begin
if setcount <> nil then begin
if assigned(setcount) then begin
setcount(0);
end;
end;
......@@ -1283,22 +1283,22 @@ var
begin
if findvar(name,str1) and trystrtointmse(str1,int2) then begin
try
if setcount <> nil then begin
if assigned(setcount) then begin
setcount(int2);
end;
if store <> nil then begin
if assigned(store) then begin
for int1:= 0 to int2-1 do begin
store(int1,readlistitem);
end;
end;
except
if setcount <> nil then begin
if assigned(setcount) then begin
setcount(0);
end;
end;
end
else begin
if setcount <> nil then begin
if assigned(setcount) then begin
setcount(0);
end;
end;
......
......@@ -100,7 +100,6 @@ type
fcachedposition: int64;
fusewritebuffer: boolean;
function getnotopen: boolean;
procedure setusewritebuffer(const avalue: boolean);
function getbufpo: pchar;
protected
......@@ -108,6 +107,7 @@ type
fbuffer: pchar;
bufoffset, bufend: pchar;
fstate: textstreamstatesty;
function getnotopen: boolean;
procedure setbuflen(const Value: integer); virtual;
function geteof: boolean;
function readbytes(var buf): integer; virtual;
......@@ -848,7 +848,7 @@ constructor tmsefilestream.internalcreate(const afilename: filenamety;
const openmode: fileopenmodety;
const accessmode: fileaccessmodesty;
const rights: filerightsty;
out error: syserrorty); overload;
out error: syserrorty);
var
ahandle: integer;
begin
......
......@@ -34,7 +34,7 @@ uses
{$ifndef mse_nounicodestring}
{$if defined(FPC) and (fpc_fullversion >= 020300)}
{$define mse_unicodestring}
{$endif}
{$ifend}
{$endif}
{$ifndef mse_unicodestring}
{$ifdef FPC_WINLIKEWIDESTRING}
......@@ -324,8 +324,8 @@ function strscan(const str: lmsestringty; const chr: msechar): pmsechar; overloa
function msestrscan(const Str: PmseChar; Chr: mseChar): PmseChar; overload;
//function msestrscan(const str: msestring; chr: msechar): integer; overload;
//use findchar()
procedure mseskipspace(var str: pmsechar); inline;
procedure skipspace(var str: pchar); inline;
procedure mseskipspace(var str: pmsechar); {$ifdef FPC} inline; {$endif}
procedure skipspace(var str: pchar); {$ifdef FPC} inline; {$endif}
function StrLScan(const Str: PChar; Chr: Char; len: integer): PChar;
function mseStrLScan(const Str: PmseChar; Chr: mseChar; len: integer): PmseChar;
......@@ -387,8 +387,10 @@ function mseuppercase(const s: msestring): msestring; overload;
function mseuppercase(const s: msestringarty): msestringarty; overload;
//ascii only
function charuppercase(const c: char): char; overload; inline;
function charuppercase(const c: msechar): msechar; overload; inline;
function charuppercase(const c: char): char; overload;
{$ifdef FPC} inline; {$endif}
function charuppercase(const c: msechar): msechar; overload;
{$ifdef FPC} inline; {$endif}
function struppercase(const s: string): string; overload;
function struppercase(const s: msestring): msestring; overload;
function struppercase(const s: lmsestringty): msestring; overload;
......@@ -515,9 +517,11 @@ function stringtolatin1(const value: msestring): string;
function latin1tostring(const value: string): msestring;
function ucs4tostring(const achar: dword): msestring;
function getasciichar(const source: msechar; out dest: char): boolean; inline;
function getasciichar(const source: msechar; out dest: char): boolean;
{$ifdef FPC} inline; {$endif}
//true if valid;
function getansichar(const source: msechar; out dest: char): boolean; inline;
function getansichar(const source: msechar; out dest: char): boolean;
{$ifdef FPC} inline; {$endif}
//true if valid;
type
......@@ -3753,14 +3757,14 @@ begin
end;
end;
procedure mseskipspace(var str: pmsechar); inline;
procedure mseskipspace(var str: pmsechar); {$ifdef FPC}inline;{$endif}
begin
while str^ = ' ' do begin
inc(str);
end;
end;
procedure skipspace(var str: pchar); inline;
procedure skipspace(var str: pchar); {$ifdef FPC}inline;{$endif}
begin
while str^ = ' ' do begin
inc(str);
......
......@@ -1165,20 +1165,28 @@ begin
end;
procedure tcustommseform.setoptions(const Value: formoptionsty);
//const
// mask1: formoptionsty = [fo_screencentered,fo_screencenteredvirt,fo_defaultpos];
// mask2: formoptionsty = [fo_closeonesc,fo_cancelonesc];
// mask3: formoptionsty = [fo_maximized,fo_minimized,fo_fullscreen,fo_fullscreenvirt];
{$ifndef FPC}
const
mask1: formoptionsty = [fo_screencentered,fo_screencenteredvirt,fo_defaultpos];
mask2: formoptionsty = [fo_closeonesc,fo_cancelonesc];
mask3: formoptionsty = [fo_maximized,fo_minimized,fo_fullscreen,fo_fullscreenvirt];
mask4: formoptionsty = [fo_modal,fo_createmodal];
{$endif}
//var
// opt1,opt2: formoptionsty;
begin
if foptions <> value then begin
{$ifdef FPC}
foptions:= formoptionsty(setsinglebit(longword(value),longword(foptions),
[longword([fo_screencentered,fo_screencenteredvirt,fo_defaultpos]),
longword([fo_closeonesc,fo_cancelonesc]),
longword([fo_maximized,fo_minimized,fo_fullscreen,fo_fullscreenvirt]),
longword([fo_modal,fo_createmodal])
]));
{$else}
foptions:= formoptionsty(setsinglebitar32(longword(value),longword(foptions),
[longword(mask1),longword(mask2),longword(mask3),longword(mask4)]));
{$endif}
(*
opt1:= formoptionsty(setsinglebit(
{$ifdef FPC}longword{$else}longword{$endif}(value),
......@@ -1249,9 +1257,9 @@ const
mask1: windowoptionsty = [wo_taskbar,wo_notaskbar];
begin
foptionswindow:= windowoptionsty(setsinglebit(
{$ifdef FPC}longword{$else}byte{$endif}(value),
{$ifdef FPC}longword{$else}byte{$endif}(foptionswindow),
{$ifdef FPC}longword{$else}byte{$endif}(mask1)));
{$ifdef FPC}longword{$else}longword{$endif}(value),
{$ifdef FPC}longword{$else}longword{$endif}(foptionswindow),
{$ifdef FPC}longword{$else}longword{$endif}(mask1)));
end;
procedure tcustommseform.setstatfile(const avalue: tstatfile);
......
......@@ -2466,13 +2466,13 @@ begin
if avalue <> foptions then begin
optionsbefore:= foptions;
foptions:= captionframeoptionsty(setsinglebit(
{$ifdef FPC}longword{$else}byte{$endif}(avalue),
{$ifdef FPC}longword{$else}byte{$endif}(foptions),
{$ifdef FPC}longword{$else}byte{$endif}(mask1)));
{$ifdef FPC}longword{$else}word{$endif}(avalue),
{$ifdef FPC}longword{$else}word{$endif}(foptions),
{$ifdef FPC}longword{$else}word{$endif}(mask1)));
if (({$ifdef FPC}longword{$else}byte{$endif}(optionsbefore) xor
{$ifdef FPC}longword{$else}byte{$endif}(foptions)) and
{$ifdef FPC}longword{$else}byte{$endif}(mask2) <> 0) and
if (({$ifdef FPC}longword{$else}word{$endif}(optionsbefore) xor
{$ifdef FPC}longword{$else}word{$endif}(foptions)) and
{$ifdef FPC}longword{$else}word{$endif}(mask2) <> 0) and
(fintf.getcomponentstate * [csdesigning,csloading] = [csdesigning]) and
(caption <> '') then begin
size1.cy:= font.glyphheight + 2 * captionmargin;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment