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

let dsp null build in debug mode. fixed typo(?) in wiimote emu, so now left click=A, right click=B. Fixed up ConfigMain to write to the correct offset for changing wii language, and the dialog doesn't get extremely wide anymore. Also ignore rcdefs.h. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1180 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2008-11-15 03:53:00 +00:00
parent 9a4dc4e810
commit f48a74a236
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -76,6 +76,10 @@ CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
} }
CreateGUIControls(); CreateGUIControls();
for(u32 i = 0; i < SConfig::GetInstance().m_ISOFolder.size(); i++)
{
ISOPaths->Append(wxString(SConfig::GetInstance().m_ISOFolder[i].c_str(), wxConvUTF8));
}
} }
CConfigMain::~CConfigMain() CConfigMain::~CConfigMain()
@ -84,10 +88,6 @@ CConfigMain::~CConfigMain()
void CConfigMain::CreateGUIControls() void CConfigMain::CreateGUIControls()
{ {
// Why does this not work? some restriction is needed so that huge
// ISO paths dont cause the dialog to become gargantuan
SetMaxSize(wxSize(350, 350));
Notebook = new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize); Notebook = new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize);
GeneralPage = new wxPanel(Notebook, ID_GENERALPAGE, wxDefaultPosition, wxDefaultSize); GeneralPage = new wxPanel(Notebook, ID_GENERALPAGE, wxDefaultPosition, wxDefaultSize);
@ -217,10 +217,6 @@ void CConfigMain::CreateGUIControls()
// Paths page // Paths page
sbISOPaths = new wxStaticBoxSizer(wxVERTICAL, PathsPage, wxT("ISO Directories")); sbISOPaths = new wxStaticBoxSizer(wxVERTICAL, PathsPage, wxT("ISO Directories"));
for(u32 i = 0; i < SConfig::GetInstance().m_ISOFolder.size(); i++)
{
arrayStringFor_ISOPaths.Add(wxString(SConfig::GetInstance().m_ISOFolder[i].c_str(), wxConvUTF8));
}
ISOPaths = new wxListBox(PathsPage, ID_ISOPATHS, wxDefaultPosition, wxDefaultSize, arrayStringFor_ISOPaths, wxLB_SINGLE, wxDefaultValidator); ISOPaths = new wxListBox(PathsPage, ID_ISOPATHS, wxDefaultPosition, wxDefaultSize, arrayStringFor_ISOPaths, wxLB_SINGLE, wxDefaultValidator);
AddISOPath = new wxButton(PathsPage, ID_ADDISOPATH, wxT("Add..."), wxDefaultPosition, wxDefaultSize, 0); AddISOPath = new wxButton(PathsPage, ID_ADDISOPATH, wxT("Add..."), wxDefaultPosition, wxDefaultSize, 0);
RemoveISOPath = new wxButton(PathsPage, ID_REMOVEISOPATH, wxT("Remove"), wxDefaultPosition, wxDefaultSize, 0); RemoveISOPath = new wxButton(PathsPage, ID_REMOVEISOPATH, wxT("Remove"), wxDefaultPosition, wxDefaultSize, 0);

2
Source/Core/DolphinWX/Src/ConfigMain.h
View File

@ -100,7 +100,7 @@ class CConfigMain
{ {
IPL_AR = 0x04D9, IPL_AR = 0x04D9,
IPL_SSV = 0x04EA, IPL_SSV = 0x04EA,
IPL_LNG = 0x04AF, IPL_LNG = 0x04F3,
IPL_PGS = 0x17CC, IPL_PGS = 0x17CC,
IPL_E60 = 0x17D5 IPL_E60 = 0x17D5
}; };

2
Source/Plugins/Plugin_DSP_NULL/Src/Globals.cpp
View File

@ -19,7 +19,7 @@ void DebugLog(const char* _fmt, ...)
vsprintf(Msg, _fmt, ap); vsprintf(Msg, _fmt, ap);
va_end(ap); va_end(ap);
g_dspInitialize.pLog(Msg); g_dspInitialize.pLog(Msg, FALSE);
#endif #endif
} }

2
Source/Plugins/Plugin_Wiimote_Test/Src/FillReport.cpp
View File

@ -51,7 +51,7 @@ void FillReportInfo(wm_core& _core)
if(GetAsyncKeyState(VK_LBUTTON) ? 1 : 0 || GetAsyncKeyState('A') ? 1 : 0) if(GetAsyncKeyState(VK_LBUTTON) ? 1 : 0 || GetAsyncKeyState('A') ? 1 : 0)
_core.a = 1; _core.a = 1;
if(GetAsyncKeyState(VK_LBUTTON) ? 1 : 0 || GetAsyncKeyState('B') ? 1 : 0) if(GetAsyncKeyState(VK_RBUTTON) ? 1 : 0 || GetAsyncKeyState('B') ? 1 : 0)
_core.b = 1; _core.b = 1;
_core.one = GetAsyncKeyState('1') ? 1 : 0; _core.one = GetAsyncKeyState('1') ? 1 : 0;