[[ Better themes ]] Add property getter hooks for themed properties

Fraser J. Gordon · Fraser J. Gordon · commit 7842074ae7a9 · 2014-11-07T16:53:35.000Z
diff --git a/engine/src/aclip.cpp b/engine/src/aclip.cpp
@@ -178,7 +178,7 @@ void MCAudioClip::timer(MCNameRef mptr, MCParameter *params)
 	}
 }
 
-Exec_stat MCAudioClip::getprop(uint4 parid, Properties which, MCExecPoint &ep, Boolean effective)
+Exec_stat MCAudioClip::getprop(uint4 parid, Properties which, MCExecPoint &ep, Boolean effective, bool recursive)
 {
 	switch (which)
 	{
@@ -198,7 +198,7 @@ Exec_stat MCAudioClip::getprop(uint4 parid, Properties which, MCExecPoint &ep, B
 		break;
 #endif /* MCAudioClip::getprop */ 
 	default:
-		return MCObject::getprop(parid, which, ep, effective);
+		return MCObject::getprop(parid, which, ep, effective, recursive);
 	}
 	return ES_NORMAL;
 }
diff --git a/engine/src/aclip.h b/engine/src/aclip.h
@@ -73,7 +73,7 @@ class MCAudioClip : public MCObject
 	virtual Chunk_term gettype() const;
 	virtual const char *gettypestring();
 	virtual void timer(MCNameRef mptr, MCParameter *params);
-	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
+	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
 	virtual Exec_stat setprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
 
 	virtual Boolean del();
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -1656,7 +1656,7 @@ void MCButton::setrect(const MCRectangle &nrect)
 	}
 }
 
-Exec_stat MCButton::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective)
+Exec_stat MCButton::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective, bool recursive)
 {
 	uint2 fheight;
 	uint2 j = 0;
@@ -1934,7 +1934,7 @@ Exec_stat MCButton::getprop(uint4 parid, Properties which, MCExecPoint& ep, Bool
         break;
 #endif /* MCButton::getprop */ 
 	default:
-		return MCControl::getprop(parid, which, ep, effective);
+		return MCControl::getprop(parid, which, ep, effective, recursive);
 	}
 	return ES_NORMAL;
 }
diff --git a/engine/src/button.h b/engine/src/button.h
@@ -177,7 +177,7 @@ class MCButton : public MCControl
 
 	virtual uint2 gettransient() const;
 	virtual void setrect(const MCRectangle &nrect);
-	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
+	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
 	virtual Exec_stat setprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
 	virtual void closemenu(Boolean kfocus, Boolean disarm);
 	
diff --git a/engine/src/card.cpp b/engine/src/card.cpp
@@ -924,7 +924,7 @@ void MCCard::timer(MCNameRef mptr, MCParameter *params)
 		MCObject::timer(mptr, params);
 }
 
-Exec_stat MCCard::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective)
+Exec_stat MCCard::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective, bool recursive)
 {
 	MCRectangle minrect;
 	uint2 num;
@@ -1065,7 +1065,7 @@ Exec_stat MCCard::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolea
 		return ES_ERROR;
 #endif /* MCCard::getprop */
 	default:
-		return MCObject::getprop(parid, which, ep, effective);
+		return MCObject::getprop(parid, which, ep, effective, recursive);
 	}
 	return ES_NORMAL;
 }
diff --git a/engine/src/card.h b/engine/src/card.h
@@ -71,7 +71,7 @@ class MCCard : public MCObject
 	virtual Boolean doubledown(uint2 which);
 	virtual Boolean doubleup(uint2 which);
 	virtual void timer(MCNameRef mptr, MCParameter *params);
-	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
+	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
 	virtual Exec_stat setprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
 
 	virtual Boolean del();
diff --git a/engine/src/control.cpp b/engine/src/control.cpp
@@ -385,7 +385,7 @@ uint2 MCControl::gettransient() const
 	return 0;
 }
 
