From 703adba7e3e8399c9bb703d64b9a167d3e3da451 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sat, 10 Nov 2018 09:41:04 -0600 Subject: [PATCH] Associate correct events with the combobox->choice change. --- lib/Slic3r/GUI/OptionsGroup/Field.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/Slic3r/GUI/OptionsGroup/Field.pm b/lib/Slic3r/GUI/OptionsGroup/Field.pm index 021e35c67..7ff4a1924 100644 --- a/lib/Slic3r/GUI/OptionsGroup/Field.pm +++ b/lib/Slic3r/GUI/OptionsGroup/Field.pm @@ -217,7 +217,7 @@ extends 'Slic3r::GUI::OptionsGroup::Field::wxWindow'; use List::Util qw(first); use Wx qw(:misc :combobox); -use Wx::Event qw(EVT_COMBOBOX EVT_TEXT); +use Wx::Event qw(EVT_CHOICE EVT_COMBOBOX EVT_TEXT); sub BUILD { my ($self) = @_; @@ -227,17 +227,20 @@ sub BUILD { if (defined $self->option->gui_type && $self->option->gui_type ne 'select_open') { $field = Wx::Choice->new($self->parent, -1, wxDefaultPosition, $self->_default_size, $self->option->labels || $self->option->values || [], $style); + EVT_CHOICE($self->parent, $field, sub { + $self->_on_change($self->option->opt_id); + }); } else { $field = Wx::ComboBox->new($self->parent, -1, "", wxDefaultPosition, $self->_default_size, $self->option->labels || $self->option->values || [], $style); + EVT_COMBOBOX($self->parent, $field, sub { + $self->_on_change($self->option->opt_id); + }); } $self->wxWindow($field); $self->set_value($self->option->default); - EVT_COMBOBOX($self->parent, $field, sub { - $self->_on_change($self->option->opt_id); - }); EVT_TEXT($self->parent, $field, sub { $self->_on_change($self->option->opt_id); });