From 84fb5f38be0dcdf7f098255860a56311d32fe45e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 17 Apr 2020 23:25:30 +0200
Subject: [PATCH] Don't call wxVariant::MakeNull() unnecessary

Simplify recently added code in wxDataViewModel::Compare().

No real changes.
---
 src/common/datavcmn.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index bfdd3b7ca6..cc0b60c1c6 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -334,8 +334,13 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
                               unsigned int column, bool ascending ) const
 {
     wxVariant value1,value2;
-    HasValue(item1, column) ? GetValue( value1, item1, column ) : value1.MakeNull();
-    HasValue(item2, column) ? GetValue( value2, item2, column ) : value2.MakeNull();
+
+    // Avoid calling GetValue() for the cells that are not supposed to have any
+    // value, this might be unexpected.
+    if ( HasValue(item1, column) )
+        GetValue( value1, item1, column );
+    if ( HasValue(item2, column) )
+        GetValue( value2, item2, column );
 
     if (!ascending)
     {