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

remove PanicAlert 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3078 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99 2009-04-25 19:23:57 +00:00
parent 9849717d3a
commit 915dcec33e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/Src/InfoWindow.cpp
View File

@ -91,7 +91,7 @@ void wxInfoWindow::Init_ChildControls()
{ {
std::string Info; std::string Info;
Info = StringFromFormat("Dolphin Revision: %s", SVN_REV_STR); Info = StringFromFormat("Dolphin Revision: %s", SVN_REV_STR);
char ** drives = cdio_get_devices(); char ** drives = cdio_get_devices();
for (int i = 0; drives[i] != NULL && i < 24; i++) for (int i = 0; drives[i] != NULL && i < 24; i++)
{ {
@ -100,10 +100,7 @@ void wxInfoWindow::Init_ChildControls()
} }
Info.append(StringFromFormat("\nPlugin 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())); Summarize_Plug().c_str(), Summarize_Settings().c_str(), cpu_info.Summarize().c_str()));
PanicAlert("%s", Info.c_str());
// Main Notebook // Main Notebook
m_Notebook_Main = new wxNotebook(this, ID_NOTEBOOK_MAIN, wxDefaultPosition, wxDefaultSize); m_Notebook_Main = new wxNotebook(this, ID_NOTEBOOK_MAIN, wxDefaultPosition, wxDefaultSize);
// --- Tabs --- // --- Tabs ---
@ -112,7 +109,6 @@ void wxInfoWindow::Init_ChildControls()
m_Tab_Log = new wxPanel(m_Notebook_Main, ID_TAB_LOG, wxDefaultPosition, wxDefaultSize); m_Tab_Log = new wxPanel(m_Notebook_Main, ID_TAB_LOG, wxDefaultPosition, wxDefaultSize);
m_TextCtrl_Log = new wxTextCtrl(m_Tab_Log, ID_TEXTCTRL_LOG, wxString::FromAscii(Info.c_str()), 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); wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
wxBoxSizer *HStrip1 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *HStrip1 = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer *sTabLog = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sTabLog = new wxBoxSizer(wxVERTICAL);
sTabLog->Add(HStrip1, 0, wxALL, 5); sTabLog->Add(HStrip1, 0, wxALL, 5);