From 81cd35a6629e1e1f37a63081c33e730bce40fa4f Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <7330332+a-wi@users.noreply.github.com>
Date: Fri, 6 Jan 2023 17:21:54 +0200
Subject: [PATCH] Get rid of unused member variables

---
 include/wx/propgrid/propgrid.h     | 31 ------------------------------
 include/wx/propgrid/propgriddefs.h |  4 ----
 2 files changed, 35 deletions(-)

diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 96d62ecdcb..4fe6b701de 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -64,8 +64,6 @@ public:
     wxVector<wxValidator*>  m_arrValidators; // These wxValidators need to be freed
 #endif
 
-    wxPGHashMapS2P      m_dictPropertyClassInfo; // PropertyName -> ClassInfo
-
     wxPGChoices*        m_fontFamilyChoices;
 
     // Replace with your own to affect all properties using default renderer.
@@ -89,18 +87,6 @@ public:
 #endif // WXWIN_COMPATIBILITY_3_0
 
     // Cached constant strings
-#if WXWIN_COMPATIBILITY_3_0
-    wxPGCachedString    m_strstring;
-    wxPGCachedString    m_strlong;
-    wxPGCachedString    m_strbool;
-    wxPGCachedString    m_strlist;
-
-    wxPGCachedString    m_strDefaultValue;
-    wxPGCachedString    m_strMin;
-    wxPGCachedString    m_strMax;
-    wxPGCachedString    m_strUnits;
-    wxPGCachedString    m_strHint;
-#else
     const wxString      m_strstring;
     const wxString      m_strlong;
     const wxString      m_strbool;
@@ -111,7 +97,6 @@ public:
     const wxString      m_strMax;
     const wxString      m_strUnits;
     const wxString      m_strHint;
-#endif // WXWIN_COMPATIBILITY_3_0
 
     // If true then some things are automatically translated
     bool                m_autoGetTranslation;
@@ -1579,10 +1564,6 @@ protected:
     unsigned char       m_dragStatus;
 
 #if WXWIN_COMPATIBILITY_3_0
-    // Unused variable.
-    // 0 = margin, 1 = label, 2 = value.
-    unsigned char       m_mouseSide;
-
     // True when editor control is focused.
     unsigned char       m_editorFocused;
 #else
@@ -1591,12 +1572,6 @@ protected:
 
     unsigned char       m_vspacing;
 
-#if WXWIN_COMPATIBILITY_3_0
-    // Unused variable.
-    // Used to track when Alt/Ctrl+Key was consumed.
-    unsigned char       m_keyComboConsumed;
-#endif
-
     // 1 if in DoPropertyChanged()
     bool                m_inDoPropertyChanged;
 
@@ -1616,12 +1591,6 @@ protected:
     // Internal flags - see wxPG_FL_XXX constants.
     wxUint32            m_iFlags;
 
-#if WXWIN_COMPATIBILITY_3_0
-    // Unused variable.
-    // When drawing next time, clear this many item slots at the end.
-    int                 m_clearThisMany;
-#endif
-
     // Mouse is hovering over this column (index), -1 for margin
     int                 m_colHover;
 
diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h
index 825f3c19b3..f0e9d01c18 100644
--- a/include/wx/propgrid/propgriddefs.h
+++ b/include/wx/propgrid/propgriddefs.h
@@ -260,10 +260,6 @@ WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(wxPGProperty*, wxArrayPGProperty,
                                   wxBaseArrayPtrVoid,
                                   class WXDLLIMPEXP_PROPGRID);
 
-WX_DECLARE_STRING_HASH_MAP_WITH_DECL(void*,
-                                     wxPGHashMapS2P,
-                                     class WXDLLIMPEXP_PROPGRID);
-
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxString,
                                      wxPGHashMapS2S,
                                      class WXDLLIMPEXP_PROPGRID);