From 429d9d8dfcb482cff9c8b8098be08407bb87957d Mon Sep 17 00:00:00 2001
From: Jorge Moraleda <jorge.moraleda@gmail.com>
Date: Tue, 14 Apr 2020 17:43:51 -0700
Subject: [PATCH] Use null as value when sorting items in a DataView control by
 a column for which the item does not have a value.

---
 src/common/datavcmn.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 76073485e1..bfdd3b7ca6 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -334,8 +334,8 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
                               unsigned int column, bool ascending ) const
 {
     wxVariant value1,value2;
-    GetValue( value1, item1, column );
-    GetValue( value2, item2, column );
+    HasValue(item1, column) ? GetValue( value1, item1, column ) : value1.MakeNull();
+    HasValue(item2, column) ? GetValue( value2, item2, column ) : value2.MakeNull();
 
     if (!ascending)
     {