Fix dragging selections to icon bar icons

Fix for cut and paste - dragging selections to icon bar icons - when destination window is -2 add icon handle to Wimp_SendMessage to ensure correct destination for Message_Dragging and Message_DataSave.

c/DrawDrag

   { if (current_drag_op.drag_finished) messagetype = wimp_ESENDWANTACK;
     else                               messagetype = wimp_ESEND;
   }
-  wimpt_complain (wimp_sendmessage (messagetype, &msg, current_drag_op.claimant != -1 ? current_drag_op.claimant : mouse.w));
+
+  if (current_drag_op.claimant != -1)
+    wimpt_complain (wimp_sendmessage (messagetype, &msg, current_drag_op.claimant));
+  else
+  { if (mouse.w != -2)
+      wimpt_complain (wimp_sendmessage (messagetype, &msg, mouse.w));
+    else
+      wimpt_complain (wimp_sendwmessage (messagetype, &msg, mouse.w, mouse.i));
+  }
 }
 
 void draw_drag_stop_current(void)
   msg.data.datasave.estsize = buffer_length;
 
   if (taskh!=-1)
-    wimp_sendmessage(wimp_ESENDWANTACK, &msg, taskh);
+    wimpt_complain (wimp_sendmessage(wimp_ESENDWANTACK, &msg, taskh));
   else
-    wimp_sendmessage(wimp_ESENDWANTACK, &msg, windowh);
+  { if (windowh != -2) wimpt_complain (wimp_sendmessage(wimp_ESENDWANTACK, &msg, windowh));
+      else wimpt_complain (wimp_sendwmessage(wimp_ESENDWANTACK, &msg, -2, mouse.i));
+  }
 
   /*See if we get a reply...*/
   complete = FALSE;

[Robert Sprowson]

Thanks for taking a look at this following my forum post the other week.

Did something go fooey with the commit though? There are c.315 lines of changes (compared with c.15 in Paint). Did you branch from somewhere other than the latest version?

[Andy Vawer]

Sorry, I think I've got the commit right this time... I'll get the hang of it one day...

[Robert Sprowson]

13 lines - that's more like it! Works great.

I'll get the hang of it one day...

One of Git's specialties is making the simplest of tasks as hard/error prone as possible. If I had to make an educated guess (based on the avawer:master in your merge request) is that you're not following ROOL's suggestion of keeping the master in sync with ROOL's copy, and doing any development work on a branch.