From 155b24daea81f2891d4f4d4e11ae690c4bb92c36 Mon Sep 17 00:00:00 2001
From: ali kettab <aliket1435@gmail.com>
Date: Thu, 5 Oct 2023 12:21:46 +0100
Subject: [PATCH] Fix gridtest test failing under wxQt

---
 tests/controls/gridtest.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp
index f7cd2517c9..78041b2a8e 100644
--- a/tests/controls/gridtest.cpp
+++ b/tests/controls/gridtest.cpp
@@ -1923,6 +1923,20 @@ public:
     virtual void SetValue( int /*row*/, int /*col*/, const wxString& /*value*/ ) override { }
 };
 
+// Under wxQt, we get spurious paint events if we call Refresh+Update.
+// So just call Refresh+wxYield which seems to fix the failures in the
+// test below.
+inline void UpdateGrid(wxGrid* grid)
+{
+#ifndef __WXQT__
+    grid->Refresh();
+    grid->Update();
+#else
+    grid->Refresh();
+    wxYield();
+#endif
+}
+
 } // namespace SetTable_ClearAttrCache
 
 TEST_CASE_METHOD(GridTestCase, "Grid::SetTable_ClearAttrCache", "[grid]")
@@ -1941,15 +1955,13 @@ TEST_CASE_METHOD(GridTestCase, "Grid::SetTable_ClearAttrCache", "[grid]")
 
     drawCount1 = drawCount2 = 0;
     m_grid->SetTable(&table2);
-    m_grid->Refresh();
-    m_grid->Update();
+    UpdateGrid(m_grid);
     CHECK(drawCount1 == 0);
     CHECK(drawCount2 == 2*2);
 
     drawCount1 = drawCount2 = 0;
     m_grid->SetTable(&table1);
-    m_grid->Refresh();
-    m_grid->Update();
+    UpdateGrid(m_grid);
     CHECK(drawCount1 == 1*1);
     CHECK(drawCount2 == 0);