Fix issue dragging selection to iconbar icons

Send wimp messages to the actual iconbar icon rather than just the window handle during drag procedure.

Version 1.40. Tagged as 'Draw-1_40'

VersionASM

@@ -9,12 +9,12 @@
                         GBLS    Module_ApplicationDate
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
-Module_MajorVersion     SETS    "1.39"
-Module_Version          SETA    139
+Module_MajorVersion     SETS    "1.40"
+Module_Version          SETA    140
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "04 Mar 2020"
-Module_ApplicationDate  SETS    "04-Mar-20"
+Module_Date             SETS    "06 Apr 2020"
+Module_ApplicationDate  SETS    "06-Apr-20"
 Module_ComponentName    SETS    "Draw"
-Module_FullVersion      SETS    "1.39"
-Module_HelpVersion      SETS    "1.39 (04 Mar 2020)"
+Module_FullVersion      SETS    "1.40"
+Module_HelpVersion      SETS    "1.40 (06 Apr 2020)"
                         END

VersionNum

-/* (1.39)
+/* (1.40)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        1.39
+#define Module_MajorVersion_CMHG        1.40
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                04 Mar 2020
+#define Module_Date_CMHG                06 Apr 2020
 
-#define Module_MajorVersion             "1.39"
-#define Module_Version                  139
+#define Module_MajorVersion             "1.40"
+#define Module_Version                  140
 #define Module_MinorVersion             ""
-#define Module_Date                     "04 Mar 2020"
+#define Module_Date                     "06 Apr 2020"
 
-#define Module_ApplicationDate          "04-Mar-20"
+#define Module_ApplicationDate          "06-Apr-20"
 
 #define Module_ComponentName            "Draw"
 
-#define Module_FullVersion              "1.39"
-#define Module_HelpVersion              "1.39 (04 Mar 2020)"
-#define Module_LibraryVersionInfo       "1:39"
+#define Module_FullVersion              "1.40"
+#define Module_HelpVersion              "1.40 (06 Apr 2020)"
+#define Module_LibraryVersionInfo       "1:40"

c/DrawDrag

@@ -167,7 +167,15 @@ static void draw_drag_message_dragging(wimp_mousestr mouse)
   { 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)
@@ -607,9 +615,11 @@ static void draw_drag_send_datasave(wimp_eventstr *e, BOOL export_drawfile, wimp
   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;