From c79d86d6a6df2d728d4a83090201c0a41ee34223 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Thu, 15 Feb 2018 19:57:17 -0330 Subject: [PATCH] Fixed minor compile warnings with gcc 7. --- src/gui/RadioButtonWidget.cxx | 2 +- src/gui/Widget.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/RadioButtonWidget.cxx b/src/gui/RadioButtonWidget.cxx index e0549ee1d..01a15ebaf 100644 --- a/src/gui/RadioButtonWidget.cxx +++ b/src/gui/RadioButtonWidget.cxx @@ -164,7 +164,7 @@ void RadioButtonWidget::drawWidget(bool hilite) // Draw the inner bounding circle with enabled color s.drawBitmap(radio_img_innercircle, _x + 1, _y + _boxY + 1, isEnabled() - ? _bgcolor : kColor, 12, 12); + ? _bgcolor : uInt32(kColor), 12, 12); // draw state if(_state) diff --git a/src/gui/Widget.cxx b/src/gui/Widget.cxx index 89d3c61af..9ef59b53f 100644 --- a/src/gui/Widget.cxx +++ b/src/gui/Widget.cxx @@ -621,8 +621,8 @@ void CheckboxWidget::drawWidget(bool hilite) if(_drawBox) s.frameRect(_x, _y + _boxY, 14, 14, hilite && isEnabled() && isEditable() ? kWidColorHi : kColor); // Do we draw a square or cross? - s.fillRect(_x + 1, _y + _boxY + 1, 12, 12, _changed ? kDbgChangedColor - : isEnabled() ? _bgcolor : kColor); + s.fillRect(_x + 1, _y + _boxY + 1, 12, 12, _changed ? uInt32(kDbgChangedColor) + : isEnabled() ? _bgcolor : uInt32(kColor)); if(_state) s.drawBitmap(_img, _x + 2, _y + _boxY + 2, isEnabled() ? hilite && isEditable() ? kWidColorHi : kCheckColor : kColor, 10);