piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

compile fix or why I hate wxstring

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3396 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2009-06-09 21:10:14 +00:00
parent 0b082d303b
commit da30c24c5e
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
View File

@ -29,7 +29,7 @@
#include "../TextureMngr.h" #include "../TextureMngr.h"
#include "VertexShaderManager.h" #include "VertexShaderManager.h"
#include "PostProcessing.h" #include "../PostProcessing.h"
BEGIN_EVENT_TABLE(ConfigDialog,wxDialog) BEGIN_EVENT_TABLE(ConfigDialog,wxDialog)
EVT_CLOSE(ConfigDialog::OnClose) EVT_CLOSE(ConfigDialog::OnClose)
@ -281,12 +281,12 @@ void ConfigDialog::CreateGUIControls()
{ {
File::FSTEntry entry; File::FSTEntry entry;
File::ScanDirectoryTree("User/Shaders", entry); File::ScanDirectoryTree("User/Shaders", entry);
for (int i = 0; i < entry.children.size(); i++) for (u32 i = 0; i < entry.children.size(); i++)
{ {
std::string name = entry.children[i].virtualName.c_str(); std::string name = entry.children[i].virtualName.c_str();
if (!stricmp(name.substr(name.size() - 4).c_str(), ".txt")) if (!strcasecmp(name.substr(name.size() - 4).c_str(), ".txt"))
name = name.substr(0, name.size() - 4); name = name.substr(0, name.size() - 4);
m_PostShaderCB->Append(wxT(name)); m_PostShaderCB->Append(wxString::FromAscii(name.c_str()));
} }
} }
else else
@ -294,9 +294,9 @@ void ConfigDialog::CreateGUIControls()
File::CreateDir("User/Shaders"); File::CreateDir("User/Shaders");
} }
wxString shader = wxT(g_Config.sPostProcessingShader.c_str()); wxString shader= wxString::FromAscii(g_Config.sPostProcessingShader.c_str());
if (shader == "") if (shader == _(""))
shader = "(off)"; shader = wxT("(off)");
m_PostShaderCB->SetStringSelection(shader); m_PostShaderCB->SetStringSelection(shader);
// How to use the wxGridBagSizer: The wxGBPosition() must have a column and row // How to use the wxGridBagSizer: The wxGBPosition() must have a column and row
@ -525,9 +525,9 @@ void ConfigDialog::ReloadShaderClick(wxCommandEvent& WXUNUSED (event))
void ConfigDialog::EditShaderClick(wxCommandEvent& WXUNUSED (event)) void ConfigDialog::EditShaderClick(wxCommandEvent& WXUNUSED (event))
{ {
if (m_PostShaderCB->GetStringSelection() == "(off)") if (m_PostShaderCB->GetStringSelection() == wxT("(off)"))
return; return;
wxString shader = "User/Shaders/" + m_PostShaderCB->GetStringSelection() + ".txt"; wxString shader = wxT("User/Shaders/") + m_PostShaderCB->GetStringSelection() + _(".txt");
if (wxFileExists(shader)) if (wxFileExists(shader))
{ {
wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_("txt")); wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_("txt"));
@ -622,7 +622,7 @@ void ConfigDialog::GeneralSettingsChanged(wxCommandEvent& event)
} }
break; break;
case ID_POSTSHADER: case ID_POSTSHADER:
g_Config.sPostProcessingShader = m_PostShaderCB->GetString(m_PostShaderCB->GetSelection()); g_Config.sPostProcessingShader = m_PostShaderCB->GetString(m_PostShaderCB->GetSelection()).mb_str();
if (g_Config.sPostProcessingShader == "(off)") if (g_Config.sPostProcessingShader == "(off)")
g_Config.sPostProcessingShader = ""; g_Config.sPostProcessingShader = "";
break; break;

1
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -24,6 +24,7 @@ files = [
'XFB.cpp', 'XFB.cpp',
'TextureConversionShader.cpp', 'TextureConversionShader.cpp',
'OnScreenDisplay.cpp', 'OnScreenDisplay.cpp',
"PostProcessing.cpp",
] ]
compileFlags = [ compileFlags = [
'-fPIC', '-fPIC',