From 9849717d3ac043b5dfeab446abb9597f167a6b81 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sat, 25 Apr 2009 19:22:55 +0000 Subject: [PATCH] InfoWindow now shows text on linux again, can't explain why it wasnt working before, damn wx git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3077 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/InfoWindow.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/Core/DolphinWX/Src/InfoWindow.cpp b/Source/Core/DolphinWX/Src/InfoWindow.cpp index 725260261f..708a02a205 100644 --- a/Source/Core/DolphinWX/Src/InfoWindow.cpp +++ b/Source/Core/DolphinWX/Src/InfoWindow.cpp @@ -89,19 +89,20 @@ std::string Summarize_Settings() void wxInfoWindow::Init_ChildControls() { - wxString Info; - Info.Printf(wxT("Dolphin Revision: " SVN_REV_STR)); + std::string Info; + Info = StringFromFormat("Dolphin Revision: %s", SVN_REV_STR); char ** drives = cdio_get_devices(); for (int i = 0; drives[i] != NULL && i < 24; i++) { - Info.Append(wxString::Format(wxT("\nCD/DVD Drive%d: %s"), i+1, drives[i])); + + Info.append(StringFromFormat("\nCD/DVD Drive%d: %s", i+1, drives[i])); } - Info.Append(wxString::Format(wxT("Plugin Information\n\n%s\n%s\nProcessor Information:%s\n"), + Info.append(StringFromFormat("\nPlugin Information\n\n%s\n%s\nProcessor Information:%s\n", Summarize_Plug().c_str(), Summarize_Settings().c_str(), cpu_info.Summarize().c_str())); - + PanicAlert("%s", Info.c_str()); // Main Notebook m_Notebook_Main = new wxNotebook(this, ID_NOTEBOOK_MAIN, wxDefaultPosition, wxDefaultSize); @@ -109,7 +110,7 @@ void wxInfoWindow::Init_ChildControls() // $ Log Tab m_Tab_Log = new wxPanel(m_Notebook_Main, ID_TAB_LOG, wxDefaultPosition, wxDefaultSize); - m_TextCtrl_Log = new wxTextCtrl(m_Tab_Log, ID_TEXTCTRL_LOG, Info, wxDefaultPosition, wxSize(100, 600), + m_TextCtrl_Log = new wxTextCtrl(m_Tab_Log, ID_TEXTCTRL_LOG, wxString::FromAscii(Info.c_str()), wxDefaultPosition, wxSize(100, 600), wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP); wxBoxSizer *HStrip1 = new wxBoxSizer(wxHORIZONTAL);