From bf97715972fb05adf2df10c27571dd1e1b62f1c3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Nov 2018 18:35:07 +0100
Subject: [PATCH] Support NULL column in wxDataViewCtrl::GetItemRect() in wxOSX

Emulate support for non-specified column by using the first and, if
necessary, last columns in this case.
---
 interface/wx/dataview.h  |  4 +---
 src/osx/dataview_osx.cpp | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 85bc40acdb..a001760b05 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -1462,9 +1462,7 @@ public:
             intersection of the item with the specified column. If @NULL, the
             rectangle spans all the columns.
 
-        @note This method is currently not implemented at all in wxGTK and only
-              implemented for non-@NULL @a col argument in wxOSX. It is fully
-              implemented in the generic version of the control.
+        @note This method is currently not implemented in wxGTK.
     */
     virtual wxRect GetItemRect(const wxDataViewItem& item,
                                const wxDataViewColumn* col = NULL) const;
diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp
index f49a360dc6..57a1cf3970 100644
--- a/src/osx/dataview_osx.cpp
+++ b/src/osx/dataview_osx.cpp
@@ -547,10 +547,24 @@ wxDataViewColumn *wxDataViewCtrl::GetCurrentColumn() const
 
 wxRect wxDataViewCtrl::GetItemRect(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) const
 {
-  if (item.IsOk() && (columnPtr != NULL))
-    return GetDataViewPeer()->GetRectangle(item,columnPtr);
-  else
-    return wxRect();
+  if ( !item.IsOk() )
+      return wxRect();
+
+  wxRect rect = GetDataViewPeer()->GetRectangle(item, columnPtr ? columnPtr : GetColumn(0));
+
+  if ( !columnPtr )
+  {
+      const unsigned columnCount = GetColumnCount();
+      if ( columnCount != 1 )
+      {
+          // Extend the rectangle to the rightmost part of the last column.
+          const wxRect rectLastCol = GetDataViewPeer()->GetRectangle(item, GetColumn(columnCount - 1));
+          rect.SetRight(rectLastCol.GetRight());
+      }
+      //else: We already have the rectangle we need.
+  }
+
+  return rect;
 }
 
 int wxDataViewCtrl::GetSelectedItemsCount() const