From: Paul Cornett Date: Mon, 28 Sep 2009 15:36:06 +0000 (+0000) Subject: linking fix for wxUSE_VALIDATORS==0 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/53c43278a9d71e15f43cbe359abea50d3775d8ad 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 77ecc238ee..4bc4d1c086 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -1644,10 +1644,9 @@ wxFileProperty::wxFileProperty( const wxString& label, const wxString& name, wxFileProperty::~wxFileProperty() {} -#if wxUSE_VALIDATORS - wxValidator* wxFileProperty::GetClassValidator() { +#if wxUSE_VALIDATORS 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) +#else + return NULL; +#endif } wxValidator* wxFileProperty::DoGetValidator() const @@ -1672,8 +1674,6 @@ wxValidator* wxFileProperty::DoGetValidator() const return GetClassValidator(); } -#endif - void wxFileProperty::OnSetValue() { const wxString& fnstr = m_value.GetString();