From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 30 Jun 2011 12:20:29 +0000 (+0000)
Subject: Fix warning about hiding a virtual function in propgrid sample.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bb504ee3c3b04fa624c72b2aeb7cc25a4ad68262

Fix warning about hiding a virtual function in propgrid sample.

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
---

diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp
index d6fe0d2fd1..d432334cb5 100644
--- a/samples/propgrid/tests.cpp
+++ b/samples/propgrid/tests.cpp
@@ -88,12 +88,14 @@ public:
         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) )
             return wxT("");
 
-        return wxColourProperty::ColourToString(col, index);
+        return wxColourProperty::ColourToString(col, index, argFlags);
     }
 
     virtual int GetCustomColourIndex() const