From 74883a17358d8d6ae686f49febbbeb71e5e99a75 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 23 Feb 2010 01:59:59 +0000 Subject: [PATCH] Fix some wxChoice events that were still wxComboBox events. Fixes issue 2334 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5114 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp | 18 +++++++++--------- .../Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp b/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp index 89ec95625a..fefd1b4b0f 100644 --- a/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp +++ b/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp @@ -46,17 +46,17 @@ BEGIN_EVENT_TABLE(GCPadConfigDialog,wxDialog) EVT_BUTTON(ID_CANCEL, GCPadConfigDialog::OnCloseClick) EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK, GCPadConfigDialog::NotebookPageChanged) - EVT_COMBOBOX(IDC_JOYNAME, GCPadConfigDialog::ChangeSettings) + EVT_CHOICE(IDC_JOYNAME, GCPadConfigDialog::ChangeSettings) EVT_CHECKBOX(IDC_RUMBLE, GCPadConfigDialog::ChangeSettings) - EVT_COMBOBOX(IDC_RUMBLE_STRENGTH, GCPadConfigDialog::ChangeSettings) - EVT_COMBOBOX(IDC_DEAD_ZONE_LEFT, GCPadConfigDialog::ChangeSettings) - EVT_COMBOBOX(IDC_DEAD_ZONE_RIGHT, GCPadConfigDialog::ChangeSettings) - EVT_COMBOBOX(IDC_STICK_DIAGONAL, GCPadConfigDialog::ChangeSettings) + EVT_CHOICE(IDC_RUMBLE_STRENGTH, GCPadConfigDialog::ChangeSettings) + EVT_CHOICE(IDC_DEAD_ZONE_LEFT, GCPadConfigDialog::ChangeSettings) + EVT_CHOICE(IDC_DEAD_ZONE_RIGHT, GCPadConfigDialog::ChangeSettings) + EVT_CHOICE(IDC_STICK_DIAGONAL, GCPadConfigDialog::ChangeSettings) EVT_CHECKBOX(IDC_STICK_S2C, GCPadConfigDialog::ChangeSettings) - EVT_COMBOBOX(IDC_TRIGGER_TYPE, GCPadConfigDialog::ChangeSettings) - EVT_COMBOBOX(IDC_STICK_SOURCE, GCPadConfigDialog::ChangeSettings) - EVT_COMBOBOX(IDC_CSTICK_SOURCE, GCPadConfigDialog::ChangeSettings) - EVT_COMBOBOX(IDC_TRIGGER_SOURCE, GCPadConfigDialog::ChangeSettings) + EVT_CHOICE(IDC_TRIGGER_TYPE, GCPadConfigDialog::ChangeSettings) + EVT_CHOICE(IDC_STICK_SOURCE, GCPadConfigDialog::ChangeSettings) + EVT_CHOICE(IDC_CSTICK_SOURCE, GCPadConfigDialog::ChangeSettings) + EVT_CHOICE(IDC_TRIGGER_SOURCE, GCPadConfigDialog::ChangeSettings) EVT_SLIDER(IDS_STICK_PRESS, GCPadConfigDialog::ChangeSettings) EVT_SLIDER(IDS_CSTICK_PRESS, GCPadConfigDialog::ChangeSettings) EVT_SLIDER(IDS_TRIGGER_PRESS, GCPadConfigDialog::ChangeSettings) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp index d77cb7ce3c..ffa88e2b4d 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp @@ -40,8 +40,8 @@ BEGIN_EVENT_TABLE(GFXConfigDialogOGL,wxDialog) EVT_CHECKBOX(ID_VSYNC, GFXConfigDialogOGL::GeneralSettingsChanged) EVT_CHECKBOX(ID_RENDERTOMAINWINDOW, GFXConfigDialogOGL::GeneralSettingsChanged) EVT_COMBOBOX(ID_FULLSCREENCB, GFXConfigDialogOGL::GeneralSettingsChanged) - EVT_COMBOBOX(ID_WINDOWRESOLUTIONCB, GFXConfigDialogOGL::GeneralSettingsChanged) - EVT_COMBOBOX(ID_WINDOWFSRESOLUTIONCB, GFXConfigDialogOGL::GeneralSettingsChanged) + EVT_CHOICE(ID_WINDOWRESOLUTIONCB, GFXConfigDialogOGL::GeneralSettingsChanged) + EVT_CHOICE(ID_WINDOWFSRESOLUTIONCB, GFXConfigDialogOGL::GeneralSettingsChanged) EVT_CHOICE(ID_MAXANISOTROPY, GFXConfigDialogOGL::GeneralSettingsChanged) EVT_CHOICE(ID_MSAAMODECB, GFXConfigDialogOGL::GeneralSettingsChanged) EVT_CHECKBOX(ID_NATIVERESOLUTION, GFXConfigDialogOGL::GeneralSettingsChanged) @@ -215,10 +215,10 @@ void GFXConfigDialogOGL::InitializeGUIValues() m_Fullscreen->SetValue(g_Config.bFullscreen); int num = 0; - m_WindowResolutionCB->FindString(wxString::FromAscii(g_Config.cInternalRes)); + num = m_WindowResolutionCB->FindString(wxString::FromAscii(g_Config.cInternalRes)); m_WindowResolutionCB->SetSelection(num); - m_WindowFSResolutionCB->FindString(wxString::FromAscii(g_Config.cFSResolution)); + num = m_WindowFSResolutionCB->FindString(wxString::FromAscii(g_Config.cFSResolution)); m_WindowFSResolutionCB->SetSelection(num); #ifndef _WIN32 m_HideCursor->SetValue(g_Config.bHideCursor);