Add compatibility support for wxIconBundle to wxBitmapBundle

[Runtemund]

No description provided.

[vadz]

This seems useful, thanks. Could you please

• Fix the build errors due to missing includes.
• Rebase on master to get rid of all the extra merges.
• Add @since 3.1.7 to the new function documentation.

? TIA!

[Runtemund]

Can you please explain what exactly to do here: Rebase on master to get rid of all the extra merges. ? I have not yet completely understood the logic of git.

[vadz]

Can you please explain what exactly to do here: Rebase on master to get rid of all the extra merges. ? I have not yet completely understood the logic of git.

Just run git rebase master while being on your branch: this will replay all the commits on your branch from the tip of the (latest) master. If this results in any difficult to resolve conflicts, you can always abandon with git rebase --abort and use an alternative approach by creating a new branch from master (i.e. git checkout -b bmpbndl-iconbndl-new) and then cherry picking just the commits you need from your old branch and finally, after checking that the branch contents is identical (git diff add_icobdl_to_bmpbdl bmpbndl-iconbndl-new should show nothing), remove the old branch (git branch -D add_icobdl_to_bmpbdl) and rename the new branch to the old name (git branch -m bmpbndl-iconbndl-new add_icobdl_to_bmpbdl).

Note that you will need to "force push", i.e. use git push --force-with-lease, after doing either rebasing or cherry-picking.

[Runtemund]

Thank you very much, that helped a lot. But I am not sure if I can omit all commits. The first PR were erroneously done from master.., maybe this has an impact...

[Runtemund]

Hm, one job (Unix builds / Ubuntu 20.04 wxGTK with ASAN (pull_request) ) is failing. I have no idea what

ERROR: jinja2 3.1.1 has requirement MarkupSafe>=2.0, but you'll have markupsafe 1.1.0 which is incompatible.

in the log means. And above all, how could I fix it...?

[vadz]

The remaining error is due to a bug in ASAN that we can't do anything about, unfortunately. I believe it's the first time it crashed twice in a row, let's hope it's just bad luck... I'll rerun it once again to check.

As for commits, you don't have to omit all of them, of course, you can combine them in as many or as few commits as needed with git rebase -i. But I'll just do a (squash) merge myself for this one.