Require wxWidgets 3.2
Removes old defines and work arounds for earlier wx versions and adds a CMake requirement to use at least 3.2 (or the minimum matching wxPython version)
This commit is contained in:
@@ -393,7 +393,6 @@ bool FIELD_VALIDATOR::Validate( wxWindow* aParent )
|
||||
{
|
||||
wxArrayString badCharsFound;
|
||||
|
||||
#if wxCHECK_VERSION( 3, 1, 3 )
|
||||
for( const wxUniCharRef& excludeChar : GetCharExcludes() )
|
||||
{
|
||||
if( val.Find( excludeChar ) != wxNOT_FOUND )
|
||||
@@ -410,24 +409,6 @@ bool FIELD_VALIDATOR::Validate( wxWindow* aParent )
|
||||
badCharsFound.Add( wxString::Format( wxT( "'%c'" ), excludeChar ) );
|
||||
}
|
||||
}
|
||||
#else
|
||||
for( const wxString& excludeChar : GetExcludes() )
|
||||
{
|
||||
if( val.Find( excludeChar ) != wxNOT_FOUND )
|
||||
{
|
||||
if( excludeChar == wxT( "\r" ) )
|
||||
badCharsFound.Add( _( "carriage return" ) );
|
||||
else if( excludeChar == wxT( "\n" ) )
|
||||
badCharsFound.Add( _( "line feed" ) );
|
||||
else if( excludeChar == wxT( "\t" ) )
|
||||
badCharsFound.Add( _( "tab" ) );
|
||||
else if( excludeChar == wxT( " " ) )
|
||||
badCharsFound.Add( _( "space" ) );
|
||||
else
|
||||
badCharsFound.Add( wxString::Format( wxT( "'%s'" ), excludeChar ) );
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
wxString badChars;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user