Qt: cleanup - we destroy all widgets at one place with qt44.

git-svn-id: trunk@18291 -
This commit is contained in:
zeljko 2009-01-14 20:09:42 +00:00
parent e8969ac8d4
commit 37c08b52f6

View File

@ -399,7 +399,9 @@ type
protected protected
function CreateWidget(const AParams: TCreateParams): QWidgetH; override; function CreateWidget(const AParams: TCreateParams): QWidgetH; override;
public public
{$IFNDEF USE_QT_44}
destructor Destroy; override; destructor Destroy; override;
{$ENDIF}
procedure preferredSize(var PreferredWidth, PreferredHeight: integer; WithThemeSpace: Boolean); override; procedure preferredSize(var PreferredWidth, PreferredHeight: integer; WithThemeSpace: Boolean); override;
public public
procedure AttachEvents; override; procedure AttachEvents; override;
@ -469,7 +471,9 @@ type
protected protected
function CreateWidget(const AParams: TCreateParams):QWidgetH; override; function CreateWidget(const AParams: TCreateParams):QWidgetH; override;
public public
{$IFNDEF USE_QT_44}
destructor Destroy; override; destructor Destroy; override;
{$ENDIF}
function CheckState: QtCheckState; function CheckState: QtCheckState;
procedure setCheckState(state: QtCheckState); procedure setCheckState(state: QtCheckState);
procedure setColor(const Value: PQColor); override; procedure setColor(const Value: PQColor); override;
@ -488,7 +492,9 @@ type
protected protected
function CreateWidget(const AParams: TCreateParams):QWidgetH; override; function CreateWidget(const AParams: TCreateParams):QWidgetH; override;
public public
{$IFNDEF USE_QT_44}
destructor Destroy; override; destructor Destroy; override;
{$ENDIF}
procedure setColor(const Value: PQColor); override; procedure setColor(const Value: PQColor); override;
public public
procedure AttachEvents; override; procedure AttachEvents; override;
@ -501,7 +507,9 @@ type
protected protected
function CreateWidget(const AParams: TCreateParams):QWidgetH; override; function CreateWidget(const AParams: TCreateParams):QWidgetH; override;
public public
{$IFNDEF USE_QT_44}
destructor Destroy; override; destructor Destroy; override;
{$ENDIF}
function getText: WideString; override; function getText: WideString; override;
procedure setText(const W: WideString); override; procedure setText(const W: WideString); override;
end; end;
@ -3776,6 +3784,7 @@ end;
Params: None Params: None
Returns: Nothing Returns: Nothing
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
{$IFNDEF USE_QT_44}
destructor TQtPushButton.Destroy; destructor TQtPushButton.Destroy;
begin begin
{$ifdef VerboseQt} {$ifdef VerboseQt}
@ -3791,6 +3800,7 @@ begin
inherited Destroy; inherited Destroy;
end; end;
{$ENDIF}
procedure TQtPushButton.preferredSize(var PreferredWidth, procedure TQtPushButton.preferredSize(var PreferredWidth,
PreferredHeight: integer; WithThemeSpace: Boolean); PreferredHeight: integer; WithThemeSpace: Boolean);
@ -4293,6 +4303,7 @@ end;
Params: None Params: None
Returns: Nothing Returns: Nothing
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
{$IFNDEF USE_QT_44}
destructor TQtCheckBox.Destroy; destructor TQtCheckBox.Destroy;
begin begin
{$ifdef VerboseQt} {$ifdef VerboseQt}
@ -4308,6 +4319,7 @@ begin
inherited Destroy; inherited Destroy;
end; end;
{$ENDIF}
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
Function: TQtCheckBox.CheckState Function: TQtCheckBox.CheckState
@ -4386,6 +4398,7 @@ end;
Params: None Params: None
Returns: Nothing Returns: Nothing
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
{$IFNDEF USE_QT_44}
destructor TQtRadioButton.Destroy; destructor TQtRadioButton.Destroy;
begin begin
{$ifdef VerboseQt} {$ifdef VerboseQt}
@ -4401,6 +4414,7 @@ begin
inherited Destroy; inherited Destroy;
end; end;
{$ENDIF}
procedure TQtRadioButton.setColor(const Value: PQColor); procedure TQtRadioButton.setColor(const Value: PQColor);
var var
@ -4452,6 +4466,7 @@ end;
Params: None Params: None
Returns: Nothing Returns: Nothing
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
{$IFNDEF USE_QT_44}
destructor TQtGroupBox.Destroy; destructor TQtGroupBox.Destroy;
begin begin
{$ifdef VerboseQt} {$ifdef VerboseQt}
@ -4467,6 +4482,7 @@ begin
inherited Destroy; inherited Destroy;
end; end;
{$ENDIF}
function TQtGroupBox.getText: WideString; function TQtGroupBox.getText: WideString;
begin begin
@ -6243,11 +6259,17 @@ var
ev: QEventH; ev: QEventH;
str: WideString; str: WideString;
begin begin
BeginEventProcessing;
BeginEventProcessing;
Result := False; Result := False;
QEvent_accept(Event); QEvent_accept(Event);
if LCLObject = nil then
begin
EndEventProcessing;
exit;
end;
if (FDropList <> nil) and (Sender = FDropList.Widget) then if (FDropList <> nil) and (Sender = FDropList.Widget) then
begin begin
case QEvent_type(Event) of case QEvent_type(Event) of