diff options
| author | nakeee <nakeee@gmail.com> | 2008-10-31 14:05:51 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2008-10-31 14:05:51 +0000 |
| commit | dfd3d01cebdb2fc9e85a6b5857d6f90d4ca26ce9 (patch) | |
| tree | 77a3f441555ba7f6ecf8f6657bbf9405ceae34da | |
| parent | 84614f31f42930e149aad217f5eb9ef59b907866 (diff) | |
semi fix for about box on linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1025 8ced0084-cf51-0410-be5f-012b33b47a6e
| -rw-r--r-- | Source/Core/DolphinWX/Src/AboutDolphin.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Frame.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp index 634e293088..61b29f0c4c 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp @@ -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());
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 209a964e43..db95d887f7 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -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;
}
|