-Exec_stat MCControl::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective)
+Exec_stat MCControl::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective, bool recursive)
 {
 	switch (which)
 	{
@@ -453,7 +453,7 @@ Exec_stat MCControl::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boo
 	break;
 #endif /* MCControl::getprop */ 
 	default:
-		return MCObject::getprop(parid, which, ep, effective);
+		return MCObject::getprop(parid, which, ep, effective, recursive);
 	}
 	return ES_NORMAL;
 }
diff --git a/engine/src/control.h b/engine/src/control.h
@@ -107,7 +107,7 @@ class MCControl : public MCObject
 	virtual uint2 gettransient() const;
 
 	// MW-2011-11-23: [[ Array Chunk Props ]] Add 'effective' param to arrayprop access.
-	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
+	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
 	virtual Exec_stat getarrayprop(uint4 parid, Properties which, MCExecPoint &, MCNameRef key, Boolean effective);
 	virtual Exec_stat setprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
 	virtual Exec_stat setarrayprop(uint4 parid, Properties which, MCExecPoint&, MCNameRef key, Boolean effective);
diff --git a/engine/src/cpalette.cpp b/engine/src/cpalette.cpp
@@ -174,7 +174,7 @@ Boolean MCColors::mup(uint2 which, bool p_release)
 	return True;
 }
 
-Exec_stat MCColors::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective)
+Exec_stat MCColors::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective, bool recursive)
 {
 	switch (which)
 	{
@@ -187,7 +187,7 @@ Exec_stat MCColors::getprop(uint4 parid, Properties which, MCExecPoint& ep, Bool
 		break;
 #endif /* MCColors::getprop */ 
 	default:
-		return MCControl::getprop(parid, which, ep, effective);
+		return MCControl::getprop(parid, which, ep, effective, recursive);
 	}
 	return ES_NORMAL;
 }
diff --git a/engine/src/cpalette.h b/engine/src/cpalette.h
@@ -35,7 +35,7 @@ class MCColors : public MCControl
 	virtual Boolean mfocus(int2 x, int2 y);
 	virtual Boolean mdown(uint2 which);
 	virtual Boolean mup(uint2 which, bool p_release);
-	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
+	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
 	virtual Exec_stat setprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
 	virtual Boolean count(Chunk_term type, MCObject *stop, uint2 &num);
 	// virtual functions from MCControl
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -131,7 +131,7 @@ bool MCDispatch::isdragtarget(void)
 	return m_drag_target;
 }
 
-Exec_stat MCDispatch::getprop(uint4 parid, Properties which, MCExecPoint &ep, Boolean effective)
+Exec_stat MCDispatch::getprop(uint4 parid, Properties which, MCExecPoint &ep, Boolean effective, bool recursive)
 {
 	switch (which)
 	{
diff --git a/engine/src/dispatch.h b/engine/src/dispatch.h
@@ -61,7 +61,7 @@ class MCDispatch : public MCObject
 	MCDispatch();
 	// virtual functions from MCObject
 	virtual ~MCDispatch();
-	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
+	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
 	virtual Exec_stat setprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
 	// dummy cut function for checking licensing
 	virtual Boolean cut(Boolean home);
diff --git a/engine/src/eps.cpp b/engine/src/eps.cpp
@@ -192,7 +192,7 @@ void MCEPS::setrect(const MCRectangle &nrect)
 		rect = nrect;
 }
 
-Exec_stat MCEPS::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective)
+Exec_stat MCEPS::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective, bool recursive)
 {
 	switch (which)
 	{
@@ -248,7 +248,7 @@ Exec_stat MCEPS::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean
 		break;
 #endif /* MCEPS::getprop */ 
 	default:
-		return MCControl::getprop(parid, which, ep, effective);
+		return MCControl::getprop(parid, which, ep, effective, recursive);
 	}
 	return ES_NORMAL;
 }
diff --git a/engine/src/eps.h b/engine/src/eps.h
@@ -51,7 +51,7 @@ class MCEPS : public MCControl
 	virtual Boolean mdown(uint2 which);
 	virtual Boolean mup(uint2 which, bool p_release);
 	virtual void setrect(const MCRectangle &nrect);
