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

Qt: fixed compilation and range check crashes with TColorRef

Browse Source 
git-svn-id: trunk@29718 -
This commit is contained in:
zeljko 2011-03-03 15:23:38 +00:00
parent b88c6577a4
commit a2e292da52
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/qt/qtobjects.pas
View File

@ -2843,7 +2843,7 @@ begin
Write('TQtDeviceContext.setBKColor() ');
{$endif}
Result := GetBkColor;
ColorRefToTQColor(ColorToRGB(Color), NColor);
ColorRefToTQColor(TColorRef(ColorToRGB(TColor(Color))), NColor);
BackgroundBrush.setColor(@NColor);
end;

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

@ -465,7 +465,7 @@ begin
// set brush color
Color := QBrush_Color(QtBrush.Widget)^;
ColorRefToTQColor(ColorToRGB(logBrush.lbColor), Color);
ColorRefToTQColor(TColorRef(ColorToRGB(TColor(logBrush.lbColor))), Color);
QBrush_setColor(QtBrush.Widget, @Color);
except
{$ifdef VerboseQtWinAPI}
@ -701,7 +701,7 @@ begin
end;
QPen_Color(QtPen.Widget, @Color);
ColorRefToTQColor(ColorToRGB(lopnColor), Color);
ColorRefToTQColor(TColorRef(ColorToRGB(TColor(lopnColor))), Color);
QPen_setColor(QtPen.Widget, @Color);
end;
@ -1023,7 +1023,7 @@ var
begin
APen := TQtPen.Create(True);
ColorRefToTQColor(ColorLeftTop, EdgeQtColor);
ColorRefToTQColor(TColorRef(ColorLeftTop), EdgeQtColor);
APen.setColor(EdgeQtColor);
OldPen := QtDC.setPen(APen);
@ -1036,7 +1036,7 @@ var
APen.Free;
APen := TQtPen.Create(True);
ColorRefToTQColor(ColorRightBottom, EdgeQtColor);
ColorRefToTQColor(TColorRef(ColorRightBottom), EdgeQtColor);
APen.setColor(EdgeQtColor);
OldPen := QtDC.SetPen(APen);
@ -1051,7 +1051,7 @@ var
begin
APen := TQtPen.Create(True);
ColorRefToTQColor(ColorLeftTop, EdgeQtColor);
ColorRefToTQColor(TColorRef(ColorLeftTop), EdgeQtColor);
APen.setColor(EdgeQtColor);
OldPen := QtDC.setPen(APen);
@ -1111,7 +1111,7 @@ begin
if grfFlags and BF_MIDDLE <> 0 then
begin
Brush := CreateSolidBrush(clBtnFace);
Brush := CreateSolidBrush(TColorRef(clBtnFace));
try
FillRect(DC, ClientRect, Brush);
finally
@ -1652,7 +1652,7 @@ begin
QtPen.setDashPattern(lpStyle, dwStyleCount);
QPen_Color(QtPen.Widget, @Color);
ColorRefToTQColor(ColorToRGB(lplb.lbColor), Color);
ColorRefToTQColor(TColorRef(ColorToRGB(TColor(lplb.lbColor))), Color);
QPen_setColor(QtPen.Widget, @Color);
Result := HPEN(QtPen);
@ -3143,7 +3143,7 @@ function TQtWidgetSet.GetSysColorBrush(nIndex: Integer): HBrush;
else
Result := FSysColorBrushes[nIndex];
Color := QBrush_Color(TQtBrush(Result).Widget)^;
ColorRefToTQColor(ColorToRGB(AColor), Color);
ColorRefToTQColor(TColorRef(ColorToRGB(AColor)), Color);
QBrush_setColor(TQtBrush(Result).Widget, @Color);
TQtBrush(Result).FShared := True;
end;
@ -3527,7 +3527,7 @@ begin
if IsValidDC(DC) then
begin
QtDC := TQtDeviceContext(DC);
ColorRefToTQColor(QtDC.vTextColor, Color);
ColorRefToTQColor(TColorRef(QtDC.vTextColor), Color);
TQColorToColorRef(Color, Result);
end;
end;
@ -4843,7 +4843,7 @@ begin
Exit;
end;
Result := TQtDeviceContext(DC).SetBkColor(Color);
Result := TQtDeviceContext(DC).SetBkColor(TColorRef(Color));
end;
{------------------------------------------------------------------------------
@ -5502,7 +5502,7 @@ begin
exit;
end;
result := TQtDeviceContext(DC).vTextColor;
TQtDeviceContext(DC).vTextColor := ColorToRGB(Color); // be sure we get TColorRef
TQtDeviceContext(DC).vTextColor := ColorToRGB(TColor(Color)); // be sure we get TColorRef
end;
{------------------------------------------------------------------------------

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

@ -681,7 +681,7 @@ begin
QColor_fromRgba(PQColor(AQtColor), ARgb);
try
QColor_toRgb(AQtColor, @AQColor);
TQColorToColorRef(AQColor, AColor);
TQColorToColorRef(AQColor, TColorRef(AColor));
ColorDialog.Color := AColor;
finally
QColor_destroy(AQtColor);