From 6abf507923a9c73475437e61ac33bf5efeaa735a Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Fri, 14 Jun 2019 22:16:44 +0200
Subject: [PATCH] Get rid of unused variables

---
 include/wx/propgrid/propgrid.h          |  9 ---------
 include/wx/propgrid/propgridpagestate.h |  6 ------
 src/propgrid/propgrid.cpp               |  4 ----
 src/propgrid/propgridpagestate.cpp      | 11 -----------
 4 files changed, 30 deletions(-)

diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 6e061dce36..4ea3a3de82 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -1500,12 +1500,6 @@ protected:
     // Current non-client width (needed when auto-centering).
     int                 m_ncWidth;
 
-    // Non-client width (auto-centering helper).
-    //int                 m_fWidth;
-
-    // Previously recorded scroll start position.
-    int                 m_prevVY;
-
     // The gutter spacing in front and back of the image.
     // This determines the amount of spacing in front of each item
     int                 m_gutterWidth;
@@ -1613,9 +1607,6 @@ protected:
     bool                m_editorFocused;
 #endif
 
-    // 1 if m_latsCaption is also the bottommost caption.
-    //unsigned char       m_lastCaptionBottomnest;
-
     unsigned char       m_vspacing;
 
 #if WXWIN_COMPATIBILITY_3_0
diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h
index 4285352d94..abbe39fc73 100644
--- a/include/wx/propgrid/propgridpagestate.h
+++ b/include/wx/propgrid/propgridpagestate.h
@@ -661,9 +661,6 @@ protected:
     unsigned int                m_virtualHeight;
 
 #if WXWIN_COMPATIBILITY_3_0
-    // 1 if m_lastCaption is also the bottommost caption.
-    unsigned char               m_lastCaptionBottomnest;
-
     // 1 items appended/inserted, so stuff needs to be done before drawing;
     // If m_virtualHeight == 0, then calcylatey's must be done.
     // Otherwise just sort.
@@ -674,9 +671,6 @@ protected:
 
     unsigned char               m_vhCalcPending;
 #else
-    // True if m_lastCaption is also the bottommost caption.
-    bool                        m_lastCaptionBottomnest;
-
     // True: items appended/inserted, so stuff needs to be done before drawing;
     // If m_virtualHeight == 0, then calcylatey's must be done.
     // Otherwise just sort.
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index e8d6ba5edf..0563e5a49e 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -400,8 +400,6 @@ void wxPropertyGrid::Init1()
     m_iconWidth = wxPG_ICON_WIDTH;
 #endif
 
-    m_prevVY = -1;
-
     m_gutterWidth = wxPG_GUTTER_MIN;
     m_subgroup_extramargin = 10;
 
@@ -2658,8 +2656,6 @@ void wxPropertyGrid::Clear()
 
     m_propHover = NULL;
 
-    m_prevVY = 0;
-
     RecalculateVirtualSize();
 
     // Need to clear some area at the end
diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp
index c79472b299..ec6908c9b6 100644
--- a/src/propgrid/propgridpagestate.cpp
+++ b/src/propgrid/propgridpagestate.cpp
@@ -208,7 +208,6 @@ wxPropertyGridPageState::wxPropertyGridPageState()
     m_currentCategory = NULL;
     m_width = 0;
     m_virtualHeight = 0;
-    m_lastCaptionBottomnest = true;
     m_itemsAdded = false;
     m_anyModified = false;
     m_vhCalcPending = false;
@@ -313,7 +312,6 @@ void wxPropertyGridPageState::DoClear()
         m_dictName.clear();
 
         m_currentCategory = NULL;
-        m_lastCaptionBottomnest = true;
         m_itemsAdded = false;
 
         m_virtualHeight = 0;
@@ -1772,15 +1770,6 @@ wxPGProperty* wxPropertyGridPageState::DoInsert( wxPGProperty* parent, int index
             m_abcArray->DoAddChild( property, index, true );
     }
 
-    // category stuff
-    if ( property->IsCategory() )
-    {
-        // This is a category caption item.
-
-        // Last caption is not the bottom one (this info required by append)
-        m_lastCaptionBottomnest = false;
-    }
-
     // Only add name to hashmap if parent is root or category
     if ( !property->GetBaseName().empty() &&
         (parentIsCategory || parentIsRoot) )