diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-02-03 09:31:06 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-02-03 09:31:06 +0000 |
| commit | f3e5f06deffb0495d298a01e158a35cdb5295212 (patch) | |
| tree | ee1821b572d87e39e42aff8def2157a32db4986a /Source/Core | |
| parent | 328b2f34ba2bdb0f27b9ef173d7dec93b7369edf (diff) | |
GameCube Configuration: Changed "null" to "<Nothing>", I think it's easier to understand
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2085 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/ConfigMain.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 949d042e29..91b1d3d1ba 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -309,8 +309,8 @@ void CConfigMain::CreateGUIControls() GCEXIDeviceText[1] = new wxStaticText(GamecubePage, ID_GC_EXIDEVICE_SLOTB_TEXT, wxT("Slot B"), wxDefaultPosition, wxDefaultSize); GCEXIDeviceText[2] = new wxStaticText(GamecubePage, ID_GC_EXIDEVICE_SP1_TEXT, wxT("SP1 "), wxDefaultPosition, wxDefaultSize); GCEXIDeviceText[2]->SetToolTip(wxT("Serial Port 1 - This is the port the network adapter uses")); - const wxString SlotDevices[] = {wxT("null"),wxT("Memory Card"), wxT("Mic")}; - const wxString SP1Devices[] = {wxT("null"),wxT("BBA")}; + const wxString SlotDevices[] = {wxT("<Nothing>"),wxT("Memory Card"), wxT("Mic")}; + const wxString SP1Devices[] = {wxT("<Nothing>"),wxT("BBA")}; GCEXIDevice[0] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SLOTA, wxDefaultPosition, wxDefaultSize, 3, SlotDevices, 0, wxDefaultValidator); GCEXIDevice[1] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SLOTB, wxDefaultPosition, wxDefaultSize, 3, SlotDevices, 0, wxDefaultValidator); GCEXIDevice[2] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SP1, wxDefaultPosition, wxDefaultSize, 2, SP1Devices, 0, wxDefaultValidator); @@ -328,7 +328,7 @@ void CConfigMain::CreateGUIControls() else if (SConfig::GetInstance().m_EXIDevice[i] == EXIDEVICE_ETH) GCEXIDevice[i]->SetStringSelection(SP1Devices[1]); else - GCEXIDevice[i]->SetStringSelection(wxT("null")); + GCEXIDevice[i]->SetStringSelection(wxT("<Nothing>")); if (!isMemcard && i < 2) GCMemcardPath[i]->Disable(); } @@ -338,7 +338,7 @@ void CConfigMain::CreateGUIControls() GCSIDeviceText[1] = new wxStaticText(GamecubePage, ID_GC_SIDEVICE_TEXT, wxT("Port 2"), wxDefaultPosition, wxDefaultSize); GCSIDeviceText[2] = new wxStaticText(GamecubePage, ID_GC_SIDEVICE_TEXT, wxT("Port 3"), wxDefaultPosition, wxDefaultSize); GCSIDeviceText[3] = new wxStaticText(GamecubePage, ID_GC_SIDEVICE_TEXT, wxT("Port 4"), wxDefaultPosition, wxDefaultSize); - const wxString SIDevices[] = {wxT("null"),wxT("Standard Controller")}; + const wxString SIDevices[] = {wxT("<Nothing>"),wxT("Standard Controller")}; GCSIDevice[0] = new wxChoice(GamecubePage, ID_GC_SIDEVICE0, wxDefaultPosition, wxDefaultSize, 2, SIDevices, 0, wxDefaultValidator); GCSIDevice[1] = new wxChoice(GamecubePage, ID_GC_SIDEVICE1, wxDefaultPosition, wxDefaultSize, 2, SIDevices, 0, wxDefaultValidator); GCSIDevice[2] = new wxChoice(GamecubePage, ID_GC_SIDEVICE2, wxDefaultPosition, wxDefaultSize, 2, SIDevices, 0, wxDefaultValidator); |