Turn MCmenuobjectptr into an object handle

livecodefraser · livecodefraser · commit 8c89c64bc25f · 2016-10-26T17:05:43.000+01:00
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -755,7 +755,7 @@ Boolean MCButton::kdown(MCStringRef p_string, KeySym key)
 				message_with_args(MCM_mouse_release, menubutton);
 			state &= ~CS_IGNORE_MENU;
 			if (MCmenuobjectptr == this)
-				MCmenuobjectptr = NULL;
+				MCmenuobjectptr = nil;
 			return True;
 		default:	
 			MCButton *mbptr = menu->findmnemonic(t_char);
@@ -778,7 +778,7 @@ Boolean MCButton::kdown(MCStringRef p_string, KeySym key)
 						message_with_args(MCM_mouse_up, menubutton);
 				}
 				if (MCmenuobjectptr == this)
-					MCmenuobjectptr = NULL;
+					MCmenuobjectptr = nil;
 				return True;
 			}
 			else
@@ -1416,7 +1416,7 @@ Boolean MCButton::mup(uint2 which, bool p_release)
 		}
 		state &= ~CS_IGNORE_MENU;
 		if (MCmenuobjectptr == this)
-			MCmenuobjectptr = NULL;
+			MCmenuobjectptr = nil;
 		// MW-2011-08-18: [[ Layers ]] Invalidate the whole object.
 		layer_redrawall();
 		if (!opened)
@@ -2775,7 +2775,7 @@ void MCButton::openmenu(Boolean grab)
 	{
 		state |= CS_SUBMENU | CS_ARMED;
 		reseticon();
-		if (MCmenuobjectptr == NULL)
+		if (!MCmenuobjectptr)
 			MCmenuobjectptr = this;
 		mymenudepth = ++menudepth;
 		MCStack *sptr = menumode == WM_POPUP ? MCmousestackptr : getstack();
diff --git a/engine/src/exec-engine.cpp b/engine/src/exec-engine.cpp
@@ -1917,7 +1917,7 @@ void MCEngineEvalMeAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)
 
 void MCEngineEvalMenuObjectAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)
 {
-    if (MCmenuobjectptr != nil)
+    if (MCmenuobjectptr)
     {
         r_object . object = MCmenuobjectptr;
         r_object . part_id = 0;
diff --git a/engine/src/exec-legacy.cpp b/engine/src/exec-legacy.cpp
@@ -276,7 +276,7 @@ void MCLegacyEvalTextHeightSum(MCExecContext& ctxt, MCObjectPtr p_object, intege
 
 void MCLegacyEvalMenuObject(MCExecContext& ctxt, MCStringRef& r_object)
 {
-	if (MCmenuobjectptr == nil)
+	if (!MCmenuobjectptr)
 	{
 		r_object = (MCStringRef)MCValueRetain(kMCEmptyString);
 		return;
diff --git a/engine/src/globals.cpp b/engine/src/globals.cpp
@@ -274,12 +274,12 @@ Boolean MCdynamicpath;
 MCObject *MCerrorptr;
 MCObject *MCerrorlockptr;
 MCObjectPtr MCtargetptr;
-MCObject *MCmenuobjectptr;
 MCGroup *MCsavegroupptr;
 MCGroup *MCdefaultmenubar;
 MCGroup *MCmenubar;
 MCPlayer *MCplayers;
 MCAudioClip *MCacptr;
+MCObjectHandle MCmenuobjectptr;
 
 MCStack *MCtemplatestack;
 MCAudioClip *MCtemplateaudio;
diff --git a/engine/src/globals.h b/engine/src/globals.h
@@ -188,7 +188,7 @@ extern MCStackHandle MCmousestackptr;
 extern MCStackHandle MCclickstackptr;
 extern MCStackHandle MCfocusedstackptr;
 extern MCObjectPtr MCtargetptr;
-extern MCObject *MCmenuobjectptr;
+extern MCObjectHandle MCmenuobjectptr;
 extern MCCardHandle MCdynamiccard;
 extern Boolean MCdynamicpath;
 extern MCObject *MCerrorptr;
diff --git a/engine/src/object.cpp b/engine/src/object.cpp
@@ -1194,7 +1194,7 @@ void MCObject::closemenu(Boolean kfocus, Boolean disarm)
 		attachedmenu = NULL;
 		menudepth--;
 		if (MCmenuobjectptr == this)
-			MCmenuobjectptr = NULL;
+			MCmenuobjectptr = nil;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1917,7 +1917,7 @@ void MCEngineEvalMeAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)`
`1917`	`1917`
`1918`	`1918`	`void MCEngineEvalMenuObjectAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)`
`1919`	`1919`	`{`
`1920`		`- if (MCmenuobjectptr != nil)`
	`1920`	`+ if (MCmenuobjectptr)`
`1921`	`1921`	`{`
`1922`	`1922`	`r_object . object = MCmenuobjectptr;`
`1923`	`1923`	`r_object . part_id = 0;`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ void MCLegacyEvalTextHeightSum(MCExecContext& ctxt, MCObjectPtr p_object, intege`
`276`	`276`
`277`	`277`	`void MCLegacyEvalMenuObject(MCExecContext& ctxt, MCStringRef& r_object)`
`278`	`278`	`{`
`279`		`- if (MCmenuobjectptr == nil)`
	`279`	`+ if (!MCmenuobjectptr)`
`280`	`280`	`{`
`281`	`281`	`r_object = (MCStringRef)MCValueRetain(kMCEmptyString);`
`282`	`282`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -1194,7 +1194,7 @@ void MCObject::closemenu(Boolean kfocus, Boolean disarm)`
`1194`	`1194`	`attachedmenu = NULL;`
`1195`	`1195`	`menudepth--;`
`1196`	`1196`	`if (MCmenuobjectptr == this)`
`1197`		`- MCmenuobjectptr = NULL;`
	`1197`	`+ MCmenuobjectptr = nil;`
`1198`	`1198`	`}`
`1199`	`1199`	`}`
`1200`	`1200`