linking fix for wxUSE_VALIDATORS==0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 77ecc238ee5b00fa9fe2a5c60b0d485059eda1a0..4bc4d1c0862f817d2bde6400ac4ebf9aa1ed7c78 100644 (file)
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -1644,10 +1644,9 @@ wxFileProperty::wxFileProperty( const wxString& label, const wxString& name,
 
 wxFileProperty::~wxFileProperty() {}
 
 
 wxFileProperty::~wxFileProperty() {}
 

-#if wxUSE_VALIDATORS
-

 wxValidator* wxFileProperty::GetClassValidator()
 {
 wxValidator* wxFileProperty::GetClassValidator()
 {

+#if wxUSE_VALIDATORS

     WX_PG_DOGETVALIDATOR_ENTRY()
 
     // Atleast wxPython 2.6.2.1 required that the string argument is given
     WX_PG_DOGETVALIDATOR_ENTRY()
 
     // Atleast wxPython 2.6.2.1 required that the string argument is given


@@ -1665,6 +1664,9 @@ wxValidator* wxFileProperty::GetClassValidator()
     validator->SetExcludes(exChars);
 
     WX_PG_DOGETVALIDATOR_EXIT(validator)
     validator->SetExcludes(exChars);
 
     WX_PG_DOGETVALIDATOR_EXIT(validator)

+#else
+    return NULL;
+#endif

 }
 
 wxValidator* wxFileProperty::DoGetValidator() const
 }
 
 wxValidator* wxFileProperty::DoGetValidator() const


@@ -1672,8 +1674,6 @@ wxValidator* wxFileProperty::DoGetValidator() const
     return GetClassValidator();
 }
 
     return GetClassValidator();
 }
 

-#endif
-

 void wxFileProperty::OnSetValue()
 {
     const wxString& fnstr = m_value.GetString();
 void wxFileProperty::OnSetValue()
 {
     const wxString& fnstr = m_value.GetString();