From b86a1bfb2d3a2e5f8a1a15da815336652b251aaa Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 3 Aug 2012 02:32:30 +0000 Subject: [PATCH] Fix compilation with wx 2.9.4 with 2.8 compatibility enabled. Closes #1504. Originally committed to SVN as r6952. --- aegisub/src/aegisublocale.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/aegisub/src/aegisublocale.cpp b/aegisub/src/aegisublocale.cpp index 55847c3c4..35004b5d9 100644 --- a/aegisub/src/aegisublocale.cpp +++ b/aegisub/src/aegisublocale.cpp @@ -104,7 +104,13 @@ int AegisubLocale::PickLanguage() { if (locale) style |= wxCANCEL; - wxSingleChoiceDialog dialog(NULL, "Please choose a language:", "Language", langNames, 0, style); + wxSingleChoiceDialog dialog(NULL, "Please choose a language:", "Language", langNames, +#if wxCHECK_VERSION(2, 9, 4) + (void **)0, +#else + 0, +#endif + style); if (dialog.ShowModal() == wxID_OK) { int picked = dialog.GetSelection(); if (locale && langs[picked] == locale->GetLanguage())