The first assert was from wxWidgets. It fails as both expand and align flags are passed to the sizer. Removed align flag to match the dialog as shown here.
Second assert was simply not true. So I've changed it to if statement.
Details
- Reviewers
vladislavbelov wraitii Yves - Commits
- rP23034: Cleanup Camera related code and uses constant references where possible, fixes…
- Trac Tickets
- #5408
After reproducing steps from ticket, no assert is failed.
Diff Detail
- Lint
Lint Skipped - Unit
Unit Tests Skipped
Event Timeline
Successful build - Chance fights ever on the side of the prudent.
Linter detected issues: Executing section Source... source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp | 1| /*·Copyright·(C)·2009·Wildfire·Games. | | [NORMAL] LicenseYearBear: | | License should have "2019" year instead of "2009" source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp | 1| /*·Copyright·(C)·2014·Wildfire·Games. | | [NORMAL] LicenseYearBear: | | License should have "2019" year instead of "2014" Executing section JS... Executing section cli...
Link to build: https://jenkins.wildfiregames.com/job/differential/1085/display/redirect
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp | ||
---|---|---|
79–80 | By CC: if (col < 0 || col >= static_cast<int>(m_ColumnTypes.size())) return; | |
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp | ||
54 | Which version of wxWidget do you use? Because it may depend on the version and may don't work for some old but still supported version AFAIK. |
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp | ||
---|---|---|
54 | I'm using 3.1.2. Which versions are supported? I may try on them too. |
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp | ||
---|---|---|
54 | Quick note. The assert was added for this combination of flags by this commit on Apr 3, 2015. According to wikipedia it should be added to wxWIdgets 3.0.3. |
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp | ||
---|---|---|
54 | The problem is I suppose that we still support platforms where 2.8 is by default or we suggest 2.8 by default. Such as FreeBSD or Mandriva: https://trac.wildfiregames.com/wiki/BuildInstructions. @Itms what is our plan about the wxWidgets? |
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp | ||
---|---|---|
54 | Well we already dropped it with that commit. We might as well make it official. |
I think that if we keep supporting 2.8 we need to build patches with it, else we will commit a lot of 3.0+ changes without noticing. I believe the overwhelming majority of distributions used by our devs and contributors ships 3+.
I would be in favor of officially moving to 3+, which is possible if it is available (not necessarily the default,since it is for devs and package maintainers) on the platforms you mention.
I definitely agree to move forward and drop old versions. But probably we still have users with OS that uses 2.8 (and sometimes can't use newer versions without pain) by default or we recommend to use 2.8 by our build instructions.
So at least we need to make a remark about it in our build instructions.
For Windows we officially dropped it when we committed #5098. For the rest of the platforms most of the ticket are about being compatible, but there is no clear decision.
2.9 was an unstable/dev branch which became 3.0 stable (even numbers = stable, odd numbers = unstable). So there should be no 2.9 in the wild. We only ever supported it temporarily until 3.0 was released.
The patch seems ok to me. I'm going to commit that if nobody has objections.
P.S. We dropped 2.8, but AFAIK Slackware 14.2 uses 2.8, at least by https://slackware.pkgs.org/14.2/slackpack-x86_64/wxwidgets-2.8.12-x86_64-4gds.txz.html.