#477 TUrlLink uses outdated WinHelp

[Vidar Hasfjord]

The implementation of TURLLink uses the IDC_HANDCURSOR cursor resource from "urllink.rc". If the user did not include this resource in the executable, then TUrlLink::SetupCursor will try to use a replacement cursor resource loaded from the WinHelp executable file "Winhelp32.exe". In Windows Vista, released in 2006, WinHelp was removed from Windows, so this fallback code makes no sense anymore.

This issue was fixed in [r5253]. The code now simply uses the standard hand cursor in Windows (IDC_HAND).

See discussion in [bugs:#373].

[Vidar Hasfjord]

The fix was merged into the trunk in [r5254].

Sebastian, please merge the fix to the 7.0 branch as well, and report here when done (tickets should always have links to the fixed revisions). Then you can set the status of this ticket to "Pending".

[Sebastian Ledesma]

I did commits [r5255] and [r5256] in branch 7.0..

I dont know if its possible to make a merge online directly using the sourceforge website or if there is an option in Tortoise to merge two local directorys.

Please let me know if everything its ok.

Sebas

[Vidar Hasfjord]

Hi Sebastian, looks good!

If you are doing the merging manually, then see "Merging" in the TortoiseSVN documentation. The "SVN Merge" command in TortoiseSVN makes it really easy, and also updates svn:mergeinfo automatically.

Removing a resource on a release branch isn't a 100% compatible change, as user code may depend on loading that resource. However, in this instance, the IDC_HANDCURSOR was an internal implementation detail, not part of the API, so it should be acceptable, I guess.

Some nitpicks and tips:

• The log message should ideally be "Merged [r5254] from trunk to branches/7.0", not "... to tag". By the way, merges are never performed on tag directories. Those are read-only. I've corrected the log message.
• svn:mergeinfo is missing. To fix this, you can run the SVN Merge command in TortoiseSVN without performing any source code updates, just updating the svn:mergeinfo property. In the log message, just state that you added the necessary merge info for the corresponding merge revision. I've made this update for you.
• If you forget part of a change in a merge and need to supplement it, then state it in the log messages, e.g. "CHG: Updated documentation for SetupCursor. Note: This completes the merge in [r5255].". I have updated the log messages.
• End all log messages in full stop (period), so that it is clear that the message has not been truncated. I've updated the log messages for you.
• Log messages can be edited if you need to correct something (e.g. right click the message in the TortoiseSVN log view). Note that changes to log messages don't show up on SourceForge's Commit pages (those are created from the original message), but the Code history log shows them, as does Subversion clients.
• Ideally, you do a change on the trunk first, then merge the change to the release branches in preparation for release. The latter part is conventionally the responsibility of the release manager. By making changes to a release branch, you imply the change is OK for release, and that there will be a release. A release branch with pending changes should always have its OWL_PRERELEASE flag set to 1 and the release number updated (this change has already been made for the current release branches, in preparation for 6.44.12 and 7.0.2).
  
  

Updated log