-	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
+	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
 	virtual Exec_stat setprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
 	// virtual functions from MCControl
 	IO_stat load(IO_handle stream, const char *version);
diff --git a/engine/src/field.cpp b/engine/src/field.cpp
@@ -1200,7 +1200,7 @@ void MCField::setrect(const MCRectangle &nrect)
         m_recompute = true;
 }
 
-Exec_stat MCField::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective)
+Exec_stat MCField::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective, bool recursive)
 {
 	switch (which)
 	{
@@ -1457,7 +1457,7 @@ Exec_stat MCField::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boole
 		return gettextatts(parid, P_ENCODING, ep, nil, False, 0, INT32_MAX, false);
 #endif /* MCField::getprop */ 
 	default:
-		return MCControl::getprop(parid, which, ep, effective);
+		return MCControl::getprop(parid, which, ep, effective, recursive);
 	}
 	return ES_NORMAL;
 }
diff --git a/engine/src/field.h b/engine/src/field.h
@@ -248,7 +248,7 @@ class MCField : public MCControl
 	virtual void select();
 	virtual uint2 gettransient() const;
 	virtual void setrect(const MCRectangle &nrect);
-	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
+	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
 	virtual Exec_stat setprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
 	virtual void undo(Ustruct *us);
 	virtual void recompute();
diff --git a/engine/src/graphic.cpp b/engine/src/graphic.cpp
@@ -462,7 +462,7 @@ void MCGraphic::setgradientrect(MCGradientFill *p_gradient, const MCRectangle &n
 	}
 }
 
-Exec_stat MCGraphic::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective)
+Exec_stat MCGraphic::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective, bool recursive)
 {
 	uint2 i;
 	int graphic_type;
@@ -775,7 +775,7 @@ Exec_stat MCGraphic::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boo
 		break;
 #endif /* MCGraphic::getprop */
 	default:
-		return MCControl::getprop(parid, which, ep, effective);
+		return MCControl::getprop(parid, which, ep, effective, recursive);
 	}
 	return ES_NORMAL;
 }
diff --git a/engine/src/graphic.h b/engine/src/graphic.h
@@ -89,7 +89,7 @@ class MCGraphic : public MCControl
 	virtual void setrect(const MCRectangle &nrect);
 
 	// MW-2011-11-23: [[ Array Chunk Props ]] Add 'effective' param to arrayprop access.
-	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
+	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
 	virtual Exec_stat getarrayprop(uint4 parid, Properties which, MCExecPoint &, MCNameRef key, Boolean effective);
 	virtual Exec_stat setprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
 	virtual Exec_stat setarrayprop(uint4 parid, Properties which, MCExecPoint&, MCNameRef key, Boolean effective);
diff --git a/engine/src/group.cpp b/engine/src/group.cpp
@@ -808,7 +808,7 @@ void MCGroup::setrect(const MCRectangle &nrect)
 	}
 }
 
-Exec_stat MCGroup::getprop(uint4 parid, Properties which, MCExecPoint &ep, Boolean effective)
+Exec_stat MCGroup::getprop(uint4 parid, Properties which, MCExecPoint &ep, Boolean effective, bool recursive)
 {
 	switch (which)
 	{
@@ -993,7 +993,7 @@ Exec_stat MCGroup::getprop(uint4 parid, Properties which, MCExecPoint &ep, Boole
         break;
 #endif
 	default:
-		return MCControl::getprop(parid, which, ep, effective);
+		return MCControl::getprop(parid, which, ep, effective, recursive);
 	}
 	return ES_NORMAL;
 }
diff --git a/engine/src/group.h b/engine/src/group.h
@@ -79,7 +79,7 @@ class MCGroup : public MCControl
 	virtual Boolean doubledown(uint2 which);
 	virtual Boolean doubleup(uint2 which);
 	virtual void setrect(const MCRectangle &nrect);
-	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
+	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
 	virtual Exec_stat setprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
 	virtual Boolean del();
 	virtual void recompute();
diff --git a/engine/src/image.cpp b/engine/src/image.cpp
@@ -621,7 +621,7 @@ void MCImageSetMask(MCImageBitmap *p_bitmap, uint8_t *p_mask_data, uindex_t p_ma
 	MCImageBitmapCheckTransparency(p_bitmap);
 }
 
-Exec_stat MCImage::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective)
+Exec_stat MCImage::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective, bool recursive)
 {
 	uint2 i;
 	uint4 size = 0;
@@ -918,7 +918,7 @@ Exec_stat MCImage::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boole
         break;
 #endif /* MCImage::getprop */
 	default:
-		return MCControl::getprop(parid, which, ep, effective);
+		return MCControl::getprop(parid, which, ep, effective, recursive);
 	}
 	return ES_NORMAL;
 }
