Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix wxWidgets Error in About Window #3140

Merged
merged 1 commit into from Oct 5, 2015
Merged

Fix wxWidgets Error in About Window #3140

merged 1 commit into from Oct 5, 2015

Conversation

RisingFog
Copy link
Member

This is required for newer versions of wxWidgets

@phire
Copy link
Member

phire commented Oct 5, 2015

The old code was wrong.

wxALIGN_CENTER implies both wxALIGN_CENTER_HORIZONTAL and wxALIGN_CENTER_VERTICAL The latter obviously conflicts with wxALIGN_BOTTOM

WxWidgets added an assert to detect this back in March,

phire added a commit that referenced this pull request Oct 5, 2015
@phire
Merge pull request #3140 from RisingFog/patch-1
5d1f78d 
Fix wxWidgets Error in About Window
@phire phire merged commit 5d1f78d into dolphin-emu:master Oct 5, 2015
@RisingFog RisingFog deleted the patch-1 branch October 5, 2015 17:56
@phire phire mentioned this pull request Oct 5, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
2 participants
@RisingFog @phire