Fix compilation with wx 2.9.4 with 2.8 compatibility enabled. Closes #1504.

Originally committed to SVN as r6952.
This commit is contained in:
Thomas Goyne 2012-08-03 02:32:30 +00:00
parent e2e304f2cb
commit b86a1bfb2d

View file

@ -104,7 +104,13 @@ int AegisubLocale::PickLanguage() {
if (locale) if (locale)
style |= wxCANCEL; 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) { if (dialog.ShowModal() == wxID_OK) {
int picked = dialog.GetSelection(); int picked = dialog.GetSelection();
if (locale && langs[picked] == locale->GetLanguage()) if (locale && langs[picked] == locale->GetLanguage())