diff --git a/engine/src/image.h b/engine/src/image.h
@@ -389,7 +389,7 @@ class MCImage : public MCControl
 	virtual Boolean doubleup(uint2 which);
 	virtual void timer(MCNameRef mptr, MCParameter *params);
 	virtual void setrect(const MCRectangle &nrect);
-	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
+	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
 	virtual Exec_stat setprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
 	virtual void select();
 	virtual void deselect();
diff --git a/engine/src/object.h b/engine/src/object.h
@@ -292,11 +292,14 @@ class MCObject : public MCDLlist
 	virtual void setrect(const MCRectangle &nrect);
 
 	// MW-2011-11-23: [[ Array Chunk Props ]] Add 'effective' param to arrayprop access.
-	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
+	virtual Exec_stat getprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
 	virtual Exec_stat getarrayprop(uint4 parid, Properties which, MCExecPoint &, MCNameRef key, Boolean effective);
 	virtual Exec_stat setprop(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
 	virtual Exec_stat setarrayprop(uint4 parid, Properties which, MCExecPoint&, MCNameRef key, Boolean effective);
 
+    // FG-2014-11-07: [[ Better theming ]] Gets a propery according to the native UI theme
+    virtual Exec_stat getsystemthemeprop(Properties which, MCExecPoint&);
+    
 	virtual void select();
 	virtual void deselect();
 	virtual Boolean del();
diff --git a/engine/src/objectprops.cpp b/engine/src/objectprops.cpp
diff --git a/engine/src/player-legacy.cpp b/engine/src/player-legacy.cpp
diff --git a/engine/src/player-legacy.h b/engine/src/player-legacy.h
diff --git a/engine/src/player-platform.cpp b/engine/src/player-platform.cpp
diff --git a/engine/src/player-platform.h b/engine/src/player-platform.h
diff --git a/engine/src/scrolbar.cpp b/engine/src/scrolbar.cpp
diff --git a/engine/src/scrolbar.h b/engine/src/scrolbar.h
diff --git a/engine/src/stack.cpp b/engine/src/stack.cpp
diff --git a/engine/src/stack.h b/engine/src/stack.h
diff --git a/engine/src/vclip.cpp b/engine/src/vclip.cpp
diff --git a/engine/src/vclip.h b/engine/src/vclip.h

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ void MCAudioClip::timer(MCNameRef mptr, MCParameter *params)`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`181`		`-Exec_stat MCAudioClip::getprop(uint4 parid, Properties which, MCExecPoint &ep, Boolean effective)`
	`181`	`+Exec_stat MCAudioClip::getprop(uint4 parid, Properties which, MCExecPoint &ep, Boolean effective, bool recursive)`
`182`	`182`	`{`
`183`	`183`	`switch (which)`
`184`	`184`	`{`
`@@ -198,7 +198,7 @@ Exec_stat MCAudioClip::getprop(uint4 parid, Properties which, MCExecPoint &ep, B`
`198`	`198`	`break;`
`199`	`199`	`#endif /* MCAudioClip::getprop */`
`200`	`200`	`default:`
`201`		`- return MCObject::getprop(parid, which, ep, effective);`
	`201`	`+ return MCObject::getprop(parid, which, ep, effective, recursive);`
`202`	`202`	`}`
`203`	`203`	`return ES_NORMAL;`
`204`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1656,7 +1656,7 @@ void MCButton::setrect(const MCRectangle &nrect)`
`1656`	`1656`	`}`
`1657`	`1657`	`}`
`1658`	`1658`
`1659`		`-Exec_stat MCButton::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective)`
	`1659`	`+Exec_stat MCButton::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective, bool recursive)`
`1660`	`1660`	`{`
`1661`	`1661`	`uint2 fheight;`
`1662`	`1662`	`uint2 j = 0;`
`@@ -1934,7 +1934,7 @@ Exec_stat MCButton::getprop(uint4 parid, Properties which, MCExecPoint& ep, Bool`
`1934`	`1934`	`break;`
`1935`	`1935`	`#endif /* MCButton::getprop */`
`1936`	`1936`	`default:`
`1937`		`- return MCControl::getprop(parid, which, ep, effective);`
	`1937`	`+ return MCControl::getprop(parid, which, ep, effective, recursive);`
`1938`	`1938`	`}`
`1939`	`1939`	`return ES_NORMAL;`
`1940`	`1940`	`}`
Original file line number	Diff line number	Diff line change
`@@ -924,7 +924,7 @@ void MCCard::timer(MCNameRef mptr, MCParameter *params)`
`924`	`924`	`MCObject::timer(mptr, params);`
`925`	`925`	`}`
`926`	`926`
`927`		`-Exec_stat MCCard::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective)`
	`927`	`+Exec_stat MCCard::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective, bool recursive)`
`928`	`928`	`{`
`929`	`929`	`MCRectangle minrect;`
`930`	`930`	`uint2 num;`
`@@ -1065,7 +1065,7 @@ Exec_stat MCCard::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolea`
`1065`	`1065`	`return ES_ERROR;`
`1066`	`1066`	`#endif /* MCCard::getprop */`
`1067`	`1067`	`default:`
`1068`		`- return MCObject::getprop(parid, which, ep, effective);`
	`1068`	`+ return MCObject::getprop(parid, which, ep, effective, recursive);`
`1069`	`1069`	`}`
`1070`	`1070`	`return ES_NORMAL;`
`1071`	`1071`	`}`
Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ uint2 MCControl::gettransient() const`
`385`	`385`	`return 0;`
`386`	`386`	`}`
`387`	`387`
`388`		`-Exec_stat MCControl::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective)`
	`388`	`+Exec_stat MCControl::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective, bool recursive)`
`389`	`389`	`{`
`390`	`390`	`switch (which)`
`391`	`391`	`{`
`@@ -453,7 +453,7 @@ Exec_stat MCControl::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boo`
`453`	`453`	`break;`
`454`	`454`	`#endif /* MCControl::getprop */`
`455`	`455`	`default:`
`456`		`- return MCObject::getprop(parid, which, ep, effective);`
	`456`	`+ return MCObject::getprop(parid, which, ep, effective, recursive);`
`457`	`457`	`}`
`458`	`458`	`return ES_NORMAL;`
`459`	`459`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ Boolean MCColors::mup(uint2 which, bool p_release)`
`174`	`174`	`return True;`
`175`	`175`	`}`
`176`	`176`
`177`		`-Exec_stat MCColors::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective)`
	`177`	`+Exec_stat MCColors::getprop(uint4 parid, Properties which, MCExecPoint& ep, Boolean effective, bool recursive)`
`178`	`178`	`{`
`179`	`179`	`switch (which)`
`180`	`180`	`{`
`@@ -187,7 +187,7 @@ Exec_stat MCColors::getprop(uint4 parid, Properties which, MCExecPoint& ep, Bool`
`187`	`187`	`break;`
`188`	`188`	`#endif /* MCColors::getprop */`
`189`	`189`	`default:`
`190`		`- return MCControl::getprop(parid, which, ep, effective);`
	`190`	`+ return MCControl::getprop(parid, which, ep, effective, recursive);`
`191`	`191`	`}`
`192`	`192`	`return ES_NORMAL;`
`193`	`193`	`}`