Commit 8fbf60c5 authored by Andy Vawer's avatar Andy Vawer Committed by ROOL
Browse files

Fix issue dragging a selection to icon bar icons

Send Wimp message to correct destination icon rather than the iconbar window.

Version 2.32. Tagged as 'Paint-2_32'
parent 182c9f8d
......@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "2.31"
Module_Version SETA 231
Module_MajorVersion SETS "2.32"
Module_Version SETA 232
Module_MinorVersion SETS ""
Module_Date SETS "29 Feb 2020"
Module_ApplicationDate SETS "29-Feb-20"
Module_Date SETS "06 Apr 2020"
Module_ApplicationDate SETS "06-Apr-20"
Module_ComponentName SETS "Paint"
Module_FullVersion SETS "2.31"
Module_HelpVersion SETS "2.31 (29 Feb 2020)"
Module_FullVersion SETS "2.32"
Module_HelpVersion SETS "2.32 (06 Apr 2020)"
END
/* (2.31)
/* (2.32)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.31
#define Module_MajorVersion_CMHG 2.32
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 29 Feb 2020
#define Module_Date_CMHG 06 Apr 2020
#define Module_MajorVersion "2.31"
#define Module_Version 231
#define Module_MajorVersion "2.32"
#define Module_Version 232
#define Module_MinorVersion ""
#define Module_Date "29 Feb 2020"
#define Module_Date "06 Apr 2020"
#define Module_ApplicationDate "29-Feb-20"
#define Module_ApplicationDate "06-Apr-20"
#define Module_ComponentName "Paint"
#define Module_FullVersion "2.31"
#define Module_HelpVersion "2.31 (29 Feb 2020)"
#define Module_LibraryVersionInfo "2:31"
#define Module_FullVersion "2.32"
#define Module_HelpVersion "2.32 (06 Apr 2020)"
#define Module_LibraryVersionInfo "2:32"
......@@ -208,7 +208,15 @@ static void cnp_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 cnp_drag_stop_current(void)
......@@ -510,10 +518,14 @@ static void cnp_drag_send_datasave(wimp_eventstr *e, wimp_t taskh, wimp_w window
msg.hdr.size = (msg.data.datasave.leaf - (char *)&msg + 1 + strlen(msg.data.datasave.leaf) + 3) &~ 3;
if (taskh!=-1)
if (taskh != -1)
wimp_sendmessage(wimp_ESENDWANTACK, &msg, taskh);
else
wimp_sendmessage(wimp_ESENDWANTACK, &msg, windowh);
{ if (windowh != -2)
wimp_sendmessage(wimp_ESENDWANTACK, &msg, windowh);
else
wimp_sendwmessage(wimp_ESENDWANTACK, &msg, windowh, mouse.i);
}
/*See if we get a reply...*/
complete = FALSE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment