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

warning fixes + compile on linx 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1378 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-02 10:50:58 +00:00
parent afbed76fe7
commit dc3f3eb190
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DebuggerWX/Src/CodeView.cpp
View File

@ -244,7 +244,7 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event)
{ {
// Check if this address has been modified // Check if this address has been modified
int find = -1; int find = -1;
for(int i = 0; i < BlrList.size(); i++) for(u32 i = 0; i < BlrList.size(); i++)
{ {
if(BlrList.at(i).Address == selection) if(BlrList.at(i).Address == selection)
{ find = i; break; } { find = i; break; }

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

@ -35,10 +35,10 @@ CPatchAddEdit::~CPatchAddEdit()
{ {
} }
void CPatchAddEdit::CreateGUIControls(int selection) void CPatchAddEdit::CreateGUIControls(int _selection)
{ {
std::string currentName = onFrame.at(selection).name; std::string currentName = onFrame.at(_selection).name;
std::vector<PatchEngine::PatchEntry> currentEntries = onFrame.at(selection).entries; std::vector<PatchEngine::PatchEntry> currentEntries = onFrame.at(_selection).entries;
wxBoxSizer* sEditPatch = new wxBoxSizer(wxVERTICAL); wxBoxSizer* sEditPatch = new wxBoxSizer(wxVERTICAL);
wxStaticText* EditPatchNameText = new wxStaticText(this, ID_EDITPATCH_NAME_TEXT, _("Name:"), wxDefaultPosition, wxDefaultSize); wxStaticText* EditPatchNameText = new wxStaticText(this, ID_EDITPATCH_NAME_TEXT, _("Name:"), wxDefaultPosition, wxDefaultSize);

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

@ -21,6 +21,7 @@ if not env['osx64']:
'MemcardManager.cpp', 'MemcardManager.cpp',
'MemoryCards/GCMemcard.cpp', 'MemoryCards/GCMemcard.cpp',
'PluginManager.cpp', 'PluginManager.cpp',
'PatchAddEdit.cpp',
'CheatsWindow.cpp', 'CheatsWindow.cpp',
'stdafx.cpp', 'stdafx.cpp',
] ]

1
Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.cpp
View File

@ -374,7 +374,6 @@ void ConfigBox::SetControllerAll(int controller)
void ConfigBox::GetControllerAll(int controller) void ConfigBox::GetControllerAll(int controller)
{ {
wxString tmp; wxString tmp;
char value[64];
long lvalue; long lvalue;
joysticks[controller].ID = m_Joyname[controller]->GetSelection(); joysticks[controller].ID = m_Joyname[controller]->GetSelection();