Turn MCdefaultstackptr into an object handle

livecodefraser · livecodefraser · commit bdcf9c5c0520 · 2016-10-26T17:05:38.000+01:00
diff --git a/engine/src/desktop-menu.cpp b/engine/src/desktop-menu.cpp
@@ -893,7 +893,7 @@ void MCPlatformHandleMenuUpdate(MCPlatformMenuRef p_menu)
 	// If the menu is the icon menu, send an 'iconMenuOpening' message.
 	if (((MCScreenDC *)MCscreen) -> isiconmenu(p_menu))
 	{
-		if (MCdefaultstackptr != NULL)
+		if (MCdefaultstackptr)
 			MCdefaultstackptr -> getcard() -> message(MCM_icon_menu_opening);
 		return;
 	}
@@ -1002,7 +1002,7 @@ void MCPlatformHandleMenuSelect(MCPlatformMenuRef p_menu, uindex_t p_item_index)
 	{
 		if (((MCScreenDC *)MCscreen) -> isiconmenu(t_last_menu))
 		{
-			if (MCdefaultstackptr != NULL)
+			if (MCdefaultstackptr)
 				MCdefaultstackptr -> getcard() -> message_with_valueref_args(MCM_icon_menu_pick, *t_result);
 		}
 		else
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -2121,7 +2121,7 @@ bool MCDispatch::dopaste(MCObject*& r_objptr, bool p_explicit)
 		return false;
 	}
 	
