From ccc0835d0266869b5295a0923b37cacb71b9e61b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 9 Dec 2011 15:58:40 +0000 Subject: [PATCH] Rename wxRichToolTipPopup::SetBackground() method to avoid warnings in wxUniv. wxUniv has SetBackground() in wxWindow so rename this one to SetBackgroundColours() to avoid g++ warning about hiding a base class virtual. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/richtooltipg.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generic/richtooltipg.cpp b/src/generic/richtooltipg.cpp index 2cbce1e6fd..b3e4709ac9 100644 --- a/src/generic/richtooltipg.cpp +++ b/src/generic/richtooltipg.cpp @@ -170,7 +170,7 @@ public: Layout(); } - void SetBackground(wxColour colStart, wxColour colEnd) + void SetBackgroundColours(wxColour colStart, wxColour colEnd) { if ( !colStart.IsOk() ) { @@ -651,7 +651,7 @@ void wxRichToolTipGenericImpl::ShowFor(wxWindow* win) m_titleFont ); - popup->SetBackground(m_colStart, m_colEnd); + popup->SetBackgroundColours(m_colStart, m_colEnd); popup->DoShow();