From 89713215427da69555327dd48cc6349e76771a8d Mon Sep 17 00:00:00 2001
From: Ilya Sinitsyn <the_siv@mail.ru>
Date: Mon, 30 Sep 2019 23:36:31 +0700
Subject: [PATCH] Send the autosize column event for grid native header columns

Send wxEVT_GRID_COL_AUTO_SIZE on double clicking on a separator line of
the grid native header to allow override default behaviour.
---
 include/wx/generic/grid.h         |  2 ++
 include/wx/generic/private/grid.h |  6 ++----
 src/generic/grid.cpp              | 19 ++++++++++++-------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index e9d3d1652d..c16fdec83c 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -2404,6 +2404,8 @@ private:
                                    wxGridColLabelWindow* colLabelWin);
     void ProcessCornerLabelMouseEvent(wxMouseEvent& event);
 
+    void HandleColumnAutosize(int col, const wxMouseEvent& event);
+
     void DoColHeaderClick(int col);
 
     void DoStartResizeCol(int col);
diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h
index 23177c7b81..a050da3c6f 100644
--- a/include/wx/generic/private/grid.h
+++ b/include/wx/generic/private/grid.h
@@ -191,11 +191,9 @@ private:
     }
 
     // override to implement column auto sizing
-    virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) wxOVERRIDE
+    virtual bool UpdateColumnWidthToFit(unsigned int idx, int WXUNUSED(widthTitle)) wxOVERRIDE
     {
-        // TODO: currently grid doesn't support computing the column best width
-        //       from its contents so we just use the best label width as is
-        GetOwner()->SetColSize(idx, widthTitle);
+        GetOwner()->HandleColumnAutosize(idx, GetDummyMouseEvent());
 
         return true;
     }
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 06462eeb2e..852eabf884 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3874,13 +3874,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event, wxGridColLabelWindo
         }
         else
         {
-            // adjust column width depending on label text
-            //
-            // TODO: generate RESIZING event, see #10754
-            if ( !SendGridSizeEvent(wxEVT_GRID_COL_AUTO_SIZE, -1, colEdge, event) )
-                AutoSizeColLabelSize( colEdge );
-
-            SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, colEdge, event);
+            HandleColumnAutosize(colEdge, event);
 
             ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, colLabelWin);
             m_dragLastPos = -1;
@@ -4023,6 +4017,17 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
     }
 }
 
+void wxGrid::HandleColumnAutosize(int col, const wxMouseEvent& event)
+{
+    // adjust column width depending on label text
+    //
+    // TODO: generate RESIZING event, see #10754
+    if ( !SendGridSizeEvent(wxEVT_GRID_COL_AUTO_SIZE, -1, col, event) )
+        AutoSizeColLabelSize(col);
+
+    SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, col, event);
+}
+
 void wxGrid::CancelMouseCapture()
 {
     // cancel operation currently in progress, whatever it is