Qt: disable automatic setAutoFillBackground() for TQtPage,TQtTabWidget,TQtScrollbar and others for qt >= 4.6.0

git-svn-id: trunk@26380 -
This commit is contained in:
zeljko 2010-07-01 07:18:20 +00:00
parent 597d5aa030
commit 0dee08ed14

View File

@ -5236,7 +5236,8 @@ begin
else else
Parent := nil; Parent := nil;
Result := QFrame_create(Parent); Result := QFrame_create(Parent);
QWidget_setAutoFillBackground(Result, True); if (QtVersionMajor = 4) and (QtVersionMinor < 6) then
QWidget_setAutoFillBackground(Result, True);
QWidget_setAttribute(Result, QtWA_NoMousePropagation); QWidget_setAttribute(Result, QtWA_NoMousePropagation);
end; end;
@ -5695,7 +5696,8 @@ begin
Parent := nil; Parent := nil;
Result := QScrollBar_create(Parent); Result := QScrollBar_create(Parent);
QWidget_setFocusPolicy(Result, QtNoFocus); QWidget_setFocusPolicy(Result, QtNoFocus);
QWidget_setAutoFillBackground(Result, True); if (QtVersionMajor = 4) and (QtVersionMinor < 6) then
QWidget_setAutoFillBackground(Result, True);
FHasPaint := True; FHasPaint := True;
end; end;
@ -6651,7 +6653,8 @@ begin
{$ifdef darwin} {$ifdef darwin}
QTabWidget_setUsesScrollButtons(QTabWidgetH(Result), True); QTabWidget_setUsesScrollButtons(QTabWidgetH(Result), True);
{$endif} {$endif}
QWidget_setAutoFillBackground(Result, True); if (QtVersionMajor = 4) and (QtVersionMinor < 6) then
QWidget_setAutoFillBackground(Result, True);
end; end;
destructor TQtTabWidget.Destroy; destructor TQtTabWidget.Destroy;
@ -9756,7 +9759,8 @@ begin
else else
Parent := nil; Parent := nil;
Result := QTableView_create(Parent); Result := QTableView_create(Parent);
QWidget_setAutoFillBackground(Result, True); if (QtVersionMajor = 4) and (QtVersionMinor < 6) then
QWidget_setAutoFillBackground(Result, True);
end; end;
function TQtTableView.verticalHeader: TQtHeaderView; function TQtTableView.verticalHeader: TQtHeaderView;
@ -10460,7 +10464,8 @@ begin
else else
Parent := nil; Parent := nil;
Result := QStatusBar_create(Parent); Result := QStatusBar_create(Parent);
QWidget_setAutoFillBackground(Result, True); if (QtVersionMajor = 4) and (QtVersionMinor < 6) then
QWidget_setAutoFillBackground(Result, True);
Widget := Result; Widget := Result;
end; end;
@ -10839,7 +10844,8 @@ begin
if (LCLObject is TScrollingWinControl) then if (LCLObject is TScrollingWinControl) then
begin begin
if not (csDesigning in LCLObject.ComponentState) then if (QtVersionMajor = 4) and (QtVersionMinor < 6) and
not (csDesigning in LCLObject.ComponentState) then
QWidget_setAutoFillBackground(Result, True); QWidget_setAutoFillBackground(Result, True);
FChildOfComplexWidget := ccwScrollingWinControl; FChildOfComplexWidget := ccwScrollingWinControl;
end else end else
@ -11555,7 +11561,8 @@ begin
else else
Parent := nil; Parent := nil;
Result := QWidget_create(Parent); Result := QWidget_create(Parent);
QWidget_setAutoFillBackground(Result, True); if (QtVersionMajor = 4) and (QtVersionMinor < 6) then
QWidget_setAutoFillBackground(Result, True);
QWidget_setAttribute(Result, QtWA_NoMousePropagation); QWidget_setAttribute(Result, QtWA_NoMousePropagation);
end; end;