semi fix for about box on linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1025 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
84614f31f4
commit
dfd3d01ceb
|
@ -47,7 +47,7 @@ void AboutDolphin::CreateGUIControls()
|
|||
sbDolphinLogo->SetBitmap(*DolphinLogo);
|
||||
|
||||
Message = new wxStaticText(this, ID_MESSAGE,
|
||||
wxString::Format(_T("Dolphin SVN revision %s\nCPU: %s\n\n" // Maybe add OS/arch info too?
|
||||
wxString::Format(wxT("Dolphin SVN revision %s\nCPU: %s\n\n" // Maybe add OS/arch info too?
|
||||
"Copyright (c) by F|RES, ector, yaz0r 2003-2008\n"
|
||||
"Additional code by Schibo and Costis.\n\n"
|
||||
"Greets to Azimer, Caustik, Costis, Cyrus64, Desktopman, Epsilon, Hotquik, Jazzmin, mamedevs, (Lazer)Maksen, Martin64, or9, Runik, Schibo,"
|
||||
|
@ -59,7 +59,7 @@ void AboutDolphin::CreateGUIControls()
|
|||
"Thanks to Shinji Chiba for his GC ADPCM decoder.\n\n"
|
||||
"We are not affiliated with Nintendo in any way. Gamecube and Wii are trademarks of Nintendo.\n"
|
||||
"The emulator is for educational purposes only and we do not support using this emulator to play games you do not legally own.\n\n"
|
||||
"Beta testers: EFX, Falcon4ever and Shadowprince (kx)."), SVN_REV_STR, (wxString)cpu_info.Summarize()),
|
||||
"Beta testers: EFX, Falcon4ever and Shadowprince (kx)."), SVN_REV_STR, cpu_info.Summarize().c_str()),
|
||||
wxDefaultPosition, wxDefaultSize, 0);
|
||||
Message->Wrap(this->GetSize().GetWidth());
|
||||
|
||||
|
|
|
@ -389,8 +389,10 @@ void CFrame::OnHelp(wxCommandEvent& event)
|
|||
frame.ShowModal();
|
||||
win.SetHWND(0);
|
||||
#else
|
||||
AboutBox frame(NULL);
|
||||
wxWindow win;
|
||||
AboutDolphin frame(&win);
|
||||
frame.ShowModal();
|
||||
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue