mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-04 06:40:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux build fixes. I don't know why ConfigMain is sized oddly on linux.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1130 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2008-11-11 19:09:52 +00:00
parent 7df9681bc2
commit fa1c90a411
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -66,7 +66,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
if (GameIni.Load(GameIniFile.c_str())) if (GameIni.Load(GameIniFile.c_str()))
LoadGameConfig(); LoadGameConfig();
else else
wxMessageBox(wxString::Format("Could not create %s", GameIniFile.c_str()), _("Error"), wxOK|wxICON_ERROR, this); wxMessageBox(wxString::Format(_("Could not create %s"), GameIniFile.c_str()), _("Error"), wxOK|wxICON_ERROR, this);
} }
// Disk header and apploader // Disk header and apploader
@ -112,7 +112,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
CreateDirectoryTree(RootId, beginning, end, pos, (char *)"\\"); CreateDirectoryTree(RootId, beginning, end, pos, (char *)"\\");
m_Treectrl->Expand(RootId); m_Treectrl->Expand(RootId);
SetTitle(wxString::Format("Properties: %s - %s", OpenISO_.GetUniqueID().c_str(), OpenISO_.GetName().c_str())); SetTitle(wxString::Format(_("Properties: %s - %s"), OpenISO_.GetUniqueID().c_str(), OpenISO_.GetName().c_str()));
Fit(); Fit();
} }
@ -366,7 +366,7 @@ void CISOProperties::CreateGUIControls()
void CISOProperties::OnClose(wxCloseEvent& WXUNUSED (event)) void CISOProperties::OnClose(wxCloseEvent& WXUNUSED (event))
{ {
if (!SaveGameConfig(GameIniFile)) if (!SaveGameConfig(GameIniFile))
wxMessageBox(wxString::Format("Could not save %s", GameIniFile.c_str()), _("Error"), wxOK|wxICON_ERROR, this); wxMessageBox(wxString::Format(_("Could not save %s"), GameIniFile.c_str()), _("Error"), wxOK|wxICON_ERROR, this);
Destroy(); Destroy();
} }

2
Source/Core/DolphinWX/Src/SConscript
View File

@ -13,11 +13,11 @@ if not env['osx64']:
files += [ files += [
'AboutDolphin.cpp', 'AboutDolphin.cpp',
'ConfigMain.cpp', 'ConfigMain.cpp',
'FilesystemViewer.cpp',
'Frame.cpp', 'Frame.cpp',
'GameListCtrl.cpp', 'GameListCtrl.cpp',
'Globals.cpp', 'Globals.cpp',
'ISOFile.cpp', 'ISOFile.cpp',
'ISOProperties.cpp',
'MemcardManager.cpp', 'MemcardManager.cpp',
'MemoryCards/GCMemcard.cpp', 'MemoryCards/GCMemcard.cpp',
'PluginManager.cpp', 'PluginManager.cpp',

6
Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp
View File

@ -328,7 +328,11 @@ void ConfigDialog::OnButtonClick(wxCommandEvent& event)
void ConfigDialog::DllAbout(wxCommandEvent& event) void ConfigDialog::DllAbout(wxCommandEvent& event)
{ {
wxString message; wxString message;
_WIN32 ? message = "A simple keyboard and XInput plugin for dolphin." : message = "A simple keyboard plugin for dolphin."; #ifdef _WIN32
message = _("A simple keyboard and XInput plugin for dolphin.");
#else
message = _("A simple keyboard plugin for dolphin.");
#endif
wxMessageBox(_T("Dolphin PadSimple Plugin\nBy ector and F|RES\n\n" + message), wxMessageBox(_T("Dolphin PadSimple Plugin\nBy ector and F|RES\n\n" + message),
_T("Dolphin PadSimple"), wxOK, this); _T("Dolphin PadSimple"), wxOK, this);