From e2a0a4de4c98590763d446b75070acb105929302 Mon Sep 17 00:00:00 2001 From: Mariano Reingart Date: Wed, 24 Dec 2014 20:02:57 +0000 Subject: [PATCH] Match the wxQT wxColour with public interface Now the type of the value returned by Red, Green, Blue and Alpha methods are consistent with wxGTK and wxMSW. This could fix ticket #16713 (symbols exported) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/qt/colour.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/qt/colour.h b/include/wx/qt/colour.h index e218753b2d..9e8d999120 100644 --- a/include/wx/qt/colour.h +++ b/include/wx/qt/colour.h @@ -20,10 +20,10 @@ public: virtual bool IsOk() const { return m_qtColor.isValid(); } - virtual ChannelType Red() const { return m_qtColor.red(); } - virtual ChannelType Green() const { return m_qtColor.green(); } - virtual ChannelType Blue() const { return m_qtColor.blue(); } - virtual ChannelType Alpha() const { return m_qtColor.alpha(); } + unsigned char Red() const { return m_qtColor.red(); } + unsigned char Green() const { return m_qtColor.green(); } + unsigned char Blue() const { return m_qtColor.blue(); } + unsigned char Alpha() const { return m_qtColor.alpha(); } bool operator==(const wxColour& color) const { return m_qtColor == color.m_qtColor; }