Turn MCmbstackptr into an object handle

livecodefraser · livecodefraser · commit 9a890c52082e · 2016-10-26T17:13:30.000+01:00
diff --git a/engine/src/debug.cpp b/engine/src/debug.cpp
@@ -54,8 +54,7 @@ Boolean MCtracereturn = True;
 uint4 MCtraceuntil = MAXUINT2;
 uint2 MCtracedelay = 500;
 
-// MW-2004-11-17: Added to allow deletion of Message Box
-MCStack *MCmbstackptr = NULL;
+MCStackHandle MCmbstackptr = nil;
 
 Breakpoint *MCbreakpoints = nil;
 uint2 MCnbreakpoints = 0;
@@ -146,10 +145,10 @@ void MCB_setmsg(MCExecContext &ctxt, MCStringRef p_string)
 	if (!MCModeHandleMessageBoxChanged(ctxt, p_string))
 	{
 		// MW-2004-11-17: Now use global 'MCmbstackptr' instead
-		if (MCmbstackptr == NULL)
+		if (!MCmbstackptr)
 			MCmbstackptr = MCdispatcher->findstackname(MCN_messagename);
 			
-		if (MCmbstackptr != NULL)
+		if (MCmbstackptr)
 		{
 			Window_mode newmode = MCmbstackptr->userlevel() == 0 ? WM_MODELESS
 														: (Window_mode)(MCmbstackptr->userlevel() + WM_TOP_LEVEL_LOCKED);
diff --git a/engine/src/globals.h b/engine/src/globals.h
@@ -228,7 +228,7 @@ extern int4 MCdropchar;
 extern MCImageHandle MCactiveimage;
 extern MCImageHandle MCeditingimage;
 extern MCTooltipHandle MCtooltip;
-extern MCStack *MCmbstackptr;
+extern MCStackHandle MCmbstackptr;
 
 extern MCUIDC *MCscreen;
 extern MCPrinter *MCprinter;
diff --git a/engine/src/mode_development.cpp b/engine/src/mode_development.cpp
@@ -678,7 +678,7 @@ bool MCModeHandleMessageBoxChanged(MCExecContext& ctxt, MCStringRef p_string)
 		t_msg_box = MCmessageboxredirect;
 	else
 	{
-		if (MCmbstackptr == nil)
+		if (!MCmbstackptr)
 			MCmbstackptr = MCdispatcher->findstackname(MCN_messagename);
 		t_msg_box = MCmbstackptr;
 	}
diff --git a/engine/src/stack.cpp b/engine/src/stack.cpp
@@ -602,7 +602,7 @@ MCStack::~MCStack()
 			i++;
 	// MW-2004-11-17: If this is the current Message Box, set to NULL
 	if (MCmbstackptr == this)
-		MCmbstackptr = NULL;
+		MCmbstackptr = nil;
     if (MCtopstackptr == this)
     {
         MCtopstackptr = nil;

Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,7 @@ bool MCModeHandleMessageBoxChanged(MCExecContext& ctxt, MCStringRef p_string)`
`678`	`678`	`t_msg_box = MCmessageboxredirect;`
`679`	`679`	`else`
`680`	`680`	`{`
`681`		`- if (MCmbstackptr == nil)`
	`681`	`+ if (!MCmbstackptr)`
`682`	`682`	`MCmbstackptr = MCdispatcher->findstackname(MCN_messagename);`
`683`	`683`	`t_msg_box = MCmbstackptr;`
`684`	`684`	`}`
Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ MCStack::~MCStack()`
`602`	`602`	`i++;`
`603`	`603`	`// MW-2004-11-17: If this is the current Message Box, set to NULL`
`604`	`604`	`if (MCmbstackptr == this)`
`605`		`- MCmbstackptr = NULL;`
	`605`	`+ MCmbstackptr = nil;`
`606`	`606`	`if (MCtopstackptr == this)`
`607`	`607`	`{`
`608`	`608`	`MCtopstackptr = nil;`