# HG changeset patch # User jld # Date 1236075582 0 # Node ID 5a11571c4ed08352ff9e5ec551e54e8746eedd6e # Parent 7e4011e5ffbbb508e028330d6917d79c8394a469 * standalone/wxwin/configitem.cpp, standalone/wxwin/configitem.h: Initialise 'modifiable' member variable in alternative constructor. [ Bugzilla 1000705 ] diff --git a/host/tools/configtool/ChangeLog b/host/tools/configtool/ChangeLog --- a/host/tools/configtool/ChangeLog +++ b/host/tools/configtool/ChangeLog @@ -1,3 +1,9 @@ +2009-03-03 John Dallaway + + * standalone/wxwin/configitem.cpp, standalone/wxwin/configitem.h: + Initialise 'modifiable' member variable in alternative constructor. + [ Bugzilla 1000705 ] + 2009-02-27 John Dallaway * standalone/wxwin/configtooldoc.cpp: Limit backtrace length to 64 in diff --git a/host/tools/configtool/standalone/wxwin/configitem.cpp b/host/tools/configtool/standalone/wxwin/configitem.cpp --- a/host/tools/configtool/standalone/wxwin/configitem.cpp +++ b/host/tools/configtool/standalone/wxwin/configitem.cpp @@ -78,7 +78,7 @@ IMPLEMENT_CLASS(ecConfigItem, wxObject) ecConfigItem::ecConfigItem(ecConfigItem* parent, const wxString& name, ecConfigType ctype, ecOptionFlavor flavor, ecOptionType otype, - bool active, bool enabled, ecUIHint hint) + bool active, bool enabled, bool modifiable, ecUIHint hint) { m_CdlItem = NULL; m_name = name; @@ -87,6 +87,7 @@ ecConfigItem::ecConfigItem(ecConfigItem* m_optionFlavor = flavor; m_enabled = enabled; m_active = active; + m_modifiable = modifiable; m_parent = parent; m_hint = hint; m_treeItem = wxTreeItemId(); diff --git a/host/tools/configtool/standalone/wxwin/configitem.h b/host/tools/configtool/standalone/wxwin/configitem.h --- a/host/tools/configtool/standalone/wxwin/configitem.h +++ b/host/tools/configtool/standalone/wxwin/configitem.h @@ -141,7 +141,7 @@ public: // enabled: only if this is a Bool or BoolData: whether enabled/disabled (checked/unchecked) ecConfigItem(ecConfigItem* parent, const wxString& name, ecConfigType ctype = ecConfigTypeNone, ecOptionFlavor flavor = ecFlavorNone, ecOptionType otype = ecOptionTypeNone, - bool active = TRUE, bool enabled = TRUE, ecUIHint hint = ecHintNone); + bool active = TRUE, bool enabled = TRUE, bool modifiable = TRUE, ecUIHint hint = ecHintNone); ecConfigItem(ecConfigItem* parent, CdlUserVisible vitem); ~ecConfigItem();