From 175fed87a692bba46f14943a4fd906dfc169633b Mon Sep 17 00:00:00 2001 From: zeljko Date: Fri, 19 Oct 2007 11:40:35 +0000 Subject: [PATCH] Qt: Fixed AV's in qt IDE under darwin. Removed GetControlConstraints() completely unneeded by linux,darwin, win32. git-svn-id: trunk@12521 - --- lcl/interfaces/qt/qtlclintf.inc | 60 -------------------------------- lcl/interfaces/qt/qtlclintfh.inc | 2 -- lcl/interfaces/qt/qtwidgets.pas | 5 ++- 3 files changed, 4 insertions(+), 63 deletions(-) diff --git a/lcl/interfaces/qt/qtlclintf.inc b/lcl/interfaces/qt/qtlclintf.inc index dcfa185708..318daebf02 100644 --- a/lcl/interfaces/qt/qtlclintf.inc +++ b/lcl/interfaces/qt/qtlclintf.inc @@ -154,66 +154,6 @@ begin end; end; -{------------------------------------------------------------------------------ - Function: GetControlConstraints - Params: Constraints: TObject - Returns: true on success - - Updates the constraints object (e.g. TSizeConstraints) with interface specific - bounds. - ------------------------------------------------------------------------------} -function TQtWidgetSet.GetControlConstraints(Constraints: TObject): boolean; -var - SizeConstraints: TSizeConstraints; - MinWidth: Integer; - MinHeight: Integer; - MaxWidth: Integer; - MaxHeight: Integer; - SizeHint: TSize; - Ct: TWinControl; -begin - Result := True; - if Constraints is TSizeConstraints then - begin - - MinWidth := 0; - MinHeight := 0; - MaxWidth:=0; - MaxHeight:=0; - - SizeConstraints := TSizeConstraints(Constraints); - - if (SizeConstraints.Control=nil) then exit; - - if SizeConstraints.Control is TStatusBar then - exit; - - if SizeConstraints.Control is TWinControl then - Ct := TWinControl(SizeConstraints.Control); - - if Assigned(Ct) and ct.HandleAllocated then - begin - QWidget_minimumSize(TQtWidget(Ct.Handle).Widget, @SizeHint); - - MinWidth := SizeHint.cx; - MinHeight := SizeHint.cy; - - if MinWidth < 0 then - MinWidth := 0; - if MinHeight < 0 then - MinHeight := 0; - - QWidget_maximumSize(TQtWidget(Ct.Handle).Widget, @SizeHint); - - MaxWidth := SizeHint.cx; - MaxHeight := SizeHint.cy; - - SizeConstraints.SetInterfaceConstraints(MinWidth,MinHeight, - MinWidth,MinHeight); - end; - end; -end; - {------------------------------------------------------------------------------ Function: IntfSendsUTF8KeyPress Params: diff --git a/lcl/interfaces/qt/qtlclintfh.inc b/lcl/interfaces/qt/qtlclintfh.inc index 6b417be665..3f8fb81411 100644 --- a/lcl/interfaces/qt/qtlclintfh.inc +++ b/lcl/interfaces/qt/qtlclintfh.inc @@ -36,8 +36,6 @@ procedure DrawArrow(Arrow: TComponent; Canvas: TPersistent); override; function FontCanUTF8(Font: HFont): boolean; override; function FontIsMonoSpace(Font: HFont): boolean; override; -function GetControlConstraints(Constraints: TObject): boolean; override; - function IntfSendsUTF8KeyPress: boolean; override; function PromptUser(const DialogCaption : string; diff --git a/lcl/interfaces/qt/qtwidgets.pas b/lcl/interfaces/qt/qtwidgets.pas index 9844d5f6fc..f26828aa5c 100644 --- a/lcl/interfaces/qt/qtwidgets.pas +++ b/lcl/interfaces/qt/qtwidgets.pas @@ -2928,7 +2928,10 @@ end; function TQtWidget.GetWidget: QWidgetH; begin - Result := QWidgetH(TheObject); + if TheObject <> nil then + Result := QWidgetH(TheObject) + else + Result := nil; end; function TQtWidget.DeliverMessage(var Msg): LRESULT;