diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index dd4b2a86c8..59a5391dad 100644
--- a/include/wx/propgrid/props.h
+++ b/include/wx/propgrid/props.h
@@ -162,13 +162,22 @@ constexpr wxPGNumericValidationMode wxPG_PROPERTY_VALIDATION_WRAP { wxPGNumericV
 class WXDLLIMPEXP_PROPGRID wxNumericPropertyValidator : public wxTextValidator
 {
 public:
-    enum NumericType
+    enum class NumericType
     {
-        Signed = 0,
+        Signed,
         Unsigned,
         Float
     };
 
+#if WXWIN_COMPATIBILITY_3_2
+    wxDEPRECATED_MSG("use NumericType::Signed instead")
+    static const NumericType Signed = NumericType::Signed;
+    wxDEPRECATED_MSG("use NumericType::Unsigned instead")
+    static const NumericType Unsigned = NumericType::Unsigned;
+    wxDEPRECATED_MSG("use NumericType::Float instead")
+    static const NumericType Float = NumericType::Float;
+#endif // WXWIN_COMPATIBILITY_3_2
+
     wxNumericPropertyValidator( NumericType numericType, int base = 10 );
     virtual ~wxNumericPropertyValidator() = default;
     virtual bool Validate(wxWindow* parent) override;
diff --git a/interface/wx/propgrid/props.h b/interface/wx/propgrid/props.h
index bed6dc08a9..16d9636b37 100644
--- a/interface/wx/propgrid/props.h
+++ b/interface/wx/propgrid/props.h
@@ -86,9 +86,9 @@ enum class wxPGNumericValidationMode
 class wxNumericPropertyValidator : public wxTextValidator
 {
 public:
-    enum NumericType
+    enum class NumericType
     {
-        Signed = 0,
+        Signed,
         Unsigned,
         Float
     };
diff --git a/samples/propgrid/sampleprops.cpp b/samples/propgrid/sampleprops.cpp
index 442cd5e363..d22b46cf75 100644
--- a/samples/propgrid/sampleprops.cpp
+++ b/samples/propgrid/sampleprops.cpp
@@ -632,7 +632,7 @@ wxValidator* wxArrayDoubleProperty::DoGetValidator() const
     WX_PG_DOGETVALIDATOR_ENTRY()
 
     wxTextValidator* validator =
-        new wxNumericPropertyValidator(wxNumericPropertyValidator::Float);
+        new wxNumericPropertyValidator(wxNumericPropertyValidator::NumericType::Float);
 
     // Accept also a delimiter and space character
     validator->AddCharIncludes(m_delimiter);
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 1b01d0e25a..fe6cb2c9b1 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -159,11 +159,11 @@ wxNumericPropertyValidator::
             style |= wxFILTER_DIGITS;
     }
 
-    if ( numericType == Signed )
+    if ( numericType == NumericType::Signed )
     {
         allowedChars += wxS("-+");
     }
-    else if ( numericType == Float )
+    else if ( numericType == NumericType::Float )
     {
         allowedChars += wxS("-+eE");
 
@@ -515,7 +515,7 @@ wxValidator* wxIntProperty::GetClassValidator()
     WX_PG_DOGETVALIDATOR_ENTRY()
 
     wxValidator* validator = new wxNumericPropertyValidator(
-                                    wxNumericPropertyValidator::Signed);
+                                    wxNumericPropertyValidator::NumericType::Signed);
 
     WX_PG_DOGETVALIDATOR_EXIT(validator)
 #else
@@ -776,7 +776,7 @@ wxValidator* wxUIntProperty::DoGetValidator() const
     WX_PG_DOGETVALIDATOR_ENTRY()
 
     wxValidator* validator = new wxNumericPropertyValidator(
-                                    wxNumericPropertyValidator::Unsigned,
+                                    wxNumericPropertyValidator::NumericType::Unsigned,
                                     m_realBase);
 
     WX_PG_DOGETVALIDATOR_EXIT(validator)
@@ -1006,7 +1006,7 @@ wxFloatProperty::GetClassValidator()
     WX_PG_DOGETVALIDATOR_ENTRY()
 
     wxValidator* validator = new wxNumericPropertyValidator(
-                                    wxNumericPropertyValidator::Float);
+                                    wxNumericPropertyValidator::NumericType::Float);
 
     WX_PG_DOGETVALIDATOR_EXIT(validator)
 #else