Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warning about hiding a virtual function in propgrid sample.

Browse Source 
The virtual ColourToString() method was hidden and not overridden in the
sample because it didn't use the last argument of the base class method.

Fix this in the most straightforward (albeit not necessarily the most correct)
way to at least ensure that the function is really overridden.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-06-30 12:20:29 +00:00
parent 99ef43728a
commit bb504ee3c3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/propgrid/tests.cpp
View File

@@ -88,12 +88,14 @@ public:
return wxColour(); return wxColour();
} }
virtual wxString ColourToString( const wxColour& col, int index ) const virtual wxString ColourToString( const wxColour& col,
int index,
int argFlags = 0 ) const
{ {
if ( index == (int)(m_choices.GetCount()-1) ) if ( index == (int)(m_choices.GetCount()-1) )
return wxT(""); return wxT("");
return wxColourProperty::ColourToString(col, index); return wxColourProperty::ColourToString(col, index, argFlags);
} }
virtual int GetCustomColourIndex() const virtual int GetCustomColourIndex() const