Fix compile issues on windows with unicode wxwidgets, as MSVC (of course) does not follow the ISO C99 standard.

This commit is contained in:
rdb 2009-10-19 09:40:25 +00:00
parent 2407c6883a
commit fc10dabe5b

View File

@ -24,57 +24,57 @@ extern "C" { void CPSEnableForegroundOperation(ProcessSerialNumber* psn); }
#endif #endif
static const wxString static const wxString
self_signed_cert_text = _T self_signed_cert_text =
("This Panda3D application has been signed by what's known as a " _T("This Panda3D application has been signed by what's known as a ")
"self-signed certificate. This means the name on the certificate can't " _T("self-signed certificate. This means the name on the certificate can't ")
"be verified, and you have no way of knowing for sure who wrote it.\n\n" _T("be verified, and you have no way of knowing for sure who wrote it.\n\n")
"We recommend you click Cancel to avoid running this application."); _T("We recommend you click Cancel to avoid running this application.");
static const wxString static const wxString
unknown_auth_cert_text = _T unknown_auth_cert_text =
("This Panda3D application has been signed, but we don't recognize " _T("This Panda3D application has been signed, but we don't recognize ")
"the authority that verifies the signature. This means the name " _T("the authority that verifies the signature. This means the name ")
"on the certificate can't be trusted, and you have no way of knowing " _T("on the certificate can't be trusted, and you have no way of knowing ")
"for sure who wrote it.\n\n" _T("for sure who wrote it.\n\n")
"We recommend you click Cancel to avoid running this application."); _T("We recommend you click Cancel to avoid running this application.");
static const wxString static const wxString
verified_cert_text = _T verified_cert_text =
("This Panda3D application has been signed by %s. " _T("This Panda3D application has been signed by %s. ")
"If you trust %s, then click the Run button below " _T("If you trust %s, then click the Run button below ")
"to run this application on your computer. This will also " _T("to run this application on your computer. This will also ")
"automatically approve this and any other applications signed by " _T("automatically approve this and any other applications signed by ")
"%s in the future.\n\n" _T("%s in the future.\n\n")
"If you are unsure about this application, " _T("If you are unsure about this application, ")
"you should click Cancel instead."); _T("you should click Cancel instead.");
static const wxString static const wxString
expired_cert_text = _T expired_cert_text =
("This Panda3D application has been signed by %s, " _T("This Panda3D application has been signed by %s, ")
"but the certificate has expired.\n\n" _T("but the certificate has expired.\n\n")
"You should check the current date set on your computer's clock " _T("You should check the current date set on your computer's clock ")
"to make sure it is correct.\n\n" _T("to make sure it is correct.\n\n")
"If your computer's date is correct, we recommend " _T("If your computer's date is correct, we recommend ")
"you click Cancel to avoid running this application."); _T("you click Cancel to avoid running this application.");
static const wxString static const wxString
generic_error_cert_text = _T generic_error_cert_text =
("This Panda3D application has been signed, but there is a problem " _T("This Panda3D application has been signed, but there is a problem ")
"with the certificate (OpenSSL error code %d).\n\n" _T("with the certificate (OpenSSL error code %d).\n\n")
"We recommend you click Cancel to avoid running this application."); _T("We recommend you click Cancel to avoid running this application.");
static const wxString static const wxString
no_cert_text = _T no_cert_text =
("This Panda3D application has not been signed. This means you have " _T("This Panda3D application has not been signed. This means you have ")
"no way of knowing for sure who wrote it.\n\n" _T("no way of knowing for sure who wrote it.\n\n")
"Click Cancel to avoid running this application."); _T("Click Cancel to avoid running this application.");
// wxWidgets boilerplate macro to define main() and start up the // wxWidgets boilerplate macro to define main() and start up the
// application. // application.
@ -630,3 +630,4 @@ layout() {
GetSize(&width, &height); GetSize(&width, &height);
SetSize(min(width, 600), max(height, 400)); SetSize(min(width, 600), max(height, 400));
} }