From bd90e484cbe3e3df5b5a803af4b6dc7fb17ea803 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 7 Feb 2020 17:52:54 +0100
Subject: [PATCH] Initialize image list positions in ctor

Also add a comment explaining how these indices work.
---
 src/ribbon/buttonbar.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp
index 5c48cf4307..1be572a54e 100644
--- a/src/ribbon/buttonbar.cpp
+++ b/src/ribbon/buttonbar.cpp
@@ -67,6 +67,12 @@ public:
 class wxRibbonButtonBarButtonBase
 {
 public:
+    wxRibbonButtonBarButtonBase()
+    {
+        barButtonImageListPos =
+        barButtonSmallImageListPos = -1;
+    }
+
     wxRibbonButtonBarButtonInstance NewInstance()
     {
         wxRibbonButtonBarButtonInstance i;
@@ -128,8 +134,14 @@ public:
     wxBitmap bitmap_small;
     wxBitmap bitmap_small_disabled;
     wxCoord text_min_width[3];
+
+    // Index of the bitmap in the wxRibbonBar normal image list. Notice that
+    // the disabled bitmap is in the next position, so this one is always even.
     int barButtonImageListPos;
+
+    // Same thing for the small bitmap index in the small image list.
     int barButtonSmallImageListPos;
+
     wxRibbonButtonBarButtonSizeInfo sizes[3];
     wxRibbonButtonBarButtonState min_size_class;
     wxRibbonButtonBarButtonState max_size_class;
@@ -367,11 +379,6 @@ wxRibbonButtonBarButtonBase* wxRibbonButtonBar::InsertButton(
         buttonSmallImageList->Add(base->bitmap_small_disabled);
         base->bitmap_small_disabled = wxNullBitmap;
     }
-    else
-    {
-        base->barButtonImageListPos = -1;
-        base->barButtonSmallImageListPos = -1;
-    }
 
     wxClientDC temp_dc(this);
     FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_SMALL, temp_dc);