From 2c81be72eef5363736cf1892646c74a3311ee4c1 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 17:03:17 -0400 Subject: add upstream 11.21 --- wx+/image_holder.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wx+/image_holder.h') diff --git a/wx+/image_holder.h b/wx+/image_holder.h index 32f8a863..89021045 100644 --- a/wx+/image_holder.h +++ b/wx+/image_holder.h @@ -56,8 +56,8 @@ struct FileIconHolder //- what about G_IS_FILE_ICON(gicon), G_IS_LOADABLE_ICON(gicon)? => may block! => do NOT convert on main thread! (no big deal: doesn't seem to occur in practice) FileIconHolder() {}; - FileIconHolder(GIcon* gi, int maxSz) : //takes ownership! - gicon(gi), + FileIconHolder(GIcon* icon, int maxSz) : //takes ownership! + gicon(icon), maxSize(maxSz) {} struct GiconFree { void operator()(GIcon* icon) const { ::g_object_unref(icon); } }; -- cgit