diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp index 7ff1fd8446..2a7bbabb77 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp @@ -56,10 +56,10 @@ BEGIN_EVENT_TABLE(ConfigDialog,wxDialog) EVT_CHECKBOX(ID_PROJECTIONHACK2,ConfigDialog::AdvancedSettingsChanged) // Screen size - EVT_COMMAND_SCROLL(IDS_WIDTH, ConfigDialog::AdvancedSettingsChanged) - EVT_COMMAND_SCROLL(IDS_HEIGHT, ConfigDialog::AdvancedSettingsChanged) - EVT_COMMAND_SCROLL(IDS_LEFT, ConfigDialog::AdvancedSettingsChanged) - EVT_COMMAND_SCROLL(IDS_TOP, ConfigDialog::AdvancedSettingsChanged) + EVT_COMMAND_SCROLL(IDS_WIDTH, ConfigDialog::AdvancedSettingsChangedScroll) + EVT_COMMAND_SCROLL(IDS_HEIGHT, ConfigDialog::AdvancedSettingsChangedScroll) + EVT_COMMAND_SCROLL(IDS_LEFT, ConfigDialog::AdvancedSettingsChangedScroll) + EVT_COMMAND_SCROLL(IDS_TOP, ConfigDialog::AdvancedSettingsChangedScroll) EVT_CHECKBOX(IDC_SCREEN_SIZE, ConfigDialog::AdvancedSettingsChanged) EVT_CHECKBOX(ID_SAFETEXTURECACHE,ConfigDialog::AdvancedSettingsChanged) @@ -502,7 +502,7 @@ void ConfigDialog::GeneralSettingsChanged(wxCommandEvent& event) } // Apparently we need a scroll event version of this for the sliders -void ConfigDialog::AdvancedSettingsChanged(wxScrollEvent& event) +void ConfigDialog::AdvancedSettingsChangedScroll(wxScrollEvent& event) { switch (event.GetId()) { @@ -621,8 +621,8 @@ void ConfigDialog::UpdateGUI() m_WindowResolutionCB->Enable(!g_Config.renderToMainframe); // Update screen size labels - m_TextScreenWidth->SetLabel(wxString::Format("Width: %i", g_Config.iScreenWidth)); - m_TextScreenHeight->SetLabel(wxString::Format("Height: %i", g_Config.iScreenHeight)); - m_TextScreenLeft->SetLabel(wxString::Format("Left: %i", g_Config.iScreenLeft)); - m_TextScreenTop->SetLabel(wxString::Format("Top: %i", g_Config.iScreenTop)); -} \ No newline at end of file + m_TextScreenWidth->SetLabel(wxString::Format(wxT("Width: %i"), g_Config.iScreenWidth)); + m_TextScreenHeight->SetLabel(wxString::Format(wxT("Height: %i"), g_Config.iScreenHeight)); + m_TextScreenLeft->SetLabel(wxString::Format(wxT("Left: %i"), g_Config.iScreenLeft)); + m_TextScreenTop->SetLabel(wxString::Format(wxT("Top: %i"), g_Config.iScreenTop)); +} diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h index e917b55152..0a84fc334d 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h @@ -179,7 +179,8 @@ class ConfigDialog : public wxDialog void AboutClick(wxCommandEvent& event); void GeneralSettingsChanged(wxCommandEvent& event); - void AdvancedSettingsChanged(wxCommandEvent& event); void AdvancedSettingsChanged(wxScrollEvent& event); + void AdvancedSettingsChanged(wxCommandEvent& event); + void AdvancedSettingsChangedScroll(wxScrollEvent& event); void TexturePathChange(wxFileDirPickerEvent& event); }; diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp index 3ed8be0053..1fbca1f8e7 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp @@ -122,10 +122,10 @@ BEGIN_EVENT_TABLE(ConfigDialog,wxDialog) EVT_BUTTON(IDB_WM_SHAKE, ConfigDialog::OnButtonClick) EVT_BUTTON(IDB_WM_PITCH_L, ConfigDialog::OnButtonClick) EVT_BUTTON(IDB_WM_PITCH_R, ConfigDialog::OnButtonClick) // IR cursor - EVT_COMMAND_SCROLL(IDS_WIDTH, ConfigDialog::GeneralSettingsChanged) - EVT_COMMAND_SCROLL(IDS_HEIGHT, ConfigDialog::GeneralSettingsChanged) - EVT_COMMAND_SCROLL(IDS_LEFT, ConfigDialog::GeneralSettingsChanged) - EVT_COMMAND_SCROLL(IDS_TOP, ConfigDialog::GeneralSettingsChanged) + EVT_COMMAND_SCROLL(IDS_WIDTH, ConfigDialog::GeneralSettingsChangedScroll) + EVT_COMMAND_SCROLL(IDS_HEIGHT, ConfigDialog::GeneralSettingsChangedScroll) + EVT_COMMAND_SCROLL(IDS_LEFT, ConfigDialog::GeneralSettingsChangedScroll) + EVT_COMMAND_SCROLL(IDS_TOP, ConfigDialog::GeneralSettingsChangedScroll) // Nunchuck EVT_BUTTON(IDB_NC_Z, ConfigDialog::OnButtonClick) EVT_BUTTON(IDB_NC_C, ConfigDialog::OnButtonClick) @@ -1484,7 +1484,7 @@ void ConfigDialog::GeneralSettingsChanged(wxCommandEvent& event) // ======================================================= // Apparently we need a scroll event version of this for the sliders // ------------- -void ConfigDialog::GeneralSettingsChanged(wxScrollEvent& event) +void ConfigDialog::GeneralSettingsChangedScroll(wxScrollEvent& event) { switch (event.GetId()) { @@ -1518,10 +1518,10 @@ void ConfigDialog::UpdateControls() m_SliderTop[Page]->SetValue(g_Config.iIRTop); // Update the labels - m_TextScreenWidth[Page]->SetLabel(wxString::Format("Width: %i", g_Config.iIRWidth)); - m_TextScreenHeight[Page]->SetLabel(wxString::Format("Height: %i", g_Config.iIRHeight)); - m_TextScreenLeft[Page]->SetLabel(wxString::Format("Left: %i", g_Config.iIRLeft)); - m_TextScreenTop[Page]->SetLabel(wxString::Format("Top: %i", g_Config.iIRTop)); + m_TextScreenWidth[Page]->SetLabel(wxString::Format(wxT("Width: %i"), g_Config.iIRWidth)); + m_TextScreenHeight[Page]->SetLabel(wxString::Format(wxT("Height: %i"), g_Config.iIRHeight)); + m_TextScreenLeft[Page]->SetLabel(wxString::Format(wxT("Left: %i"), g_Config.iIRLeft)); + m_TextScreenTop[Page]->SetLabel(wxString::Format(wxT("Top: %i"), g_Config.iIRTop)); } // ============================== diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.h b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.h index 98ca6812f2..3e65794fe3 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.h +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.h @@ -217,7 +217,8 @@ class ConfigDialog : public wxDialog void CreateGUIControls(); void CreateGUIControlsRecording(); void AboutClick(wxCommandEvent& event); - void GeneralSettingsChanged(wxCommandEvent& event); void GeneralSettingsChanged(wxScrollEvent& event); + void GeneralSettingsChanged(wxCommandEvent& event); + void GeneralSettingsChangedScroll(wxScrollEvent& event); void DoConnectReal(); // Real void DoUseReal();