Fix for #6692 - Slice button not appearing after infill change

This commit is contained in:
Oleksandra Yushchenko 2021-08-10 12:32:00 +02:00 committed by GitHub
parent c0a00f4e70
commit ed25d5c53d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 32 deletions

View file

@ -342,6 +342,8 @@ public:
class Choice : public Field {
using Field::Field;
bool bKilledFocus = false;
public:
Choice(const ConfigOptionDef& opt, const t_config_option_key& id) : Field(opt, id) {}
Choice(wxWindow* parent, const ConfigOptionDef& opt, const t_config_option_key& id) : Field(parent, opt, id) {}
@ -349,6 +351,8 @@ public:
wxWindow* window{ nullptr };
void BUILD() override;
// Propagate value from field to the OptionGroupe and Config after kill_focus/ENTER
void propagate_value();
/* Under OSX: wxBitmapComboBox->GetWindowStyle() returns some weard value,
* so let use a flag, which has TRUE value for a control without wxCB_READONLY style