diff options
| author | MenTaLguY <mental@rydia.net> | 2008-07-17 23:43:18 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2008-07-17 23:43:18 +0000 |
| commit | 124c7ab325aa97430c9def1c35c940c2aea5945e (patch) | |
| tree | 3d06f3910f20be97e8f15b287d796a16e746e7f0 /src/ui | |
| parent | convert all SPCurve's points and matrices arguments and return types to 2Geom (diff) | |
| download | inkscape-124c7ab325aa97430c9def1c35c940c2aea5945e.tar.gz inkscape-124c7ab325aa97430c9def1c35c940c2aea5945e.zip | |
fix initialization order of FilterEffectDialog fields, per bug #249514
(bzr r6340)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/filter-effects-dialog.cpp | 6 | ||||
| -rw-r--r-- | src/ui/dialog/filter-effects-dialog.h | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 2cec40860..836eb8fd4 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -2086,15 +2086,15 @@ int FilterEffectsDialog::PrimitiveList::primitive_count() const FilterEffectsDialog::FilterEffectsDialog() : UI::Widget::Panel("", "dialogs.filtereffects", SP_VERB_DIALOG_FILTER_EFFECTS), - _filter_modifier(*this), - _primitive_list(*this), _add_primitive_type(FPConverter), _add_primitive(_("Add Effect:")), _empty_settings(_("No effect selected"), Gtk::ALIGN_LEFT), _no_filter_selected(_("No filter selected"), Gtk::ALIGN_LEFT), _settings_initialized(false), _locked(false), - _attr_lock(false) + _attr_lock(false), + _filter_modifier(*this), + _primitive_list(*this) { _settings = new Settings(*this, _settings_tab1, sigc::mem_fun(*this, &FilterEffectsDialog::set_attr_direct), NR_FILTER_ENDPRIMITIVETYPE); diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h index 16d684dd4..9e39de2bb 100644 --- a/src/ui/dialog/filter-effects-dialog.h +++ b/src/ui/dialog/filter-effects-dialog.h @@ -223,16 +223,12 @@ private: void update_color_matrix(); void update_primitive_infobox(); - // Filter effect selection - FilterModifier _filter_modifier; - // Primitives Info Box Gtk::Label _infobox_desc; Gtk::Image _infobox_icon; // View/add primitives Gtk::VBox _primitive_box; - PrimitiveList _primitive_list; UI::Widget::ComboBoxEnum<NR::FilterPrimitiveType> _add_primitive_type; Gtk::Button _add_primitive; @@ -268,6 +264,11 @@ private: bool _locked; bool _attr_lock; + // These go last since they depend on the prior initialization of + // other FilterEffectsDialog members + FilterModifier _filter_modifier; + PrimitiveList _primitive_list; + FilterEffectsDialog(FilterEffectsDialog const &d); FilterEffectsDialog& operator=(FilterEffectsDialog const &d); }; |