Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialize image list positions in ctor

Browse Source 
Also add a comment explaining how these indices work.
This commit is contained in:
Vadim Zeitlin
2020-02-07 17:52:54 +01:00
parent d0fb1c973e
commit bd90e484cb
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ribbon/buttonbar.cpp
View File

@@ -67,6 +67,12 @@ public:
class wxRibbonButtonBarButtonBase class wxRibbonButtonBarButtonBase
{ {
public: public:
wxRibbonButtonBarButtonBase()
{
barButtonImageListPos =
barButtonSmallImageListPos = -1;
}
wxRibbonButtonBarButtonInstance NewInstance() wxRibbonButtonBarButtonInstance NewInstance()
{ {
wxRibbonButtonBarButtonInstance i; wxRibbonButtonBarButtonInstance i;
@@ -128,8 +134,14 @@ public:
wxBitmap bitmap_small; wxBitmap bitmap_small;
wxBitmap bitmap_small_disabled; wxBitmap bitmap_small_disabled;
wxCoord text_min_width[3]; 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; int barButtonImageListPos;
// Same thing for the small bitmap index in the small image list.
int barButtonSmallImageListPos; int barButtonSmallImageListPos;
wxRibbonButtonBarButtonSizeInfo sizes[3]; wxRibbonButtonBarButtonSizeInfo sizes[3];
wxRibbonButtonBarButtonState min_size_class; wxRibbonButtonBarButtonState min_size_class;
wxRibbonButtonBarButtonState max_size_class; wxRibbonButtonBarButtonState max_size_class;
@@ -367,11 +379,6 @@ wxRibbonButtonBarButtonBase* wxRibbonButtonBar::InsertButton(
buttonSmallImageList->Add(base->bitmap_small_disabled); buttonSmallImageList->Add(base->bitmap_small_disabled);
base->bitmap_small_disabled = wxNullBitmap; base->bitmap_small_disabled = wxNullBitmap;
} }
else
{
base->barButtonImageListPos = -1;
base->barButtonSmallImageListPos = -1;
}
wxClientDC temp_dc(this); wxClientDC temp_dc(this);
FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_SMALL, temp_dc); FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_SMALL, temp_dc);