1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-20 13:11:11 +01:00

Purge ANSI.

Also remove redundant (R) sign from main page in About dialog.
This commit is contained in:
v.audacity
2012-06-23 02:28:04 +00:00
parent 5545efdf8b
commit efaebf27fa
4 changed files with 3 additions and 120 deletions

View File

@@ -215,14 +215,12 @@ void AboutDialog::PopulateAudacityPage( ShuttleGui & S )
}
wxString localeStr = wxLocale::GetSystemEncodingName();
wxString csetStr = wxUSE_UNICODE ? wxT("(Unicode)") : wxT("(ANSI)");
wxString creditStr =
wxT("<html><head><META http-equiv=\"Content-Type\" content=\"text/html; charset=") +
localeStr +
wxT("\"></head>") +
wxT("<body bgcolor=\"#ffffff\"><center>") +
wxT("<h3>Audacity &reg; ") + versionStr + wxT(" " ) + csetStr + wxT("</h3>")+
wxT("<h3>Audacity ") + versionStr + wxT("</h3>")+
_("A Free Digital Audio Editor<br>") +
wxT("<a href=\"http://audacity.sourceforge.net/\">http://audacity.sourceforge.net/</a>") +
wxT("</center><p>") + par1Str +
@@ -429,8 +427,6 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
// wxWidgets version:
informationStr += wxVERSION_STRING;
informationStr += wxT("</td><td/><td>");
/* unicode or not? */
informationStr += wxUSE_UNICODE ? wxT("(Unicode)") : wxT("(ANSI)");
informationStr += wxT("</td></tr>\n"); // end of row
informationStr += wxT("</table>\n"); //end table of libraries
@@ -896,15 +892,3 @@ void AboutDialog::OnOK(wxCommandEvent & WXUNUSED(event))
{
EndModal(wxID_OK);
}
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
// Local Variables:
// c-basic-offset: 3
// indent-tabs-mode: nil
// End:
//
// vim: et sts=3 sw=3
// arch-tag: a8955864-40e2-47aa-923b-cace3994493a

View File

@@ -1303,9 +1303,8 @@ bool AudacityApp::OnInit()
}
if (!handled && !wxString(wxT("-version")).CmpNoCase(argv[option])) {
wxPrintf(wxT("Audacity v%s (%s)\n"),
AUDACITY_VERSION_STRING,
(wxUSE_UNICODE ? wxT("Unicode") : wxT("ANSI")));
wxPrintf(wxT("Audacity v%s\n"),
AUDACITY_VERSION_STRING);
exit(0);
}

View File

@@ -412,12 +412,8 @@ bool EffectNyquist::SetXlispPath()
}
}
#ifdef _UNICODE
/* set_xlisp_path doesn't handle fn_Str() in Unicode build. May or may not actually work. */
nyx_set_xlisp_path(mXlispPath.mb_str());
#else // ANSI
nyx_set_xlisp_path(mXlispPath.fn_str());
#endif // Unicode/ANSI
fname = mXlispPath + wxFILE_SEP_PATH + wxT("nyinit.lsp");
return ::wxFileExists(fname);