X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c51a665c649f7579fb39e62070cef4f66b3210d..740dd154a58a385d55718d254f5fedd416776af5:/samples/propgrid/tests.cpp diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp index 96b90ba23f..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 @@ -1392,7 +1394,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive ) s = wxString::Format(wxT("%i tests failed!!!"), failures); #ifdef __WXDEBUG__ else - s = wxString::Format(wxT("All tests were successfull, but there were %i warnings!"), wxPGGlobalVars->m_warnings); + s = wxString::Format(wxT("All tests were successful, but there were %i warnings!"), wxPGGlobalVars->m_warnings); #endif RT_MSG(s) for ( i=0; i