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

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:
nakeee 2008-10-31 14:05:51 +00:00
parent 84614f31f4
commit dfd3d01ceb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Src/AboutDolphin.cpp
View File

@ -47,7 +47,7 @@ void AboutDolphin::CreateGUIControls()
sbDolphinLogo->SetBitmap(*DolphinLogo); sbDolphinLogo->SetBitmap(*DolphinLogo);
Message = new wxStaticText(this, ID_MESSAGE, 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" "Copyright (c) by F|RES, ector, yaz0r 2003-2008\n"
"Additional code by Schibo and Costis.\n\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," "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" "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" "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" "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); wxDefaultPosition, wxDefaultSize, 0);
Message->Wrap(this->GetSize().GetWidth()); Message->Wrap(this->GetSize().GetWidth());

4
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -389,8 +389,10 @@ void CFrame::OnHelp(wxCommandEvent& event)
frame.ShowModal(); frame.ShowModal();
win.SetHWND(0); win.SetHWND(0);
#else #else
AboutBox frame(NULL); wxWindow win;
AboutDolphin frame(&win);
frame.ShowModal(); frame.ShowModal();
#endif #endif
break; break;
} }