Mercurial > ecos-v3_0-branch

changeset 2841:0baca166fd8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* standalone/wxwin/configitem.cpp, standalone/wxwin/configitem.h: Initialise 'modifiable' member variable in alternative constructor. [ Bugzilla 1000705 ]
author jld
date Tue, 03 Mar 2009 10:21:39 +0000
parents ae70bb12da5b
children 0c230453dd02
files host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/configitem.cpp host/tools/configtool/standalone/wxwin/configitem.h
diffstat 3 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-03  John Dallaway  <john@dallaway.org.uk>
+
+	* standalone/wxwin/configitem.cpp, standalone/wxwin/configitem.h:
+	Initialise 'modifiable' member variable in alternative constructor.
+	[ Bugzilla 1000705 ]
+
 2009-02-27  John Dallaway  <john@dallaway.org.uk>
 
 	* standalone/wxwin/configtooldoc.cpp: Limit backtrace length to 64 in
--- 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();
--- 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();