Author: Ben Stack Date: 2020-06-21 16:45 -0400 Message: Use the following command to get this old contents. Zenju must be using some newer definition of -std=c++2a than what Devuan Ceres provides as of 2020-05-17, and probably wxwidgets. This is the 10.23 code for these files. git checkout b4ecf755 wx+/choice_enum.h Unfortunately with the removal of the wxWidgets-gtk2 code from Debian, we are stuck using all available at approximately November 1, 2019 snapshot of Debian: https://snapshot.debian.org/archive/debian/20191101T211023Z/pool/main/w/wxwidgets3.0/ libwxbase3.0-0v5_3.0.4+dfsg-14_amd64.deb libwxbase3.0-0v5_3.0.4+dfsg-14_i386.deb libwxbase3.0-dev_3.0.4+dfsg-14_amd64.deb libwxbase3.0-dev_3.0.4+dfsg-14_i386.deb libwxgtk3.0-0v5_3.0.4+dfsg-14_amd64.deb libwxgtk3.0-0v5_3.0.4+dfsg-14_i386.deb libwxgtk3.0-dev_3.0.4+dfsg-14_amd64.deb libwxgtk3.0-dev_3.0.4+dfsg-14_i386.deb wx3.0-headers_3.0.4+dfsg-14_all.deb wx-common_3.0.4+dfsg-14_amd64.deb wx-common_3.0.4+dfsg-14_i386.deb diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/wx+/choice_enum.h --- 10.24-0/wx+/choice_enum.h 2020-05-17 18:30:59.441499418 -0400 +++ 10.24-1/wx+/choice_enum.h 2020-05-17 18:53:59.893685507 -0400 @@ -7,7 +7,6 @@ #ifndef CHOICE_ENUM_H_132413545345687 #define CHOICE_ENUM_H_132413545345687 -#include #include #include @@ -44,11 +43,8 @@ descrList.push_back({ value, { text, tooltip } }); return *this; } - using DescrList = std::vector>>; DescrList descrList; - - std::unordered_map> itemsSetLast; }; template void setEnumVal(const EnumDescrList& mapping, wxChoice& ctrl, Enum value); template Enum getEnumVal(const EnumDescrList& mapping, const wxChoice& ctrl); @@ -69,34 +65,26 @@ //--------------- impelementation ------------------------------------------- template -void setEnumVal(EnumDescrList& mapping, wxChoice& ctrl, Enum value) +void setEnumVal(const EnumDescrList& mapping, wxChoice& ctrl, Enum value) { - auto& itemsSetLast = mapping.itemsSetLast[&ctrl]; + ctrl.Clear(); - std::vector items; + int selectedPos = 0; for (auto it = mapping.descrList.begin(); it != mapping.descrList.end(); ++it) - items.push_back(it->second.first); - - if (items != itemsSetLast) { - ctrl.Set(items); //expensive as fuck! => only call when absolutely needed! - itemsSetLast = std::move(items); + ctrl.Append(it->second.first); + if (it->first == value) + { + selectedPos = it - mapping.descrList.begin(); + + if (it->second.second.empty()) + ctrl.UnsetToolTip(); + else + ctrl.SetToolTip(it->second.second); + } } - //----------------------------------------------------------------- - - const auto it = std::find_if(mapping.descrList.begin(), mapping.descrList.end(), [&](const auto& mapItem) { return mapItem.first == value; }); - if (it != mapping.descrList.end()) - { - if (const wxString& tooltip = it->second.second; - !tooltip.empty()) - ctrl.SetToolTip(tooltip); - else - ctrl.UnsetToolTip(); - const int selectedPos = it - mapping.descrList.begin(); - ctrl.SetSelection(selectedPos); - } - else assert(false); + ctrl.SetSelection(selectedPos); } template @@ -115,17 +103,11 @@ template void updateTooltipEnumVal(const EnumDescrList& mapping, wxChoice& ctrl) { - const int selectedPos = ctrl.GetSelection(); + const Enum currentValue = getEnumVal(mapping, ctrl); - if (0 <= selectedPos && selectedPos < static_cast(mapping.descrList.size())) - { - if (const auto& [text, tooltip] = mapping.descrList[selectedPos].second; - !tooltip.empty()) - ctrl.SetToolTip(tooltip); - else - ctrl.UnsetToolTip(); - } - else assert(false); + for (const auto& [enumValue, textAndTooltip] : mapping.descrList) + if (currentValue == enumValue) + ctrl.SetToolTip(textAndTooltip.second); } }