[[ Bug 13100 ]] Added few forgotten flag setting (which was causing 'Development->Test' to be displayed as 'Development->Simulate')

livecodesebastien · livecodesebastien · commit 331620112ab3 · 2014-08-07T17:38:20.000+01:00
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -3444,6 +3444,7 @@ class ButtonMenuCallback : public IParseMenuCallback
 			if (width > bstack[stackdepth].maxwidth)
 				bstack[stackdepth].maxwidth = width;
 			MCValueAssign(newbutton->label, p_menuitem->label);
+			newbutton -> flags |= F_LABEL;
 		}
 		return false;
 	}
@@ -3609,6 +3610,7 @@ void MCButton::openmenu(Boolean grab)
 												  MCRangeMake(t_offset, t_new_offset - t_offset),
 												  &t_label);
 			MCValueAssign(label, *t_label);
+			flags |= F_LABEL;
 			message_with_valueref_args(MCM_menu_pick, *t_label);
 		}
 		return;
diff --git a/engine/src/exec-interface-group.cpp b/engine/src/exec-interface-group.cpp
@@ -290,6 +290,7 @@ void MCGroup::GetLabel(MCExecContext& ctxt, MCStringRef& r_label)
 void MCGroup::SetLabel(MCExecContext& ctxt, MCStringRef p_label)
 {
 	MCValueAssign(label, p_label);
+	flags |= F_LABEL;
 	Redraw();
 }
 
diff --git a/engine/src/group.cpp b/engine/src/group.cpp
@@ -3128,12 +3128,6 @@ IO_stat MCGroup::save(IO_handle stream, uint4 p_part, bool p_force_ext)
 {
 	IO_stat stat;
 	
-	// Update the "has label" flag
-	if (!MCStringIsEmpty(label))
-		flags |= F_LABEL;
-	else
-		flags &= ~F_LABEL;
-	
 	if ((stat = IO_write_uint1(OT_GROUP, stream)) != IO_NORMAL)
 		return stat;
     

Original file line number	Diff line number	Diff line change
`@@ -3444,6 +3444,7 @@ class ButtonMenuCallback : public IParseMenuCallback`
`3444`	`3444`	`if (width > bstack[stackdepth].maxwidth)`
`3445`	`3445`	`bstack[stackdepth].maxwidth = width;`
`3446`	`3446`	`MCValueAssign(newbutton->label, p_menuitem->label);`
	`3447`	`+ newbutton -> flags \|= F_LABEL;`
`3447`	`3448`	`}`
`3448`	`3449`	`return false;`
`3449`	`3450`	`}`
`@@ -3609,6 +3610,7 @@ void MCButton::openmenu(Boolean grab)`
`3609`	`3610`	`MCRangeMake(t_offset, t_new_offset - t_offset),`
`3610`	`3611`	`&t_label);`
`3611`	`3612`	`MCValueAssign(label, *t_label);`
	`3613`	`+ flags \|= F_LABEL;`
`3612`	`3614`	`message_with_valueref_args(MCM_menu_pick, *t_label);`
`3613`	`3615`	`}`
`3614`	`3616`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,7 @@ void MCGroup::GetLabel(MCExecContext& ctxt, MCStringRef& r_label)`
`290`	`290`	`void MCGroup::SetLabel(MCExecContext& ctxt, MCStringRef p_label)`
`291`	`291`	`{`
`292`	`292`	`MCValueAssign(label, p_label);`
	`293`	`+ flags \|= F_LABEL;`
`293`	`294`	`Redraw();`
`294`	`295`	`}`
`295`	`296`