summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorLPFaint99 <lpfaint99@gmail.com>2009-04-25 19:23:57 +0000
committerLPFaint99 <lpfaint99@gmail.com>2009-04-25 19:23:57 +0000
commit915dcec33eba1ec1920baa9e4ce0e581a1fd7ff6 (patch)
tree849860a3352e12190b7811a75f35ca87727d67d7 /Source
parent9849717d3ac043b5dfeab446abb9597f167a6b81 (diff)
remove PanicAlert
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3078 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinWX/Src/InfoWindow.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/Core/DolphinWX/Src/InfoWindow.cpp b/Source/Core/DolphinWX/Src/InfoWindow.cpp
index 708a02a205..556800d6f0 100644
--- a/Source/Core/DolphinWX/Src/InfoWindow.cpp
+++ b/Source/Core/DolphinWX/Src/InfoWindow.cpp
@@ -91,7 +91,7 @@ void wxInfoWindow::Init_ChildControls()
{
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++)
{
@@ -100,10 +100,7 @@ void wxInfoWindow::Init_ChildControls()
}
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);
// --- Tabs ---
@@ -112,7 +109,6 @@ void wxInfoWindow::Init_ChildControls()
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),
wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
-
wxBoxSizer *HStrip1 = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer *sTabLog = new wxBoxSizer(wxVERTICAL);
sTabLog->Add(HStrip1, 0, wxALL, 5);