diff --git a/include/wx/generic/private/rowheightcache.h b/include/wx/generic/private/rowheightcache.h
index 768edd4687..9136a3863c 100644
--- a/include/wx/generic/private/rowheightcache.h
+++ b/include/wx/generic/private/rowheightcache.h
@@ -131,6 +131,7 @@ WX_DECLARE_HASH_MAP(unsigned int, RowRanges*, wxIntegerHash, wxIntegerEqual,
 class WXDLLIMPEXP_CORE HeightCache
 {
 public:
+    ~HeightCache();
     bool GetLineStart(unsigned int row, int& start);
     bool GetLineHeight(unsigned int row, int& height);
     bool GetLineAt(int y, unsigned int& row);
diff --git a/src/generic/rowheightcache.cpp b/src/generic/rowheightcache.cpp
index 21529bccb6..3eb0e68a24 100644
--- a/src/generic/rowheightcache.cpp
+++ b/src/generic/rowheightcache.cpp
@@ -325,3 +325,8 @@ void HeightCache::Clear()
     }
     m_heightToRowRange.clear();
 }
+
+HeightCache::~HeightCache()
+{
+    Clear();
+}