paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 07:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix uninitialized variables based on compiler warnings got with dfa (data flow analysis) enabled.

Browse Source 
git-svn-id: trunk@55211 -
This commit is contained in:
juha 2017-06-04 15:14:29 +00:00
parent 02ce123caa
commit e27232d4cc
51 changed files with 242 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/codetools/basiccodetools.pas
View File

@ -4505,6 +4505,7 @@ function CompareStringConstants(p1, p2: PChar): integer;
// 1: 'aa' 'ab' because bigger
// 1: 'aa' 'a' because longer
begin
Result := 0;
if (p1^='''') and (p2^='''') then begin
inc(p1);
inc(p2);

4
components/codetools/codetoolmanager.pas
View File

@ -6520,7 +6520,9 @@ begin
CfgCache:=UnitSet.GetConfigCache(false);
Result:=Assigned(CfgCache) and Assigned(CfgCache.Includes)
and CfgCache.Includes.GetString(Name,ExpFilename);
end;
end
else
Result:=False;
end;
initialization

1
components/codetools/customcodetool.pas
View File

@ -828,6 +828,7 @@ function TCustomCodeTool.AtomIsCustomOperator(AllowIdentifier,
end;
begin
Result:=false;
if (CurPos.StartPos<=SrcLen) then begin
if WordIsCustomOperator.DoItCaseInsensitive(
Src,CurPos.StartPos,CurPos.EndPos-CurPos.StartPos)

2
components/codetools/finddeclarationtool.pas
View File

@ -1779,7 +1779,7 @@ procedure TFDHelpersList.AddFromList(const ExtList: TFDHelpersList);
FromNode := TFDHelpersListItem(ANode.Data);
if Kind=fdhlkDelphiHelper then
if FTree.FindKey(FromNode, @CompareHelpersList) <> nil then
Exit;//FPC & Delphi don't support duplicate class helpers!
Exit(nil); //FPC & Delphi don't support duplicate class helpers!
Result := TFDHelpersListItem.Create;
Result.HelperContext := FromNode.HelperContext;
Result.ForExprType := FromNode.ForExprType;

2
components/codetools/pascalreadertool.pas
View File

@ -3094,7 +3094,7 @@ end;
function TPascalReaderTool.FindClassExternalNode(ClassNode: TCodeTreeNode
): TCodeTreeNode;
begin
if ClassNode=nil then exit;
if ClassNode=nil then exit(nil);
Result:=ClassNode.FirstChild;
while (Result<>nil) do
begin

4
components/ideintf/formeditingintf.pas
View File

@ -467,6 +467,7 @@ end;
function TNonFormProxyDesignerForm.GetPublishedBounds(AIndex: Integer): Integer;
begin
Result := 0;
case AIndex of
0: Result := inherited Left;
1: Result := inherited Top;
@ -475,8 +476,7 @@ begin
end;
end;
procedure TNonFormProxyDesignerForm.SetPublishedBounds(AIndex: Integer;
AValue: Integer);
procedure TNonFormProxyDesignerForm.SetPublishedBounds(AIndex: Integer; AValue: Integer);
begin
case AIndex of
0: inherited Left := AValue;

10
components/ideintf/propedits.pp
View File

@ -3464,6 +3464,7 @@ function TPropertyEditor.GetVerb(Index: Integer): string;
var
i: Integer;
begin
Result := '';
i:=-1;
if HasDefaultValue then begin
inc(i);
@ -4532,7 +4533,10 @@ end;
function TClassPropertyEditor.GetValue: ansistring;
begin
if not FHideClassName then Result:='(' + GetPropType^.Name + ')';
if FHideClassName then
Result:=''
else
Result:='(' + GetPropType^.Name + ')';
end;
function TClassPropertyEditor.IsDefaultValue: boolean;
@ -4762,8 +4766,10 @@ function TMethodPropertyEditor.GetValue: ansistring;
begin
if Assigned(PropertyHook) then
Result:=PropertyHook.GetMethodName(GetMethodValue,GetComponent(0))
else
else begin
Result:='';
debugln(['TMethodPropertyEditor.GetValue : PropertyHook=Nil Name=',GetName,' Data=',dbgs(GetMethodValue.Data)]);
end;
end;
procedure TMethodPropertyEditor.GetValues(Proc: TGetStrProc);

12
components/lazutils/easylazfreetype.pas
View File

@ -526,11 +526,9 @@ var
end;
begin
ARemains := '';
if AText = '' then
begin
ARemains := '';
exit;
end;
totalWidth := 0;
pstr := @AText[1];
left := length(AText);
@ -799,7 +797,7 @@ begin
glyphBounds.Left := IncludeFullGrainMin( glyphBounds.Left, 3);
glyphBounds.Right := IncludeFullGrainMax( glyphBounds.Right-1, 3) + 1;
end;
if not IntersectRect(Rect,Rect,glyphBounds) then exit;
if not IntersectRect(Rect,Rect,glyphBounds) then exit(False);
case quality of
grqMonochrome: begin
@ -1637,7 +1635,11 @@ var
resultIndex,i: integer;
w: single;
begin
if AText = '' then exit;
if AText = '' then
begin
setlength(result, 0);
exit;
end;
pstr := @AText[1];
left := length(AText);
setlength(result, UTF8Length(AText));

1
components/lazutils/lazconfigstorage.pas
View File

@ -209,6 +209,7 @@ begin
// p2 shorter
Result:=1;
end else begin
Result:=0;
repeat
if p1^ in ['/',#0] then begin
if p2^ in ['/',#0] then begin

1
components/lazutils/lazfreetype.pas
View File

@ -1227,6 +1227,7 @@ uses
function TT_Copy_Outline( var source : TT_Outline;
var target : TT_Outline ) : TT_Error;
begin
Result := 0;
if (source.n_points = target.n_points) and
(source.n_contours = target.n_contours) then
begin

1
components/lazutils/lazloggerbase.pas
View File

@ -376,6 +376,7 @@ function GetParamByName(const AName: String; AnIndex: Integer): string;
var
i, l: Integer;
begin
Result := '';
l := Length(AName);
for i:= 1 to Paramcount do begin
if copy(ParamStrUTF8(i),1, l) = AName then begin

6
components/lazutils/lazutf8.pas
View File

@ -442,17 +442,19 @@ end;
function UTF8CharacterLengthFast(p: PChar): integer;
begin
case p^ of
#0..#191 : Result := 1;
//#0..#191 : Result := 1;
#192..#223 : Result := 2;
#224..#239 : Result := 3;
#240..#247 : Result := 4;
#248..#255 : Result := 1;
//#248..#255 : Result := 1;
// Theoretically UTF-8 supports length 1-7, but since 2003, RFC 3629 limits
// it to 1-4 bytes.
// This is an inline function, so keep the function short.
//#248..#251 : Result := 5;
//#252, #253 : Result := 6;
//#254 : Result := 7;
else Result := 1; // An optimization + prevents compiler warning about uninitialized Result.
end;
end;

1
components/lazutils/ttcache.pas
View File

@ -298,6 +298,7 @@ var
label
Fail;
begin
Result := False;
(* LOCK *)
current := cache.idle;
if current <> nil then

8
components/lazutils/ttprofile.pas
View File

@ -215,8 +215,10 @@ end;
procedure ProfileList_SortByX(var L: TProfile);
function Merge(P1,P2: TProfile): TProfile;
var cur: TProfile;
var
cur: TProfile;
begin
result := nil;
if P1 = nil then result := P2
else if P2 = nil then result := P1
else
@ -280,8 +282,10 @@ end;
procedure ProfileList_SortByStart(var L: TProfile);
function Merge(P1,P2: TProfile): TProfile;
var cur: TProfile;
var
cur: TProfile;
begin
result := nil;
if P1 = nil then result := P2
else if P2 = nil then result := P1
else

5
components/synedit/syneditfoldedview.pp
View File

@ -1568,6 +1568,7 @@ function TSynEditFoldExportCoder.ReadNode(aX, aY: Integer; aLen: Integer): TSynE
if (FExportStream.PeakString(1) = ' ') and (FExportStream.Len > FExportStream.Pos+1) then
Result := FExportStream.ReadString(2)[2];
end;
function Invalidate: TSynEditFoldType;
begin
{$IFDEF SynFoldSaveDebug}
@ -1576,6 +1577,7 @@ function TSynEditFoldExportCoder.ReadNode(aX, aY: Integer; aLen: Integer): TSynE
FReadState := sfecInvalid;
Result := scftInvalid;
end;
var
i: Integer;
begin
@ -1587,6 +1589,7 @@ begin
]);
try
{$ENDIF}
Result := scftInvalid;
case FReadState of
sfecAtBegin, sfecAtPoint:
begin
@ -2761,9 +2764,9 @@ var
end;
begin
Result := 0;
if fRoot = nil then begin
SetRoot(ANode, -fRootOffset);
Result := 0;
exit;
end;
ALine := ANode.LineOffset;

2
components/synedit/synedithighlighterfoldbase.pas
View File

@ -2037,7 +2037,7 @@ begin
(not FoldConfig[PtrUInt(ABlockType)].Enabled) and
(not FoldConfig[PtrUInt(ABlockType)].IsEssential)
then
exit;
exit(nil);
if FIsCollectingNodeInfo then
CollectNodeInfo(False, ABlockType, IncreaseLevel);

2
components/synedit/syneditmarkup.pp
View File

@ -169,7 +169,7 @@ type
Procedure PrepareMarkupForRow(aRow : Integer); override;
Procedure FinishMarkupForRow(aRow : Integer); override;
Procedure BeginMarkup; virtual;
Procedure BeginMarkup; override;
Procedure EndMarkup; override;
Function GetMarkupAttributeAtRowCol(const aRow: Integer;
const aStartCol: TLazSynDisplayTokenBound;

2
components/synedit/synhighlighterpas.pp
View File

@ -3846,7 +3846,7 @@ begin
if (not BlockEnabled) and (not ForceDisabled) and
(not FFoldConfig[ord(ABlockType)].IsEssential)
then
exit;
exit(nil);
FoldBlock := BlockEnabled and (FFoldConfig[ord(ABlockType)].Modes * [fmFold, fmHide] <> []);
p := 0;

29
debugger/debugger.pp
View File

@ -3659,17 +3659,17 @@ end;
function TCurrentCallStack.GetCurrent: Integer;
begin
Result := 0;
case FCurrentValidity of
ddsUnknown: begin
Result := 0;
FCurrentValidity := ddsRequested;
FMonitor.RequestCurrent(self);
if FCurrentValidity = ddsValid then
Result := inherited GetCurrent();
end;
ddsRequested, ddsEvaluating: Result := 0;
ddsValid: Result := inherited GetCurrent;
ddsInvalid, ddsError: Result := 0;
//ddsRequested, ddsEvaluating: Result := 0;
//ddsInvalid, ddsError: Result := 0;
end;
end;
@ -3743,17 +3743,17 @@ end;
function TCurrentCallStack.GetCount: Integer;
begin
Result := 0;
case FCountValidity of
ddsUnknown: begin
Result := 0;
FCountValidity := ddsRequested;
FMonitor.RequestCount(self);
if FCountValidity = ddsValid then
Result := FCount;
end;
ddsRequested, ddsEvaluating: Result := 0;
ddsValid: Result := FCount;
ddsInvalid, ddsError: Result := 0;
//ddsRequested, ddsEvaluating: Result := 0;
//ddsInvalid, ddsError: Result := 0;
end;
end;
@ -3886,27 +3886,20 @@ end;
function TCurrentCallStack.HasAtLeastCount(ARequiredMinCount: Integer): TNullableBool;
begin
if FCountValidity = ddsValid then begin
Result := inherited HasAtLeastCount(ARequiredMinCount);
exit;
end;
if FAtLeastCountOld >= ARequiredMinCount then begin
Result := nbTrue;
exit;
end;
if FCountValidity = ddsValid then
exit(inherited HasAtLeastCount(ARequiredMinCount));
if FAtLeastCountOld >= ARequiredMinCount then
exit(nbTrue);
if (FAtLeastCountValidity = ddsValid) and (FAtLeastCount < ARequiredMinCount) then begin
FAtLeastCountOld := FAtLeastCount;
FAtLeastCountValidity := ddsUnknown;
end;
Result := nbUnknown;
case FAtLeastCountValidity of
ddsUnknown: begin
Result := nbUnknown;
if FCountValidity in [ddsRequested, ddsEvaluating] then
exit;
FAtLeastCountValidity := ddsRequested;
FMonitor.RequestAtLeastCount(self, ARequiredMinCount);
if FCountValidity = ddsValid then

4
debugger/localsdlg.pp
View File

@ -200,12 +200,14 @@ var
Result := AValue;
end;
end;
begin
// try to guess and format value back to raw data, e.g.
// "'value'" => "value"
// "true (85)" => "85"
Result := '';
if AValue='' then
Exit('');
Exit;
if AValue[1] = '''' then
//string "'val''ue'" => "val'ue"

2
designer/anchoreditor.pas
View File

@ -681,7 +681,7 @@ var
UseNeighbours: boolean;
OldPositions,OldPositions2: array of Integer;
function NeighbourPosition(c: TControl):Integer;
function NeighbourPosition(c: TControl): Integer;
begin
case CurNeighbour of
akTop: result:=c.top;

26
designer/designer.pp
View File

@ -2165,10 +2165,7 @@ begin
MouseDownPos := GetFormRelativeMousePosition(Form);
LastMouseMovePos := MouseDownPos;
MouseDownComponent := nil;
MouseDownSender := nil;
MouseDownComponent := ComponentAtPos(MouseDownPos.X, MouseDownPos.Y, True, True);
if (MouseDownComponent = nil) then exit;
@ -2219,7 +2216,9 @@ begin
TControlAccess(MouseDownComponent).MouseDown(Button, Shift, p.X, p.Y);
Exit;
end;
end;
end
else
p:=Point(0,0);
if Mediator<>nil then begin
Handled:=false;
@ -2481,7 +2480,9 @@ begin
TControlAccess(MouseDownComponent).MouseUp(Button, Shift, p.X, p.Y);
Exit;
end;
end;
end
else
p:=Point(0,0);
if Mediator<>nil then
begin
@ -4183,15 +4184,14 @@ procedure TDesigner.HintTimer(Sender: TObject);
Result := Format('%d x %d', [Selection.Width, Selection.Height]);
end;
function ParentComponent(AComponent: TComponent): TComponent;
begin
Result := AComponent.GetParentComponent;
if (Result = nil) and ComponentIsIcon(AComponent) then
Result := AComponent.Owner;
end;
function GetSelectionPosHintText: String;
function ParentComponent(AComponent: TComponent): TComponent;
begin
Result := AComponent.GetParentComponent;
if (Result = nil) and ComponentIsIcon(AComponent) then
Result := AComponent.Owner;
end;
var
BaseParent, TestParent: TComponent;
BaseFound: Boolean;

5
designer/jitforms.pp
View File

@ -2069,9 +2069,8 @@ end;
function TJITMethods.Delete(aMethod: TJITMethod): boolean;
begin
//DebugLn(['TJITMethods.Delete Class=',dbgsname(AMethod.TheClass),' aMethodName=',aMethod.TheMethodName]);
if (aMethod=nil) then
Result:=false
else if aMethod.Owner<>Self then
Result:=false;
if (aMethod<>nil) and (aMethod.Owner<>Self) then
RaiseGDBException('TJITMethods.DeleteJITMethod')
else begin
Result:=true;

15
designer/menueditorform.pas
View File

@ -400,6 +400,7 @@ var
var
i: integer;
begin
Result:=0;
if (FEditedMenu = nil) then
Exit;
aCaptionedItemCount:=0;
@ -410,7 +411,6 @@ begin
imgCount:=FEditedMenu.Images.Count
else
imgCount:=0;
Result:=0;
for i:=0 to FEditedMenu.Items.Count-1 do
ProcessItems(FEditedMenu.Items[i]);
end;
@ -565,20 +565,17 @@ begin
if (aMenu = FEditedMenu) and (FDesigner.ShadowMenu <> nil) then
FDesigner.ShadowMenu.SetSelectedMenuItem(aMenuItem, True, False)
else begin
if (aMenu = FEditedMenu) and (FDesigner.ShadowMenu = nil) then
selection := nil;
if aMenu = FEditedMenu then
begin
if (FEditedMenu.Items.Count > 0) then
selection := FEditedMenu.Items[0]
else
selection := nil;
if (FDesigner.ShadowMenu = nil) and (FEditedMenu.Items.Count > 0) then
selection := FEditedMenu.Items[0];
end
else if (aMenu <> FEditedMenu) then
begin
else begin
FDesigner.FreeShadowMenu;
FEditedMenu := aMenu;
selection := aMenuItem;
end;
FGUIEnabled := False;
EnableGUI(selection = nil);
UpdateStatistics;

21
ide/buildmanager.pas
View File

@ -1881,7 +1881,6 @@ var
Code: TCodeBuffer;
begin
// update project resource
// ToDo: Fix uninitialized Result.
Project1.ProjResources.Regenerate(Project1.MainFileName, False, True, TestDir);
AnUnitInfo := Project1.FirstPartOfProject;
while AnUnitInfo<>nil do
@ -1895,18 +1894,22 @@ begin
if Result <> mrOk then exit;
end;
rtRes:
if (AnUnitInfo.Source=nil) and (not AnUnitInfo.IsVirtual) then begin
AnUnitInfo.Source:=CodeToolBoss.LoadFile(AnUnitInfo.Filename,true,false);
Code:=AnUnitInfo.Source;
if (Code<>nil) and (Code.DiskEncoding<>EncodingUTF8) then begin
if ConsoleVerbosity>=0 then
DebugLn(['Note: (lazarus) fixing encoding of ',Code.Filename,' from ',Code.DiskEncoding,' to ',EncodingUTF8]);
Code.DiskEncoding:=EncodingUTF8;
if not Code.Save then begin
begin
Result:=mrCancel;
if (AnUnitInfo.Source=nil) and (not AnUnitInfo.IsVirtual) then begin
AnUnitInfo.Source:=CodeToolBoss.LoadFile(AnUnitInfo.Filename,true,false);
Code:=AnUnitInfo.Source;
if (Code<>nil) and (Code.DiskEncoding<>EncodingUTF8) then begin
if ConsoleVerbosity>=0 then
DebugLn(['Note: (lazarus) fixing encoding of ',Code.Filename,' from ',Code.DiskEncoding,' to ',EncodingUTF8]);
Code.DiskEncoding:=EncodingUTF8;
if Code.Save then
Result:=mrOk
else if ConsoleVerbosity>=0 then
DebugLn(['Note: (lazarus) [TBuildManager.UpdateProjectAutomaticFiles] failed to save file ',Code.Filename]);
end;
end;
end;
end;
end;

9
ide/codeexplorer.pas
View File

@ -2626,11 +2626,10 @@ var
c: Char;
i: Integer;
begin
if TheFilter='' then begin
Result:=true;
end else if NodeText='' then begin
Result:=false;
end else begin
Result:=false;
if TheFilter='' then
Result:=true
else if NodeText<>'' then begin
Src:=PChar(NodeText);
PFilter:=PChar(TheFilter);
repeat

13
ide/codehelp.pas
View File

@ -887,6 +887,12 @@ var
S: String;
begin
//DebugLn(['TLazFPDocFile.GetValuesFromNode ',Node.NodeName,' ',dbgsName(Node),' ',Node is TDomElement]);
Result[fpdiShort] := '';
Result[fpdiElementLink] := '';
Result[fpdiDescription] := '';
Result[fpdiErrors] := '';
Result[fpdiSeeAlso] := '';
Result[fpdiExample] := '';
if Node is TDomElement then
Result[fpdiElementLink] := TDomElement(Node).GetAttribute('link');
Node := Node.FirstChild;
@ -914,8 +920,7 @@ begin
end;
end;
function TLazFPDocFile.GetValueFromNode(Node: TDOMNode; Item: TFPDocItem
): string;
function TLazFPDocFile.GetValueFromNode(Node: TDOMNode; Item: TFPDocItem): string;
var
Child: TDOMNode;
begin
@ -2734,7 +2739,9 @@ begin
if Desc=xtContext then
CTHint:=Tool.GetSmartHint(Node,XYPos,false)
else if Desc in xtAllIdentPredefinedTypes then
CTHint:='type '+ExpressionTypeDescNames[Desc];
CTHint:='type '+ExpressionTypeDescNames[Desc]
else
CTHint:='';
Result:=Result+' <nobr>'+SourceToFPDocHint(CTHint)+'</nobr>';
// add link to declaration

3
ide/encloseselectiondlg.pas
View File

@ -76,8 +76,7 @@ implementation
{$R *.lfm}
function EncloseSelectionTypeDescription(TheType: TEncloseSelectionType
): string;
function EncloseSelectionTypeDescription(TheType: TEncloseSelectionType): string;
begin
case TheType of
estTryFinally: Result:='Try..Finally';

6
ide/etfpcmsgparser.pas
View File

@ -1504,8 +1504,9 @@ const
var
MsgLine: TMessageLine;
begin
if CompareMem(PChar(pat),p,length(pat)) then begin
Result:=true;
Result:=CompareMem(PChar(pat),p,length(pat));
if Result then
begin
MsgLine:=CreateMsgLine;
MsgLine.MsgID:=0;
MsgLine.SubTool:=SubToolFPCLinker;
@ -2699,6 +2700,7 @@ var
i: Integer;
LastMsgLine, MsgLine: TMessageLine;
begin
Result:=false;
if (p^=' ') then begin
i:=Tool.WorkerMessages.Count-1;
if i<0 then exit;

1
ide/frames/modematrixctrl.pas
View File

@ -1046,6 +1046,7 @@ begin
fTypePopupMenu.Items[fTypePopupMenu.Items.Count-1].Free;
XY:=Point(0,0);
i:=TypeColumn.PickList.Count-1;
ColRowToOffset(true,true,TypeCol,XY.X,i);
ColRowToOffset(false,true,aRow,i,XY.Y);
XY:=ClientToScreen(XY);

1
ide/keymapping.pp
View File

@ -881,6 +881,7 @@ begin
0: Result := KeyStroke1;
1: Result := KeyStroke2;
2: Result := KeyStroke3;
else Result := Nil;
end;
end;

1
ide/sourcefilemanager.pas
View File

@ -3097,6 +3097,7 @@ var
//debugln([' Add ',aFilename]);
Files[aFilename]:='';
FindUnitsOfOwner.Add(aFilename);
Result := True;
end;
procedure AddListedPackageUnits(aPackage: TLazPackage);

26
lcl/include/buttonglyph.inc
View File

@ -168,22 +168,22 @@ begin
Result := 0;
end;
function SystemShowButtonGlyphs: Boolean; inline;
begin
Result := ThemeServices.GetOption(toShowButtonImages) = 1;
{$ifdef Windows}
// force False on windows since gtk and qt can return True
Result := False;
{$endif}
end;
procedure TButtonGlyph.GlyphChanged(Sender: TObject);
function CanShow: Boolean;
function SystemShowGlyphs: Boolean; inline;
begin
Result := ThemeServices.GetOption(toShowButtonImages) = 1;
{$ifdef Windows}
// force False on windows since gtk and qt can return True
Result := False;
{$endif}
end;
begin
Result := True;
if IsDesigning then
Exit(True);
Exit;
case ShowMode of
gsmAlways:
Result := True;
@ -194,11 +194,11 @@ procedure TButtonGlyph.GlyphChanged(Sender: TObject);
case Application.ShowButtonGlyphs of
sbgAlways: Result := True;
sbgNever: Result := False;
sbgSystem: Result := SystemShowGlyphs;
sbgSystem: Result := SystemShowButtonGlyphs;
end;
end;
gsmSystem:
Result := SystemShowGlyphs;
Result := SystemShowButtonGlyphs;
end;
end;

1
lcl/include/control.inc
View File

@ -481,6 +481,7 @@ var
end;
begin
Result:=alNone;
BestDistance:=High(Integer);
FindMinDistance(alLeft,MousePos.X);
FindMinDistance(alRight,Width-MousePos.X);

18
lcl/include/menuitem.inc
View File

@ -643,6 +643,11 @@ begin
if not HandleAllocated then CreateHandle;
end;
function SystemShowMenuGlyphs: Boolean; inline;
begin
Result := ThemeServices.GetOption(toShowMenuImages) = 1;
end;
{------------------------------------------------------------------------------
function TMenuItem.HasIcon: boolean;
@ -651,15 +656,10 @@ end;
function TMenuItem.HasIcon: boolean;
function CanShowIcon: Boolean;
function SystemShowGlyphs: Boolean; inline;
begin
Result := ThemeServices.GetOption(toShowMenuImages) = 1;
end;
begin
Result := True;
if csDesigning in ComponentState then
Exit(True);
Exit;
case GlyphShowMode of
gsmAlways:
Result := True;
@ -670,11 +670,11 @@ function TMenuItem.HasIcon: boolean;
case Application.ShowMenuGlyphs of
sbgAlways: Result := True;
sbgNever: Result := False;
sbgSystem: Result := SystemShowGlyphs;
sbgSystem: Result := SystemShowMenuGlyphs;
end;
end;
gsmSystem:
Result := SystemShowGlyphs;
Result := SystemShowMenuGlyphs;
end;
end;

1
lcl/include/messagedialogs.inc
View File

@ -33,6 +33,7 @@ function ModalDefaultButton(Buttons : TMsgDlgButtons) : TMsgDlgbtn;
var
b: TMsgDlgBtn;
begin
Result := mbYes; // Some default return value.
If mbYes in Buttons then
Result := mbYes
else

12
lcl/interfaces/qt/qtthemes.pas
View File

@ -859,13 +859,17 @@ begin
end;
teRebar :
if Details.Part in [RP_GRIPPER, RP_GRIPPERVERT] then
Result := Size(-1, -1);
Result := Size(-1, -1)
else
Result := inherited;
teTreeView:
if Details.Part in [TVP_GLYPH, TVP_HOTGLYPH] then
begin
Result := inherited;
inc(Result.cx);
inc(Result.cy);
if Details.Part in [TVP_GLYPH, TVP_HOTGLYPH] then
begin
inc(Result.cx);
inc(Result.cy);
end;
end;
teToolBar:
if (Details.Part = TP_DROPDOWNBUTTON) or (Details.Part = TP_SPLITBUTTONDROPDOWN) then

4
lcl/interfaces/qt/qtwidgets.pas
View File

@ -11853,7 +11853,9 @@ end;
function TQtAbstractSpinBox.getMaxLength: Integer;
begin
if LineEdit <> nil then
Result := QLineEdit_maxLength(LineEdit);
Result := QLineEdit_maxLength(LineEdit)
else
Result := 0;
end;
function TQtAbstractSpinBox.getSelectionStart: Integer;

21
lcl/interfaces/qt/qtwinapi.inc
View File

@ -2500,6 +2500,7 @@ var
SubW: TQtWidget;
Area: QMdiAreaH;
begin
Result := 0;
Widget := QApplication_activeWindow;
if Widget <> nil then
begin
@ -2517,8 +2518,7 @@ begin
end else
Result := HWND(W);
end;
end else
Result := 0;
end;
end;
@ -3111,7 +3111,8 @@ begin
if not Result then Exit;
Desktop := QApplication_desktop();
Dec(Monitor);
Result := (Monitor >= 0) and (Monitor < PtrUInt(QDesktopWidget_numScreens(Desktop)));
// Note: Monitor is PtrUInt and is always >= 0.
Result := Monitor < PtrUInt(QDesktopWidget_numScreens(Desktop));
if not Result then Exit;
QDesktopWidget_screenGeometry(Desktop, @lpmi^.rcMonitor, Monitor);
QDesktopWidget_availableGeometry(Desktop, @lpmi^.rcWork, Monitor);
@ -4667,9 +4668,9 @@ function TQtWidgetSet.GradientFill(DC: HDC; Vertices: PTriVertex;
with Mesh do
begin
Result :=
(Vertex1 < Cardinal(NumVertices)) and (Vertex2 >= 0) and
(Vertex2 < Cardinal(NumVertices)) and (Vertex2 >= 0) and
(Vertex3 < Cardinal(NumVertices)) and (Vertex3 >= 0);
(Vertex1 < Cardinal(NumVertices)) and
(Vertex2 < Cardinal(NumVertices)) and
(Vertex3 < Cardinal(NumVertices));
if (Vertex1 = Vertex2) or
(Vertex1 = Vertex3) or
@ -4740,8 +4741,8 @@ function TQtWidgetSet.GradientFill(DC: HDC; Vertices: PTriVertex;
with Mesh do
begin
Result :=
(UpperLeft < Cardinal(NumVertices)) and (UpperLeft >= 0) and
(LowerRight < Cardinal(NumVertices)) and (LowerRight >= 0);
(UpperLeft < Cardinal(NumVertices)) and
(LowerRight < Cardinal(NumVertices));
if (LowerRight = UpperLeft) or not Result then
Exit;
@ -5030,8 +5031,7 @@ end;
Returns: True if invalidate is successfull.
Invalidates region of widget.
------------------------------------------------------------------------------}
function TQtWidgetSet.InvalidateRgn(aHandle: HWND; Rgn: HRGN; Erase: Boolean
): Boolean;
function TQtWidgetSet.InvalidateRgn(aHandle: HWND; Rgn: HRGN; Erase: Boolean): Boolean;
begin
{$ifdef VerboseQtWinAPI}
WriteLn('[WinAPI InvalidateRgn]');
@ -5042,6 +5042,7 @@ begin
TQtWidget(aHandle).UpdateRegion(TQtRegion(Rgn).FHandle)
else
TQtWidget(aHandle).Update;
Result := True;
end;
{------------------------------------------------------------------------------

7
lcl/interfaces/qt/qtwschecklst.pp
View File

@ -108,19 +108,18 @@ var
QtListWidget: TQtCheckListBox;
begin
if not WSCheckHandleAllocated(ACheckListBox, 'GetItemEnabled') then
Exit;
Exit(False);
QtListWidget := TQtCheckListBox(ACheckListBox.Handle);
Result := QtListWidget.Enabled[AIndex];
end;
class function TQtWSCustomCheckListBox.GetState(
const ACheckListBox: TCustomCheckListBox; const AIndex: integer
): TCheckBoxState;
const ACheckListBox: TCustomCheckListBox; const AIndex: integer): TCheckBoxState;
var
QtListWidget: TQtCheckListBox;
begin
if not WSCheckHandleAllocated(ACheckListBox, 'GetState') then
Exit;
Exit(cbUnchecked);
QtListWidget := TQtCheckListBox(ACheckListBox.Handle);
QtListWidget.AllowGrayed := ACheckListBox.AllowGrayed;
Result := QtCheckStateToLCLCheckStateMap[QtListWidget.ItemCheckState[AIndex]];

42
lcl/interfaces/qt/qtwscomctrls.pp
View File

@ -828,11 +828,11 @@ var
QtTreeWidget: TQtTreeWidget;
begin
if not WSCheckHandleAllocated(ALV, 'ColumnGetWidth') then
Exit;
Exit(-1);
// TODO: columns in vsIcon mode
if IsIconView(ALV) then
exit;
exit(0);
QtTreeWidget := TQtTreeWidget(ALV.Handle);
Result := QtTreeWidget.ColWidth[AIndex];
@ -1185,7 +1185,7 @@ var
R: TRect;
begin
if not WSCheckHandleAllocated(ALV, 'ItemGetPosition') then
Exit;
Exit(Point(-1,-1));
R := Rect(0, 0, 0, 0);
if IsIconView(ALV) then
@ -1219,7 +1219,7 @@ var
Arr: TPtrIntArray;
begin
if not WSCheckHandleAllocated(ALV, 'ItemGetState') then
Exit;
Exit(False);
AIsSet := False;
if IsIconView(ALV) then
@ -1423,10 +1423,10 @@ var
Str: WideString;
i: Integer;
AAlignment: QtAlignment;
AImages: TCustomImageList;
AMetric: Integer;
ASizeHint: TSize;
AIconWidth: Integer;
//AImages: TCustomImageList;
//AMetric: Integer;
//ASizeHint: TSize;
//AIconWidth: Integer;
begin
if not WSCheckHandleAllocated(ALV, 'ItemInsert') then
Exit;
@ -1462,10 +1462,10 @@ begin
QtTreeWidget.setItemData(TWI, 0, AItem);
if Assigned(TCustomListViewHack(ALV).SmallImages) then
AIconWidth := TCustomListViewHack(ALV).SmallImages.Width
else
AIconWidth := 0;
//if Assigned(TCustomListViewHack(ALV).SmallImages) then
// AIconWidth := TCustomListViewHack(ALV).SmallImages.Width
//else
// AIconWidth := 0;
for i := 0 to AItem.SubItems.Count - 1 do
begin
@ -1752,7 +1752,7 @@ var
i: Integer;
begin
if not WSCheckHandleAllocated(ALV, 'GetFocused') then
Exit;
Exit(-1);
if IsIconView(ALV) then
begin
@ -1787,7 +1787,7 @@ var
TWI: QTreeWidgetItemH;
begin
if not WSCheckHandleAllocated(ALV, 'GetItemAt') then
Exit;
Exit(-1);
if IsIconView(ALV) then
begin
QtListWidget := TQtListWidget(ALV.Handle);
@ -1809,7 +1809,7 @@ end;
class function TQtWSCustomListView.GetSelCount(const ALV: TCustomListView): Integer;
begin
if not WSCheckHandleAllocated(ALV, 'GetSelCount') then
Exit;
Exit(-1);
if IsIconView(ALV) then
Result := TQtListWidget(ALV.Handle).getSelCount
else
@ -1828,7 +1828,7 @@ var
FPInts: TPtrIntArray;
begin
if not WSCheckHandleAllocated(ALV, 'GetSelection') then
Exit;
Exit(-1);
if IsIconView(ALV) then
begin
QtListWidget := TQtListWidget(ALV.Handle);
@ -1845,8 +1845,7 @@ begin
Result := -1;
end;
class function TQtWSCustomListView.GetTopItem(const ALV: TCustomListView
): Integer;
class function TQtWSCustomListView.GetTopItem(const ALV: TCustomListView): Integer;
var
QtItemView: TQtAbstractItemView;
begin
@ -2001,12 +2000,11 @@ end;
class function TQtWSCustomListView.GetBoundingRect(const ALV: TCustomListView): TRect;
begin
if not WSCheckHandleAllocated(ALV, 'GetBoundingRect') then
Exit;
Exit(Rect(0,0,0,0));
Result := TQtWidget(ALV.Handle).getFrameGeometry;
end;
class function TQtWSCustomListView.GetViewOrigin(const ALV: TCustomListView
): TPoint;
class function TQtWSCustomListView.GetViewOrigin(const ALV: TCustomListView): TPoint;
var
QtItemView: TQtAbstractItemView;
begin
@ -2233,11 +2231,13 @@ begin
if IsIconView(ALV) then
begin
QtTreeWidget := Nil; // Suppress compiler warning.
QtListWidget := TQtListWidget(ALV.Handle);
ItemViewWidget := QListWidgetH(QtListWidget.Widget);
QtListWidget.OwnerDrawn := False;
end else
begin
QtListWidget := Nil; // Suppress compiler warning.
QtTreeWidget := TQtTreeWidget(ALV.Handle);
ItemViewWidget := QTreeWidgetH(QtTreeWidget.Widget);
with QtTreeWidget do

2
lcl/interfaces/qt/qtwsdialogs.pp
View File

@ -414,9 +414,9 @@ var
{$ifdef QT_NATIVE_DIALOGS}
selectedFilter, saveFileName, saveFilter, saveTitle, sDir: WideString;
Flags: Cardinal;
s: string;
{$endif}
ActiveWin: HWND;
s: string;
begin
{------------------------------------------------------------------------------
Initialization of variables

6
lcl/interfaces/qt/qtwsmenus.pp
View File

@ -368,7 +368,7 @@ end;
class function TQtWSMenuItem.SetRightJustify(const AMenuItem: TMenuItem; const Justified: boolean): boolean;
begin
if not WSCheckMenuItem(AMenuItem, 'SetRightJustify') then
Exit;
Exit(False);
// what should be done here? maybe this?
TQtMenu(AMenuItem.Handle).setAttribute(QtWA_RightToLeft, Justified);
@ -402,6 +402,7 @@ var
Menu: TQtMenu;
AParent: TComponent;
begin
Result := 0;
{ If the menu is a main menu, there is no need to create a handle for it.
It's already created on the window }
if (AMenu is TMainMenu) then
@ -428,15 +429,12 @@ begin
begin
Menu := TQtMenu.Create(AMenu.Items);
Menu.AttachEvents;
Result := HMENU(Menu);
end;
{$ifdef VerboseQt}
Write('[TQtWSMenu.CreateHandle] ');
if (AMenu is TMainMenu) then Write('IsMainMenu ');
WriteLn(' Handle: ', dbghex(Result), ' Name: ', AMenu.Name);
{$endif}
end;

9
lcl/interfaces/qt/qtwsstdctrls.pp
View File

@ -764,7 +764,7 @@ end;
class function TQtWSCustomMemo.GetStrings(const ACustomMemo: TCustomMemo): TStrings;
begin
if not WSCheckHandleAllocated(ACustomMemo, 'GetStrings') then
Exit;
Exit(Nil);
if not Assigned(TQtTextEdit(ACustomMemo.Handle).FList) then
TQtTextEdit(ACustomMemo.Handle).FList := TQtMemoStrings.Create(ACustomMemo);
@ -1611,7 +1611,7 @@ var
ComboBox: TQtComboBox;
begin
if not WSCheckHandleAllocated(ACustomComboBox, 'GetItems') then
Exit;
Exit(Nil);
ComboBox := TQtComboBox(ACustomComboBox.Handle);
if not Assigned(ComboBox.FList) then
begin
@ -1691,12 +1691,11 @@ end;
------------------------------------------------------------------------------}
class function TQtWSToggleBox.RetrieveState(const ACustomCheckBox: TCustomCheckBox): TCheckBoxState;
begin
Result := cbUnChecked;
if not WSCheckHandleAllocated(ACustomCheckBox, 'RetrieveState') then
Exit;
if TQtToggleBox(ACustomCheckBox.Handle).isChecked then
Result := cbChecked
else
Result := cbUnChecked;
Result := cbChecked;
end;
{------------------------------------------------------------------------------

12
lcl/interfaces/qt5/qtthemes.pas
View File

@ -857,13 +857,17 @@ begin
end;
teRebar :
if Details.Part in [RP_GRIPPER, RP_GRIPPERVERT] then
Result := Size(-1, -1);
Result := Size(-1, -1)
else
Result := inherited;
teTreeView:
if Details.Part in [TVP_GLYPH, TVP_HOTGLYPH] then
begin
Result := inherited;
inc(Result.cx);
inc(Result.cy);
if Details.Part in [TVP_GLYPH, TVP_HOTGLYPH] then
begin
inc(Result.cx);
inc(Result.cy);
end;
end;
teToolBar:
if (Details.Part = TP_DROPDOWNBUTTON) or (Details.Part = TP_SPLITBUTTONDROPDOWN) then

4
lcl/interfaces/qt5/qtwidgets.pas
View File

@ -11823,7 +11823,9 @@ end;
function TQtAbstractSpinBox.getMaxLength: Integer;
begin
if LineEdit <> nil then
Result := QLineEdit_maxLength(LineEdit);
Result := QLineEdit_maxLength(LineEdit)
else
Result := 0;
end;
function TQtAbstractSpinBox.getSelectionStart: Integer;

21
lcl/interfaces/qt5/qtwinapi.inc
View File

@ -2443,6 +2443,7 @@ var
SubW: TQtWidget;
Area: QMdiAreaH;
begin
Result := 0;
Widget := QApplication_activeWindow;
if Widget <> nil then
begin
@ -2460,8 +2461,7 @@ begin
end else
Result := HWND(W);
end;
end else
Result := 0;
end;
end;
@ -3054,7 +3054,8 @@ begin
if not Result then Exit;
Desktop := QApplication_desktop();
Dec(Monitor);
Result := (Monitor >= 0) and (Monitor < PtrUInt(QDesktopWidget_numScreens(Desktop)));
// Note: Monitor is PtrUInt and is always >= 0.
Result := Monitor < PtrUInt(QDesktopWidget_numScreens(Desktop));
if not Result then Exit;
QDesktopWidget_screenGeometry(Desktop, @lpmi^.rcMonitor, Monitor);
QDesktopWidget_availableGeometry(Desktop, @lpmi^.rcWork, Monitor);
@ -4610,9 +4611,9 @@ function TQtWidgetSet.GradientFill(DC: HDC; Vertices: PTriVertex;
with Mesh do
begin
Result :=
(Vertex1 < Cardinal(NumVertices)) and (Vertex2 >= 0) and
(Vertex2 < Cardinal(NumVertices)) and (Vertex2 >= 0) and
(Vertex3 < Cardinal(NumVertices)) and (Vertex3 >= 0);
(Vertex1 < Cardinal(NumVertices)) and
(Vertex2 < Cardinal(NumVertices)) and
(Vertex3 < Cardinal(NumVertices));
if (Vertex1 = Vertex2) or
(Vertex1 = Vertex3) or
@ -4683,8 +4684,8 @@ function TQtWidgetSet.GradientFill(DC: HDC; Vertices: PTriVertex;
with Mesh do
begin
Result :=
(UpperLeft < Cardinal(NumVertices)) and (UpperLeft >= 0) and
(LowerRight < Cardinal(NumVertices)) and (LowerRight >= 0);
(UpperLeft < Cardinal(NumVertices)) and
(LowerRight < Cardinal(NumVertices));
if (LowerRight = UpperLeft) or not Result then
Exit;
@ -4905,8 +4906,7 @@ end;
Returns: True if invalidate is successfull.
Invalidates region of widget.
------------------------------------------------------------------------------}
function TQtWidgetSet.InvalidateRgn(aHandle: HWND; Rgn: HRGN; Erase: Boolean
): Boolean;
function TQtWidgetSet.InvalidateRgn(aHandle: HWND; Rgn: HRGN; Erase: Boolean): Boolean;
begin
{$ifdef VerboseQtWinAPI}
WriteLn('[WinAPI InvalidateRgn]');
@ -4917,6 +4917,7 @@ begin
TQtWidget(aHandle).UpdateRegion(TQtRegion(Rgn).FHandle)
else
TQtWidget(aHandle).Update;
Result := True;
end;
{------------------------------------------------------------------------------

7
lcl/interfaces/qt5/qtwschecklst.pp
View File

@ -107,19 +107,18 @@ var
QtListWidget: TQtCheckListBox;
begin
if not WSCheckHandleAllocated(ACheckListBox, 'GetItemEnabled') then
Exit;
Exit(False);
QtListWidget := TQtCheckListBox(ACheckListBox.Handle);
Result := QtListWidget.Enabled[AIndex];
end;
class function TQtWSCustomCheckListBox.GetState(
const ACheckListBox: TCustomCheckListBox; const AIndex: integer
): TCheckBoxState;
const ACheckListBox: TCustomCheckListBox; const AIndex: integer): TCheckBoxState;
var
QtListWidget: TQtCheckListBox;
begin
if not WSCheckHandleAllocated(ACheckListBox, 'GetState') then
Exit;
Exit(cbUnchecked);
QtListWidget := TQtCheckListBox(ACheckListBox.Handle);
QtListWidget.AllowGrayed := ACheckListBox.AllowGrayed;
Result := QtCheckStateToLCLCheckStateMap[QtListWidget.ItemCheckState[AIndex]];

40
lcl/interfaces/qt5/qtwscomctrls.pp
View File

@ -827,11 +827,11 @@ var
QtTreeWidget: TQtTreeWidget;
begin
if not WSCheckHandleAllocated(ALV, 'ColumnGetWidth') then
Exit;
Exit(-1);
// TODO: columns in vsIcon mode
if IsIconView(ALV) then
exit;
exit(0);
QtTreeWidget := TQtTreeWidget(ALV.Handle);
Result := QtTreeWidget.ColWidth[AIndex];
@ -1184,7 +1184,7 @@ var
R: TRect;
begin
if not WSCheckHandleAllocated(ALV, 'ItemGetPosition') then
Exit;
Exit(Point(-1,-1));
R := Rect(0, 0, 0, 0);
if IsIconView(ALV) then
@ -1218,7 +1218,7 @@ var
Arr: TPtrIntArray;
begin
if not WSCheckHandleAllocated(ALV, 'ItemGetState') then
Exit;
Exit(False);
AIsSet := False;
if IsIconView(ALV) then
@ -1422,10 +1422,10 @@ var
Str: WideString;
i: Integer;
AAlignment: QtAlignment;
AImages: TCustomImageList;
AMetric: Integer;
ASizeHint: TSize;
AIconWidth: Integer;
//AImages: TCustomImageList;
//AMetric: Integer;
//ASizeHint: TSize;
//AIconWidth: Integer;
begin
if not WSCheckHandleAllocated(ALV, 'ItemInsert') then
Exit;
@ -1461,10 +1461,10 @@ begin
QtTreeWidget.setItemData(TWI, 0, AItem);
if Assigned(TCustomListViewHack(ALV).SmallImages) then
AIconWidth := TCustomListViewHack(ALV).SmallImages.Width
else
AIconWidth := 0;
//if Assigned(TCustomListViewHack(ALV).SmallImages) then
// AIconWidth := TCustomListViewHack(ALV).SmallImages.Width
//else
// AIconWidth := 0;
for i := 0 to AItem.SubItems.Count - 1 do
begin
@ -1751,7 +1751,7 @@ var
i: Integer;
begin
if not WSCheckHandleAllocated(ALV, 'GetFocused') then
Exit;
Exit(-1);
if IsIconView(ALV) then
begin
@ -1786,7 +1786,7 @@ var
TWI: QTreeWidgetItemH;
begin
if not WSCheckHandleAllocated(ALV, 'GetItemAt') then
Exit;
Exit(-1);
if IsIconView(ALV) then
begin
QtListWidget := TQtListWidget(ALV.Handle);
@ -1808,7 +1808,7 @@ end;
class function TQtWSCustomListView.GetSelCount(const ALV: TCustomListView): Integer;
begin
if not WSCheckHandleAllocated(ALV, 'GetSelCount') then
Exit;
Exit(-1);
if IsIconView(ALV) then
Result := TQtListWidget(ALV.Handle).getSelCount
else
@ -1827,7 +1827,7 @@ var
FPInts: TPtrIntArray;
begin
if not WSCheckHandleAllocated(ALV, 'GetSelection') then
Exit;
Exit(-1);
if IsIconView(ALV) then
begin
QtListWidget := TQtListWidget(ALV.Handle);
@ -1844,8 +1844,7 @@ begin
Result := -1;
end;
class function TQtWSCustomListView.GetTopItem(const ALV: TCustomListView
): Integer;
class function TQtWSCustomListView.GetTopItem(const ALV: TCustomListView): Integer;
var
QtItemView: TQtAbstractItemView;
begin
@ -2000,12 +1999,11 @@ end;
class function TQtWSCustomListView.GetBoundingRect(const ALV: TCustomListView): TRect;
begin
if not WSCheckHandleAllocated(ALV, 'GetBoundingRect') then
Exit;
Exit(Rect(0,0,0,0));
Result := TQtWidget(ALV.Handle).getFrameGeometry;
end;
class function TQtWSCustomListView.GetViewOrigin(const ALV: TCustomListView
): TPoint;
class function TQtWSCustomListView.GetViewOrigin(const ALV: TCustomListView): TPoint;
var
QtItemView: TQtAbstractItemView;
begin

6
lcl/interfaces/qt5/qtwsmenus.pp
View File

@ -367,7 +367,7 @@ end;
class function TQtWSMenuItem.SetRightJustify(const AMenuItem: TMenuItem; const Justified: boolean): boolean;
begin
if not WSCheckMenuItem(AMenuItem, 'SetRightJustify') then
Exit;
Exit(False);
// what should be done here? maybe this?
TQtMenu(AMenuItem.Handle).setAttribute(QtWA_RightToLeft, Justified);
@ -401,6 +401,7 @@ var
Menu: TQtMenu;
AParent: TComponent;
begin
Result := 0;
{ If the menu is a main menu, there is no need to create a handle for it.
It's already created on the window }
if (AMenu is TMainMenu) then
@ -427,15 +428,12 @@ begin
begin
Menu := TQtMenu.Create(AMenu.Items);
Menu.AttachEvents;
Result := HMENU(Menu);
end;
{$ifdef VerboseQt}
Write('[TQtWSMenu.CreateHandle] ');
if (AMenu is TMainMenu) then Write('IsMainMenu ');
WriteLn(' Handle: ', dbghex(Result), ' Name: ', AMenu.Name);
{$endif}
end;

9
lcl/interfaces/qt5/qtwsstdctrls.pp
View File

@ -763,7 +763,7 @@ end;
class function TQtWSCustomMemo.GetStrings(const ACustomMemo: TCustomMemo): TStrings;
begin
if not WSCheckHandleAllocated(ACustomMemo, 'GetStrings') then
Exit;
Exit(Nil);
if not Assigned(TQtTextEdit(ACustomMemo.Handle).FList) then
TQtTextEdit(ACustomMemo.Handle).FList := TQtMemoStrings.Create(ACustomMemo);
@ -1590,7 +1590,7 @@ var
ComboBox: TQtComboBox;
begin
if not WSCheckHandleAllocated(ACustomComboBox, 'GetItems') then
Exit;
Exit(Nil);
ComboBox := TQtComboBox(ACustomComboBox.Handle);
if not Assigned(ComboBox.FList) then
begin
@ -1670,12 +1670,11 @@ end;
------------------------------------------------------------------------------}
class function TQtWSToggleBox.RetrieveState(const ACustomCheckBox: TCustomCheckBox): TCheckBoxState;
begin
Result := cbUnChecked;
if not WSCheckHandleAllocated(ACustomCheckBox, 'RetrieveState') then
Exit;
if TQtToggleBox(ACustomCheckBox.Handle).isChecked then
Result := cbChecked
else
Result := cbUnChecked;
Result := cbChecked;
end;
{------------------------------------------------------------------------------