-	if (MCdefaultstackptr != NULL && (p_explicit || MCdefaultstackptr -> gettool(MCdefaultstackptr) == T_POINTER))
+	if (MCdefaultstackptr && (p_explicit || MCdefaultstackptr -> gettool(MCdefaultstackptr) == T_POINTER))
 	{
 		MCObject *t_objects;
 		t_objects = NULL;
diff --git a/engine/src/exec-engine.cpp b/engine/src/exec-engine.cpp
@@ -909,7 +909,7 @@ void MCEngineExecQuit(MCExecContext& ctxt, integer_t p_retcode)
 {
 // MW-2011-06-22: [[ SERVER ]] Don't send messages in server-mode.
 #ifndef _SERVER
-    if (MCdefaultstackptr != nil && !MCdefaultstackptr->getstate(CS_DELETE_STACK))
+    if (MCdefaultstackptr && !MCdefaultstackptr->getstate(CS_DELETE_STACK))
     {
         switch(MCdefaultstackptr->getcard()->message(MCM_shut_down_request))
         {
diff --git a/engine/src/exec-interface2.cpp b/engine/src/exec-interface2.cpp
@@ -2439,7 +2439,7 @@ void MCInterfaceEvalBinaryStackAsObject(MCExecContext& ctxt, MCStringRef p_data,
 
 void MCInterfaceEvalDefaultStackAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)
 {
-    if (MCdefaultstackptr != nil)
+    if (MCdefaultstackptr)
     {
         r_object . object = MCdefaultstackptr;
         r_object . part_id = 0;
diff --git a/engine/src/externalv1.cpp b/engine/src/externalv1.cpp
@@ -1263,7 +1263,7 @@ static MCExternalError MCExternalContextQuery(MCExternalContextQueryTag op, MCEx
             break;
         case kMCExternalContextQueryDefaultStack:
         {
-            if (MCdefaultstackptr == nil)
+            if (!MCdefaultstackptr)
                 return kMCExternalErrorNoDefaultStack;
             
             MCObjectHandle t_handle;
@@ -1276,7 +1276,7 @@ static MCExternalError MCExternalContextQuery(MCExternalContextQueryTag op, MCEx
             break;
         case kMCExternalContextQueryDefaultCard:
         {
-            if (MCdefaultstackptr == nil)
+            if (!MCdefaultstackptr)
                 return kMCExternalErrorNoDefaultStack;
             
             MCObjectHandle t_handle;
diff --git a/engine/src/globals.cpp b/engine/src/globals.cpp
@@ -263,13 +263,13 @@ MCStacklist *MCtodestroy;
 MCCardlist *MCrecent;
 MCCardlist *MCcstack;
 MCDispatch *MCdispatcher;
-MCStack *MCdefaultstackptr;
 MCStack *MCstaticdefaultstackptr;
 MCStack *MCmousestackptr;
 MCStack *MCclickstackptr;
 MCStack *MCfocusedstackptr;
 MCCard *MCdynamiccard;
 MCStackHandle MCtopstackptr;
+MCStackHandle MCdefaultstackptr;
 Boolean MCdynamicpath;
 MCObject *MCerrorptr;
 MCObject *MCerrorlockptr;
diff --git a/engine/src/globals.h b/engine/src/globals.h
@@ -181,12 +181,12 @@ extern MCStacklist *MCtodestroy;
 extern MCCardlist *MCrecent;
 extern MCCardlist *MCcstack;
 extern MCDispatch *MCdispatcher;
-extern MCStack *MCdefaultstackptr;
 extern MCStack *MCstaticdefaultstackptr;
 extern MCStack *MCmousestackptr;
 extern MCStack *MCclickstackptr;
 extern MCStack *MCfocusedstackptr;
 extern MCStackHandle MCtopstackptr;
+extern MCStackHandle MCdefaultstackptr;
 extern MCObjectPtr MCtargetptr;
 extern MCObject *MCmenuobjectptr;
 extern MCCard *MCdynamiccard;

Original file line number	Diff line number	Diff line change
`@@ -893,7 +893,7 @@ void MCPlatformHandleMenuUpdate(MCPlatformMenuRef p_menu)`
`893`	`893`	`// If the menu is the icon menu, send an 'iconMenuOpening' message.`
`894`	`894`	`if (((MCScreenDC *)MCscreen) -> isiconmenu(p_menu))`
`895`	`895`	`{`
`896`		`- if (MCdefaultstackptr != NULL)`
	`896`	`+ if (MCdefaultstackptr)`
`897`	`897`	`MCdefaultstackptr -> getcard() -> message(MCM_icon_menu_opening);`
`898`	`898`	`return;`
`899`	`899`	`}`
`@@ -1002,7 +1002,7 @@ void MCPlatformHandleMenuSelect(MCPlatformMenuRef p_menu, uindex_t p_item_index)`
`1002`	`1002`	`{`
`1003`	`1003`	`if (((MCScreenDC *)MCscreen) -> isiconmenu(t_last_menu))`
`1004`	`1004`	`{`
`1005`		`- if (MCdefaultstackptr != NULL)`
	`1005`	`+ if (MCdefaultstackptr)`
`1006`	`1006`	`MCdefaultstackptr -> getcard() -> message_with_valueref_args(MCM_icon_menu_pick, *t_result);`
`1007`	`1007`	`}`
`1008`	`1008`	`else`
Original file line number	Diff line number	Diff line change
`@@ -2121,7 +2121,7 @@ bool MCDispatch::dopaste(MCObject*& r_objptr, bool p_explicit)`
`2121`	`2121`	`return false;`
`2122`	`2122`	`}`
`2123`	`2123`
`2124`		`- if (MCdefaultstackptr != NULL && (p_explicit \|\| MCdefaultstackptr -> gettool(MCdefaultstackptr) == T_POINTER))`
	`2124`	`+ if (MCdefaultstackptr && (p_explicit \|\| MCdefaultstackptr -> gettool(MCdefaultstackptr) == T_POINTER))`
`2125`	`2125`	`{`
`2126`	`2126`	`MCObject *t_objects;`
`2127`	`2127`	`t_objects = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -909,7 +909,7 @@ void MCEngineExecQuit(MCExecContext& ctxt, integer_t p_retcode)`
`909`	`909`	`{`
`910`	`910`	`// MW-2011-06-22: [[ SERVER ]] Don't send messages in server-mode.`
`911`	`911`	`#ifndef _SERVER`
`912`		`- if (MCdefaultstackptr != nil && !MCdefaultstackptr->getstate(CS_DELETE_STACK))`
	`912`	`+ if (MCdefaultstackptr && !MCdefaultstackptr->getstate(CS_DELETE_STACK))`
`913`	`913`	`{`
`914`	`914`	`switch(MCdefaultstackptr->getcard()->message(MCM_shut_down_request))`
`915`	`915`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2439,7 +2439,7 @@ void MCInterfaceEvalBinaryStackAsObject(MCExecContext& ctxt, MCStringRef p_data,`
`2439`	`2439`
`2440`	`2440`	`void MCInterfaceEvalDefaultStackAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)`
`2441`	`2441`	`{`
`2442`		`- if (MCdefaultstackptr != nil)`
	`2442`	`+ if (MCdefaultstackptr)`
`2443`	`2443`	`{`
`2444`	`2444`	`r_object . object = MCdefaultstackptr;`
`2445`	`2445`	`r_object . part_id = 0;`