diff options
author | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2011-05-04 00:02:35 +0200 |
---|---|---|
committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2011-05-04 00:02:35 +0200 |
commit | f26ff1b582e247d3061e190839592cfb53234aeb (patch) | |
tree | c559a10a58dc25d1759a26eeaa0018116adb70bc | |
parent | 1399b49682e7ef99777e5ced4cf84e9e6aefeddd (diff) | |
download | fpGUI-f26ff1b582e247d3061e190839592cfb53234aeb.tar.xz |
Call methods from fpgStyle directly.
Seeing that we already use a few methods directly from fpgStyle, lets change
all the others to be consistent.
-rw-r--r-- | src/gui/fpg_button.pas | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/fpg_button.pas b/src/gui/fpg_button.pas index e16e12f3..51dedd0c 100644 --- a/src/gui/fpg_button.pas +++ b/src/gui/fpg_button.pas @@ -563,16 +563,16 @@ begin begin clr := fpgColorToRGB(clButtonFace); fpgSetNamedColor(clButtonface, FBackgroundColor); - Canvas.DrawButtonFace(r, lBtnFlags); + fpgStyle.DrawButtonFace(Canvas, r, lBtnFlags); fpgSetNamedColor(clButtonface, clr); end else - Canvas.DrawButtonFace(r, lBtnFlags); + fpgStyle.DrawButtonFace(Canvas, r, lBtnFlags); if FFocused and (not FEmbedded) then begin InflateRect(r, -3, -3); - Canvas.DrawFocusRect(r); + fpgStyle.DrawFocusRect(Canvas, r); end; Canvas.SetTextColor(FTextColor); @@ -586,7 +586,7 @@ begin else offset := Point(0, 0); - CalculatePositions (ix, iy, tx, ty); + CalculatePositions(ix, iy, tx, ty); if FShowImage and Assigned(FImage) then begin @@ -621,7 +621,7 @@ begin lTextFlags := [txtHCenter, txtVCenter{, txtWrap}]; if not Enabled then lTextFlags += [txtDisabled]; - Canvas.DrawText(r, Text, lTextFlags); + Canvas.DrawText(r, Text, lTextFlags); { DrawText does use fpgStyle } end else fpgStyle.DrawString(Canvas, tx+offset.x, ty+offset.y, Text, Enabled); |