From 97655e5b2154121cf3d0503385063c7bc157a4c4 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 13 Oct 2020 10:25:19 -0700
Subject: [PATCH] Don't invalidate wxStaticBitmap best size unless bitmap size
 changes

This is what wxMSW does. See #18943
---
 src/gtk/statbmp.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index 6ab16b6a41..82657ba562 100644
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -56,11 +56,17 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
 
 void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 {
+    const wxSize sizeOld(m_bitmap.IsOk() ? m_bitmap.GetSize() : wxSize());
+    const wxSize sizeNew(bitmap.IsOk() ? bitmap.GetSize() : wxSize());
+
     m_bitmap = bitmap;
     WX_GTK_IMAGE(m_widget)->Set(bitmap);
 
-    InvalidateBestSize();
-    SetSize(GetBestSize());
+    if (sizeNew != sizeOld)
+    {
+        InvalidateBestSize();
+        SetSize(GetBestSize());
+    }
 }
 
 // static