Turn MCdragdest into an object handle

livecodefraser · livecodefraser · commit f4c01fdd0084 · 2016-10-26T17:09:40.000+01:00
diff --git a/engine/src/control.cpp b/engine/src/control.cpp
@@ -1409,7 +1409,7 @@ void MCControl::leave()
 		}
 		oldfocused->message(MCM_drag_leave);
 		MCdragaction = DRAG_ACTION_NONE;
-		MCdragdest = NULL;
+		MCdragdest = nil;
 	}
 	else
 		oldfocused->message(MCM_mouse_leave);
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -1366,7 +1366,7 @@ void MCDispatch::wmdrag(Window w)
         MCdragboard->PushUpdates(true);
 
 		MCdragsource = nil;
-		MCdragdest = NULL;
+		MCdragdest = nil;
 		MCdropfield = NULL;
 		MCdragtargetptr = NULL;
 		m_drag_source = false;
@@ -1378,7 +1378,7 @@ void MCDispatch::wmdrag(Window w)
         // an error after placing some of the drag data).
         MCdragboard->Clear();
 		MCdragsource = nil;
-		MCdragdest = NULL;
+		MCdragdest = nil;
 		MCdropfield = NULL;
 		MCdragtargetptr = NULL;
 		m_drag_source = false;
@@ -2188,7 +2188,7 @@ bool MCDispatch::dopaste(MCObject*& r_objptr, bool p_explicit)
 
 void MCDispatch::dodrop(bool p_source)
 {
-	if (!m_drag_end_sent && MCdragsource && (MCdragdest == NULL || MCdragaction == DRAG_ACTION_NONE))
+	if (!m_drag_end_sent && MCdragsource && (!MCdragdest || MCdragaction == DRAG_ACTION_NONE))
 	{
 		// We are only the source
 		m_drag_end_sent = true;
@@ -2227,9 +2227,9 @@ void MCDispatch::dodrop(bool p_source)
 
 	findex_t t_start_index, t_end_index;
 	t_start_index = t_end_index = 0;
-	if (MCdragdest != NULL && MCdragdest -> gettype() == CT_FIELD)
+	if (MCdragdest && MCdragdest -> gettype() == CT_FIELD)
 	{
-		MCdropfield = static_cast<MCField *>(MCdragdest);
+		MCdropfield = MCdragdest.GetAs<MCField>();
 		if (MCdragdest -> getstate(CS_DRAG_TEXT))
 		{
 			MCdropfield -> locmark(False, False, False, False, True, t_start_index, t_end_index);
@@ -2243,7 +2243,7 @@ void MCDispatch::dodrop(bool p_source)
 
 	// If dest is a field and the engine handled the accepting of the operation
 	bool t_auto_dest;
-	t_auto_dest = MCdragdest != NULL && MCdragdest -> gettype() == CT_FIELD && MCdragdest -> getstate(CS_DRAG_TEXT);
+	t_auto_dest = MCdragdest && MCdragdest -> gettype() == CT_FIELD && MCdragdest -> getstate(CS_DRAG_TEXT);
 
     // Is the engine handling this drag internally AND the same field is both
     // the source and destination for the drag?
@@ -2315,8 +2315,7 @@ void MCDispatch::dodrop(bool p_source)
 	if (t_auto_source)
 		MCdragsource.GetAs<MCField>()->selectedmark(False, t_src_start, t_src_end, False);
 
-	bool t_auto_drop;
-    t_auto_drop = MCdragdest != NULL;
+	bool t_auto_drop = MCdragdest.IsValid();
     if (t_auto_drop)
     {
 #ifdef WIDGETS_HANDLE_DND
diff --git a/engine/src/exec-pasteboard.cpp b/engine/src/exec-pasteboard.cpp
@@ -649,7 +649,7 @@ void MCPasteboardEvalDropChunk(MCExecContext& ctxt, MCStringRef& r_string)
 
 void MCPasteboardEvalDragDestination(MCExecContext& ctxt, MCStringRef& r_string)
 {
-	if (MCdragdest == nil)
+	if (!MCdragdest)
 	{
 		r_string = MCValueRetain(kMCEmptyString);
 		return;
@@ -1882,7 +1882,7 @@ void MCPasteboardEvalDragSourceAsObject(MCExecContext& ctxt, MCObjectPtr& r_obje
 
 void MCPasteboardEvalDragDestinationAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)
 {
-    if (MCdragdest != nil)
+    if (MCdragdest)
     {
         r_object . object = MCdragdest;
         r_object . part_id = 0;
@@ -1894,7 +1894,7 @@ void MCPasteboardEvalDragDestinationAsObject(MCExecContext& ctxt, MCObjectPtr& r
 
 void MCPasteboardEvalDropChunkAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)
 {
-    if (MCdragdest != nil)
+    if (MCdragdest)
     {
         r_object . object = MCdropfield;
         r_object . part_id = 0;
diff --git a/engine/src/globals.cpp b/engine/src/globals.cpp
@@ -297,7 +297,7 @@ MCField *MCtemplatefield;
 MCImageHandle MCmagimage;
 MCMagnifyHandle MCmagnifier;
 MCObjectHandle MCdragsource;
-MCObject *MCdragdest;
+MCObjectHandle MCdragdest;
 MCField *MCactivefield;
 MCField *MCclickfield;
 MCField *MCfoundfield;
diff --git a/engine/src/globals.h b/engine/src/globals.h
@@ -217,7 +217,7 @@ extern MCField *MCtemplatefield;
 extern MCImageHandle MCmagimage;
 extern MCMagnifyHandle MCmagnifier;
 extern MCObjectHandle MCdragsource;
-extern MCObject *MCdragdest;
+extern MCObjectHandle MCdragdest;
 extern MCField *MCactivefield;
 extern MCField *MCclickfield;
 extern MCField *MCfoundfield;

Original file line number	Diff line number	Diff line change
`@@ -1409,7 +1409,7 @@ void MCControl::leave()`
`1409`	`1409`	`}`
`1410`	`1410`	`oldfocused->message(MCM_drag_leave);`
`1411`	`1411`	`MCdragaction = DRAG_ACTION_NONE;`
`1412`		`- MCdragdest = NULL;`
	`1412`	`+ MCdragdest = nil;`
`1413`	`1413`	`}`
`1414`	`1414`	`else`
`1415`	`1415`	`oldfocused->message(MCM_mouse_leave);`
Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,7 @@ void MCPasteboardEvalDropChunk(MCExecContext& ctxt, MCStringRef& r_string)`
`649`	`649`
`650`	`650`	`void MCPasteboardEvalDragDestination(MCExecContext& ctxt, MCStringRef& r_string)`
`651`	`651`	`{`
`652`		`- if (MCdragdest == nil)`
	`652`	`+ if (!MCdragdest)`
`653`	`653`	`{`
`654`	`654`	`r_string = MCValueRetain(kMCEmptyString);`
`655`	`655`	`return;`
`@@ -1882,7 +1882,7 @@ void MCPasteboardEvalDragSourceAsObject(MCExecContext& ctxt, MCObjectPtr& r_obje`
`1882`	`1882`
`1883`	`1883`	`void MCPasteboardEvalDragDestinationAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)`
`1884`	`1884`	`{`
`1885`		`- if (MCdragdest != nil)`
	`1885`	`+ if (MCdragdest)`
`1886`	`1886`	`{`
`1887`	`1887`	`r_object . object = MCdragdest;`
`1888`	`1888`	`r_object . part_id = 0;`
`@@ -1894,7 +1894,7 @@ void MCPasteboardEvalDragDestinationAsObject(MCExecContext& ctxt, MCObjectPtr& r`
`1894`	`1894`
`1895`	`1895`	`void MCPasteboardEvalDropChunkAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)`
`1896`	`1896`	`{`
`1897`		`- if (MCdragdest != nil)`
	`1897`	`+ if (MCdragdest)`
`1898`	`1898`	`{`
`1899`	`1899`	`r_object . object = MCdropfield;`
`1900`	`1900`	`r_object . part_id = 0;`