ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix wxWidgets 3.0 Windows command line help hack 

wxWidgets 3.0 now calls Output() instead of Printf() for wxMessageOutput
derived classes. Fix the command line help hack so it works for that.
Also use wxString instead of FastFormatUnicode, it's simply not needed
here.
This commit is contained in:
Jonathan Li 2015-06-10 14:46:39 +01:00
parent 760de9915b
commit 2a7d7b54d3
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pcsx2/gui/AppMain.cpp
View File

@ -280,12 +280,22 @@ void Pcsx2App::PadKeyDispatch( const keyEvent& ev )
// displaying a readable --help command line list, so I replace it here with a custom one // displaying a readable --help command line list, so I replace it here with a custom one
// that formats things nicer. // that formats things nicer.
// //
// This is only used in Windows. It's not possible to have wxWidgets show a localised
// command line help message in cmd/powershell/mingw bash. It can be done in English
// locales ( using AttachConsole, WriteConsole, FreeConsole combined with
// wxMessageOutputStderr), but completely fails for some other languages (i.e. Japanese).
#ifdef _WIN32
class pxMessageOutputMessageBox : public wxMessageOutput class pxMessageOutputMessageBox : public wxMessageOutput
{ {
public: public:
pxMessageOutputMessageBox() { } pxMessageOutputMessageBox() { }
#if wxMAJOR_VERSION < 3
virtual void Printf(const wxChar* format, ...); virtual void Printf(const wxChar* format, ...);
#endif
// DoPrintf in wxMessageOutputBase (wxWidgets 3.0) uses this.
virtual void Output(const wxString &out);
}; };
// EXTRAORDINARY HACK! wxWidgets does not provide a clean way of overriding the commandline options // EXTRAORDINARY HACK! wxWidgets does not provide a clean way of overriding the commandline options
@ -294,21 +304,31 @@ public:
// wxMessageOutputMessageBox::PrintF is only used in like two places, so we can just check for the // wxMessageOutputMessageBox::PrintF is only used in like two places, so we can just check for the
// commandline window using an identifier we know is contained in it, and then format our own window // commandline window using an identifier we know is contained in it, and then format our own window
// display. :D --air // display. :D --air
#if wxMAJOR_VERSION < 3
void pxMessageOutputMessageBox::Printf(const wxChar* format, ...) void pxMessageOutputMessageBox::Printf(const wxChar* format, ...)
{ {
using namespace pxSizerFlags;
va_list args; va_list args;
va_start(args, format); va_start(args, format);
wxString out; wxString out;
out.PrintfV(format, args); out.PrintfV(format, args);
va_end(args); va_end(args);
FastFormatUnicode isoFormatted; Output(out);
isoFormatted.Write( L"[%s]", _("IsoFile") ); }
int pos = out.Find( isoFormatted.c_str() ); #endif
if(pos == wxNOT_FOUND) void pxMessageOutputMessageBox::Output(const wxString& out)
{
using namespace pxSizerFlags;
wxString isoFormatted;
isoFormatted.Printf(L"[%s]", _("IsoFile"));
int pos = out.Find(isoFormatted.c_str());
// I've no idea when this is true.
if (pos == wxNOT_FOUND)
{ {
Msgbox::Alert( out ); return; Msgbox::Alert( out ); return;
} }
@ -340,6 +360,7 @@ void pxMessageOutputMessageBox::Printf(const wxChar* format, ...)
pxIssueConfirmation(popup, MsgButtons().Close() ); pxIssueConfirmation(popup, MsgButtons().Close() );
} }
#endif
wxMessageOutput* Pcsx2AppTraits::CreateMessageOutput() wxMessageOutput* Pcsx2AppTraits::CreateMessageOutput()
{ {