From b07955410099423c9d3e77fe8e144c20295a04f9 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <7330332+a-wi@users.noreply.github.com>
Date: Mon, 30 May 2022 19:07:08 +0200
Subject: [PATCH] Fix wxPropertyGrid classes build without implicit wxString
 encoding

Ensure that all headers in wx/propgrid can be compiled with
wxNO_IMPLICIT_WXSTRING_ENCODING defined.

Closes #22102.
---
 include/wx/propgrid/propgridiface.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h
index 2500b14e11..0070c9218f 100644
--- a/include/wx/propgrid/propgridiface.h
+++ b/include/wx/propgrid/propgridiface.h
@@ -55,12 +55,14 @@ public:
         wxCHECK( m_isProperty, NULL );
         return m_property;
     }
+#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
     wxPGPropArgCls( const char* str )
     {
         m_name = str;
         m_property = NULL;
         m_isProperty = false;
     }
+#endif // !wxNO_IMPLICIT_WXSTRING_ENCODING
     wxPGPropArgCls( const wchar_t* str )
     {
         m_name = str;
@@ -906,11 +908,13 @@ public:
         SetPropertyValueString( id, wxString(value) );
     }
 
+#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
     // Sets value (char*) of a property.
     void SetPropertyValue( wxPGPropArg id, const char* value )
     {
         SetPropertyValueString( id, wxString(value) );
     }
+#endif // !wxNO_IMPLICIT_WXSTRING_ENCODING
 
     // Sets value (string) of a property.
     void SetPropertyValue( wxPGPropArg id, const wxString& value )