diff options
| author | death2droid <death2droid@gmail.com> | 2009-05-31 00:55:20 +0000 |
|---|---|---|
| committer | death2droid <death2droid@gmail.com> | 2009-05-31 00:55:20 +0000 |
| commit | 71e895ddf714b7c325dffaac1d8a5118f0147a0c (patch) | |
| tree | 4bd7fc62a7ee15b8c424385e7439a73ab8923930 /Source/Core | |
| parent | 81354ea368710a7001b51a8bd947bcc892a18f6a (diff) | |
Small clean up to InfoWindow and fix for Summarize_Drives()
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3299 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/DolphinWX.vcproj | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/InfoWindow.cpp | 7 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Summarize.h | 12 |
3 files changed, 15 insertions, 8 deletions
diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj index a195b42330..b9f0da8888 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcproj +++ b/Source/Core/DolphinWX/DolphinWX.vcproj @@ -1200,6 +1200,10 @@ RelativePath=".\src\ISOFile.h"
>
</File>
+ <File
+ RelativePath=".\Src\Summarize.h"
+ >
+ </File>
</Filter>
<File
RelativePath=".\src\main.cpp"
diff --git a/Source/Core/DolphinWX/Src/InfoWindow.cpp b/Source/Core/DolphinWX/Src/InfoWindow.cpp index 9364d35624..36ea2fdf6e 100644 --- a/Source/Core/DolphinWX/Src/InfoWindow.cpp +++ b/Source/Core/DolphinWX/Src/InfoWindow.cpp @@ -21,6 +21,7 @@ #include "Core.h" #include "ConfigManager.h" #include "CDUtils.h" +#include "Summarize.h"//This holds all the summarize functions BEGIN_EVENT_TABLE(wxInfoWindow, wxWindow) EVT_SIZE( wxInfoWindow::OnEvent_Window_Resize) @@ -47,15 +48,15 @@ wxInfoWindow::~wxInfoWindow() // On Disposal } -#include "Summarize.h";//Just used this to keep stuff clean. - void wxInfoWindow::Init_ChildControls() { std::string Info; Info = StringFromFormat("Dolphin Revision: %s", SVN_REV_STR); + + Info.append(StringFromFormat( - "\n\n%s\n\n%s\n%s\n\n%s\n\n", + "\n\n%s\n%s\n%s\n\n%s\n\n", Summarize_Drives().c_str(), Summarize_CPU().c_str(), Summarize_Plug().c_str(), diff --git a/Source/Core/DolphinWX/Src/Summarize.h b/Source/Core/DolphinWX/Src/Summarize.h index 3e9a09294f..1fae2c611a 100644 --- a/Source/Core/DolphinWX/Src/Summarize.h +++ b/Source/Core/DolphinWX/Src/Summarize.h @@ -109,15 +109,17 @@ std::string Summarize_CPU() std::string Summarize_Drives()
{
char ** drives = cdio_get_devices();
+ std::string drive;
for (int i = 0; drives[i] != NULL && i < 24; i++)
{
- return StringFromFormat(
- "CD/DVD Drive%d: %s",
- i+1,
- drives[i]
- );
+ drive += StringFromFormat(
+ "CD/DVD Drive%d: %s\n",
+ i+1,
+ drives[i]
+ );
}
+ return drive;
}
#endif //__SUMMARIZE_H__
\ No newline at end of file |