From: <sag...@us...> - 2015-06-13 15:41:34
|
Revision: 5308 http://sourceforge.net/p/modplug/code/5308 Author: saga-games Date: 2015-06-13 15:41:27 +0000 (Sat, 13 Jun 2015) Log Message: ----------- [Fix] MF_CHECKED/MF_UNCHECKED are for menu items. Use the correct constants BST_CHECKED/BST_UNCHECKED for checkboxes and radio buttons. Modified Paths: -------------- trunk/OpenMPT/mptrack/Ctrl_ins.cpp trunk/OpenMPT/mptrack/Ctrl_smp.cpp trunk/OpenMPT/mptrack/Mod2wave.cpp trunk/OpenMPT/mptrack/Mpdlgs.cpp trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp trunk/OpenMPT/mptrack/SampleConfigDlg.cpp trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp trunk/OpenMPT/mptrack/TuningDialog.cpp Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp =================================================================== --- trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2015-06-13 14:57:08 UTC (rev 5307) +++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2015-06-13 15:41:27 UTC (rev 5308) @@ -963,7 +963,7 @@ BuildTuningComboBox(); - CheckDlgButton(IDC_CHECK_PITCHTEMPOLOCK, MF_UNCHECKED); + CheckDlgButton(IDC_CHECK_PITCHTEMPOLOCK, BST_UNCHECKED); m_EditPitchTempoLock.SubclassDlgItem(IDC_EDIT_PITCHTEMPOLOCK, this); m_EditPitchTempoLock.AllowNegative(false); m_EditPitchTempoLock.SetLimitText(9); @@ -1341,7 +1341,7 @@ // Only enable Pitch/Tempo Lock for MPTM files or legacy files that have this property enabled. m_CheckPitchTempoLock.EnableWindow((m_sndFile.GetType() == MOD_TYPE_MPT || pIns->pitchToTempoLock.GetRaw() > 0) ? TRUE : FALSE); - CheckDlgButton(IDC_CHECK_PITCHTEMPOLOCK, pIns->pitchToTempoLock.GetRaw() > 0 ? MF_CHECKED : MF_UNCHECKED); + CheckDlgButton(IDC_CHECK_PITCHTEMPOLOCK, pIns->pitchToTempoLock.GetRaw() > 0 ? BST_CHECKED : BST_UNCHECKED); m_EditPitchTempoLock.EnableWindow(pIns->pitchToTempoLock.GetRaw() > 0 ? TRUE : FALSE); if(pIns->pitchToTempoLock.GetRaw() > 0) { Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp =================================================================== --- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2015-06-13 14:57:08 UTC (rev 5307) +++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2015-06-13 15:41:27 UTC (rev 5308) @@ -697,7 +697,7 @@ // Global Volume SetDlgItemInt(IDC_EDIT8, sample.nGlobalVol); // Panning - CheckDlgButton(IDC_CHECK1, (sample.uFlags[CHN_PANNING]) ? MF_CHECKED : MF_UNCHECKED); + CheckDlgButton(IDC_CHECK1, (sample.uFlags[CHN_PANNING]) ? BST_CHECKED : BST_UNCHECKED); if (m_sndFile.GetType() == MOD_TYPE_XM) { SetDlgItemInt(IDC_EDIT9, sample.nPan); //displayed panning with XM is 0-256, just like MPT's internal engine Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp =================================================================== --- trunk/OpenMPT/mptrack/Mod2wave.cpp 2015-06-13 14:57:08 UTC (rev 5307) +++ trunk/OpenMPT/mptrack/Mod2wave.cpp 2015-06-13 15:41:27 UTC (rev 5308) @@ -135,11 +135,11 @@ { CDialog::OnInitDialog(); - CheckDlgButton(IDC_CHECK5, MF_UNCHECKED); // Normalize - CheckDlgButton(IDC_CHECK3, MF_CHECKED); // Cue points + CheckDlgButton(IDC_CHECK5, BST_UNCHECKED); // Normalize + CheckDlgButton(IDC_CHECK3, BST_CHECKED); // Cue points - CheckDlgButton(IDC_CHECK4, MF_UNCHECKED); - CheckDlgButton(IDC_CHECK6, MF_UNCHECKED); + CheckDlgButton(IDC_CHECK4, BST_UNCHECKED); + CheckDlgButton(IDC_CHECK6, BST_UNCHECKED); const bool selection = (m_Settings.minOrder != ORDERINDEX_INVALID && m_Settings.maxOrder != ORDERINDEX_INVALID); CheckRadioButton(IDC_RADIO1, IDC_RADIO2, selection ? IDC_RADIO2 : IDC_RADIO1); @@ -575,8 +575,8 @@ void CWaveConvert::UpdateDialog() //------------------------------- { - CheckDlgButton(IDC_CHECK1, (m_dwFileLimit) ? MF_CHECKED : 0); - CheckDlgButton(IDC_CHECK2, (m_dwSongLimit) ? MF_CHECKED : 0); + CheckDlgButton(IDC_CHECK1, (m_dwFileLimit) ? BST_CHECKED : 0); + CheckDlgButton(IDC_CHECK2, (m_dwSongLimit) ? BST_CHECKED : 0); ::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT1), (m_dwFileLimit) ? TRUE : FALSE); ::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT2), (m_dwSongLimit) ? TRUE : FALSE); @@ -609,8 +609,8 @@ // When choosing a specific sample slot, we cannot use per-channel or per-instrument export if(m_CbnSampleSlot.GetCurSel() > 0) { - CheckDlgButton(IDC_CHECK4, MF_UNCHECKED); - CheckDlgButton(IDC_CHECK6, MF_UNCHECKED); + CheckDlgButton(IDC_CHECK4, BST_UNCHECKED); + CheckDlgButton(IDC_CHECK6, BST_UNCHECKED); } UpdateDialog(); } @@ -668,7 +668,7 @@ { if(IsDlgButtonChecked(IDC_CHECK4) != BST_UNCHECKED) { - CheckDlgButton(IDC_CHECK6, MF_UNCHECKED); + CheckDlgButton(IDC_CHECK6, BST_UNCHECKED); m_CbnSampleSlot.SetCurSel(0); m_CbnSampleSlot.EnableWindow(FALSE); } else @@ -684,7 +684,7 @@ { if(IsDlgButtonChecked(IDC_CHECK6) != BST_UNCHECKED) { - CheckDlgButton(IDC_CHECK4, MF_UNCHECKED); + CheckDlgButton(IDC_CHECK4, BST_UNCHECKED); m_CbnSampleSlot.SetCurSel(0); m_CbnSampleSlot.EnableWindow(FALSE); } else Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp =================================================================== --- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2015-06-13 14:57:08 UTC (rev 5307) +++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2015-06-13 15:41:27 UTC (rev 5308) @@ -773,9 +773,9 @@ GetDlgItem(IDC_STATIC_UPDATEINTERVAL)->EnableWindow(m_CurrentDeviceCaps.CanUpdateInterval ? TRUE : FALSE); GetDlgItem(IDC_COMBO_UPDATEINTERVAL)->EnableWindow(m_CurrentDeviceCaps.CanUpdateInterval ? TRUE : FALSE); GetDlgItem(IDC_CHECK4)->SetWindowText(mpt::ToCString(m_CurrentDeviceCaps.ExclusiveModeDescription)); - CheckDlgButton(IDC_CHECK4, m_CurrentDeviceCaps.CanExclusiveMode && m_Settings.ExclusiveMode ? MF_CHECKED : MF_UNCHECKED); - CheckDlgButton(IDC_CHECK5, m_CurrentDeviceCaps.CanBoostThreadPriority && m_Settings.BoostThreadPriority ? MF_CHECKED : MF_UNCHECKED); - CheckDlgButton(IDC_CHECK9, m_CurrentDeviceCaps.CanUseHardwareTiming && m_Settings.UseHardwareTiming ? MF_CHECKED : MF_UNCHECKED); + CheckDlgButton(IDC_CHECK4, m_CurrentDeviceCaps.CanExclusiveMode && m_Settings.ExclusiveMode ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_CHECK5, m_CurrentDeviceCaps.CanBoostThreadPriority && m_Settings.BoostThreadPriority ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_CHECK9, m_CurrentDeviceCaps.CanUseHardwareTiming && m_Settings.UseHardwareTiming ? BST_CHECKED : BST_UNCHECKED); if(theApp.GetSoundDevicesManager()->IsDeviceUnavailable(m_CurrentDeviceInfo.GetIdentifier())) { m_BtnDriverPanel.EnableWindow(FALSE); @@ -1388,24 +1388,24 @@ UpdateDialog(); - if (dwQuality & SNDDSP_EQ) CheckDlgButton(IDC_CHECK3, MF_CHECKED); + if (dwQuality & SNDDSP_EQ) CheckDlgButton(IDC_CHECK3, BST_CHECKED); #else GetDlgItem(IDC_CHECK3)->EnableWindow(FALSE); #endif // Effects #ifndef NO_DSP - if (dwQuality & SNDDSP_MEGABASS) CheckDlgButton(IDC_CHECK1, MF_CHECKED); + if (dwQuality & SNDDSP_MEGABASS) CheckDlgButton(IDC_CHECK1, BST_CHECKED); #else GetDlgItem(IDC_CHECK1)->EnableWindow(FALSE); #endif #ifndef NO_AGC - if (dwQuality & SNDDSP_AGC) CheckDlgButton(IDC_CHECK2, MF_CHECKED); + if (dwQuality & SNDDSP_AGC) CheckDlgButton(IDC_CHECK2, BST_CHECKED); #else GetDlgItem(IDC_CHECK2)->EnableWindow(FALSE); #endif #ifndef NO_DSP - if (dwQuality & SNDDSP_SURROUND) CheckDlgButton(IDC_CHECK4, MF_CHECKED); + if (dwQuality & SNDDSP_SURROUND) CheckDlgButton(IDC_CHECK4, BST_CHECKED); #else GetDlgItem(IDC_CHECK4)->EnableWindow(FALSE); #endif @@ -1444,7 +1444,7 @@ m_CbnReverbPreset.EnableWindow(FALSE); } else { - if (dwQuality & SNDDSP_REVERB) CheckDlgButton(IDC_CHECK6, MF_CHECKED); + if (dwQuality & SNDDSP_REVERB) CheckDlgButton(IDC_CHECK6, BST_CHECKED); } #else GetDlgItem(IDC_CHECK6)->EnableWindow(FALSE); @@ -1743,14 +1743,14 @@ CPropertyPage::OnInitDialog(); // Flags - if (m_dwMidiSetup & MIDISETUP_RECORDVELOCITY) CheckDlgButton(IDC_CHECK1, MF_CHECKED); - if (m_dwMidiSetup & MIDISETUP_RECORDNOTEOFF) CheckDlgButton(IDC_CHECK2, MF_CHECKED); - if (m_dwMidiSetup & MIDISETUP_TRANSPOSEKEYBOARD) CheckDlgButton(IDC_CHECK4, MF_CHECKED); - if (m_dwMidiSetup & MIDISETUP_MIDITOPLUG) CheckDlgButton(IDC_MIDI_TO_PLUGIN, MF_CHECKED); - if (m_dwMidiSetup & MIDISETUP_MIDIMACROCONTROL) CheckDlgButton(IDC_MIDI_MACRO_CONTROL, MF_CHECKED); - if (m_dwMidiSetup & MIDISETUP_MIDIVOL_TO_NOTEVOL) CheckDlgButton(IDC_MIDIVOL_TO_NOTEVOL, MF_CHECKED); - if (m_dwMidiSetup & MIDISETUP_RESPONDTOPLAYCONTROLMSGS) CheckDlgButton(IDC_MIDIPLAYCONTROL, MF_CHECKED); - if (m_dwMidiSetup & MIDISETUP_PLAYPATTERNONMIDIIN) CheckDlgButton(IDC_MIDIPLAYPATTERNONMIDIIN, MF_CHECKED); + if (m_dwMidiSetup & MIDISETUP_RECORDVELOCITY) CheckDlgButton(IDC_CHECK1, BST_CHECKED); + if (m_dwMidiSetup & MIDISETUP_RECORDNOTEOFF) CheckDlgButton(IDC_CHECK2, BST_CHECKED); + if (m_dwMidiSetup & MIDISETUP_TRANSPOSEKEYBOARD) CheckDlgButton(IDC_CHECK4, BST_CHECKED); + if (m_dwMidiSetup & MIDISETUP_MIDITOPLUG) CheckDlgButton(IDC_MIDI_TO_PLUGIN, BST_CHECKED); + if (m_dwMidiSetup & MIDISETUP_MIDIMACROCONTROL) CheckDlgButton(IDC_MIDI_MACRO_CONTROL, BST_CHECKED); + if (m_dwMidiSetup & MIDISETUP_MIDIVOL_TO_NOTEVOL) CheckDlgButton(IDC_MIDIVOL_TO_NOTEVOL, BST_CHECKED); + if (m_dwMidiSetup & MIDISETUP_RESPONDTOPLAYCONTROLMSGS) CheckDlgButton(IDC_MIDIPLAYCONTROL, BST_CHECKED); + if (m_dwMidiSetup & MIDISETUP_PLAYPATTERNONMIDIIN) CheckDlgButton(IDC_MIDIPLAYPATTERNONMIDIIN, BST_CHECKED); // Midi In Device if ((combo = (CComboBox *)GetDlgItem(IDC_COMBO1)) != NULL) Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp =================================================================== --- trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp 2015-06-13 14:57:08 UTC (rev 5307) +++ trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp 2015-06-13 15:41:27 UTC (rev 5308) @@ -131,19 +131,19 @@ CPropertyPage::OnInitDialog(); // Search flags - CheckDlgButton(IDC_CHECK1, m_Flags[FindReplace::Note] ? MF_CHECKED : MF_UNCHECKED); - CheckDlgButton(IDC_CHECK2, m_Flags[FindReplace::Instr] ? MF_CHECKED : MF_UNCHECKED); - CheckDlgButton(IDC_CHECK3, m_Flags[FindReplace::VolCmd] ? MF_CHECKED : MF_UNCHECKED); - CheckDlgButton(IDC_CHECK4, m_Flags[FindReplace::Volume] ? MF_CHECKED : MF_UNCHECKED); - CheckDlgButton(IDC_CHECK5, m_Flags[FindReplace::Command] ? MF_CHECKED : MF_UNCHECKED); - CheckDlgButton(IDC_CHECK6, m_Flags[FindReplace::Param] ? MF_CHECKED : MF_UNCHECKED); + CheckDlgButton(IDC_CHECK1, m_Flags[FindReplace::Note] ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_CHECK2, m_Flags[FindReplace::Instr] ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_CHECK3, m_Flags[FindReplace::VolCmd] ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_CHECK4, m_Flags[FindReplace::Volume] ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_CHECK5, m_Flags[FindReplace::Command] ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_CHECK6, m_Flags[FindReplace::Param] ? BST_CHECKED : BST_UNCHECKED); if(m_bReplace) { - CheckDlgButton(IDC_CHECK7, m_Flags[FindReplace::Replace] ? MF_CHECKED : MF_UNCHECKED); - CheckDlgButton(IDC_CHECK8, m_Flags[FindReplace::ReplaceAll] ? MF_CHECKED : MF_UNCHECKED); + CheckDlgButton(IDC_CHECK7, m_Flags[FindReplace::Replace] ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_CHECK8, m_Flags[FindReplace::ReplaceAll] ? BST_CHECKED : BST_UNCHECKED); } else { - CheckDlgButton(IDC_CHECK7, m_Flags[FindReplace::InChannels] ? MF_CHECKED : MF_UNCHECKED); + CheckDlgButton(IDC_CHECK7, m_Flags[FindReplace::InChannels] ? BST_CHECKED : BST_UNCHECKED); int nButton = IDC_RADIO1; if(m_Flags[FindReplace::FullSearch]) nButton = IDC_RADIO2; @@ -523,7 +523,7 @@ m_tempoSwing = pattern.HasTempoSwing() ? pattern.GetTempoSwing() : sndFile.m_tempoSwing; GetDlgItem(IDC_CHECK1)->EnableWindow(sndFile.GetModSpecifications().hasPatternSignatures ? TRUE : FALSE); - CheckDlgButton(IDC_CHECK1, bOverride ? MF_CHECKED : MF_UNCHECKED); + CheckDlgButton(IDC_CHECK1, bOverride ? BST_CHECKED : BST_UNCHECKED); SetDlgItemInt(IDC_ROWSPERBEAT, nRPB, FALSE); SetDlgItemInt(IDC_ROWSPERMEASURE, nRPM, FALSE); OnOverrideSignature(); @@ -1432,7 +1432,7 @@ } m_CbnOctaveModifier.SetCurSel(m_Settings.octaveModifier + SplitKeyboardSettings::splitOctaveRange); - CheckDlgButton(IDC_PATTERN_OCTAVELINK, (m_Settings.octaveLink && m_Settings.octaveModifier != 0) ? MF_CHECKED : MF_UNCHECKED); + CheckDlgButton(IDC_PATTERN_OCTAVELINK, (m_Settings.octaveLink && m_Settings.octaveModifier != 0) ? BST_CHECKED : BST_UNCHECKED); // Volume m_CbnSplitVolume.AddString("No Change"); @@ -1501,7 +1501,7 @@ void CSplitKeyboadSettings::OnOctaveModifierChanged() //--------------------------------------------------- { - CheckDlgButton(IDC_PATTERN_OCTAVELINK, (m_CbnOctaveModifier.GetCurSel() != 9) ? MF_CHECKED : MF_UNCHECKED); + CheckDlgButton(IDC_PATTERN_OCTAVELINK, (m_CbnOctaveModifier.GetCurSel() != 9) ? BST_CHECKED : BST_UNCHECKED); } Modified: trunk/OpenMPT/mptrack/SampleConfigDlg.cpp =================================================================== --- trunk/OpenMPT/mptrack/SampleConfigDlg.cpp 2015-06-13 14:57:08 UTC (rev 5307) +++ trunk/OpenMPT/mptrack/SampleConfigDlg.cpp 2015-06-13 15:41:27 UTC (rev 5308) @@ -63,15 +63,15 @@ CheckRadioButton(IDC_RADIO1, IDC_RADIO3, IDC_RADIO1 + TrackerSettings::Instance().sampleEditorKeyBehaviour); - CheckDlgButton(IDC_COMPRESS_ITI, TrackerSettings::Instance().compressITI ? MF_CHECKED : MF_UNCHECKED); + CheckDlgButton(IDC_COMPRESS_ITI, TrackerSettings::Instance().compressITI ? BST_CHECKED : BST_UNCHECKED); m_cbnDefaultVolumeHandling.SetItemData(m_cbnDefaultVolumeHandling.AddString("MIDI volume"), PLUGIN_VOLUMEHANDLING_MIDI); m_cbnDefaultVolumeHandling.SetItemData(m_cbnDefaultVolumeHandling.AddString("Dry/Wet ratio"), PLUGIN_VOLUMEHANDLING_DRYWET); m_cbnDefaultVolumeHandling.SetItemData(m_cbnDefaultVolumeHandling.AddString("None"), PLUGIN_VOLUMEHANDLING_IGNORE); m_cbnDefaultVolumeHandling.SetCurSel(TrackerSettings::Instance().DefaultPlugVolumeHandling); - CheckDlgButton(IDC_PREVIEW_SAMPLES, TrackerSettings::Instance().previewInFileDialogs ? MF_CHECKED : MF_UNCHECKED); - CheckDlgButton(IDC_NORMALIZE, TrackerSettings::Instance().m_MayNormalizeSamplesOnLoad ? MF_CHECKED : MF_UNCHECKED); + CheckDlgButton(IDC_PREVIEW_SAMPLES, TrackerSettings::Instance().previewInFileDialogs ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_NORMALIZE, TrackerSettings::Instance().m_MayNormalizeSamplesOnLoad ? BST_CHECKED : BST_UNCHECKED); return TRUE; } Modified: trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp =================================================================== --- trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp 2015-06-13 14:57:08 UTC (rev 5307) +++ trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp 2015-06-13 15:41:27 UTC (rev 5308) @@ -172,7 +172,7 @@ CheckRadioButton(IDC_RADIO1, IDC_RADIO2, (m_nFormat.GetBitDepth() == 8) ? IDC_RADIO1 : IDC_RADIO2 ); CheckRadioButton(IDC_RADIO3, IDC_RADIO4, (m_nFormat.GetEncoding() == SampleIO::unsignedPCM) ? IDC_RADIO3 : IDC_RADIO4); CheckRadioButton(IDC_RADIO5, IDC_RADIO6, (m_nFormat.GetChannelFormat() == SampleIO::mono) ? IDC_RADIO5 : IDC_RADIO6); - CheckDlgButton(IDC_CHK_REMEMBERSETTINGS, (m_bRememberFormat ? MF_CHECKED : MF_UNCHECKED)); + CheckDlgButton(IDC_CHK_REMEMBERSETTINGS, (m_bRememberFormat ? BST_CHECKED : BST_UNCHECKED)); } Modified: trunk/OpenMPT/mptrack/TuningDialog.cpp =================================================================== --- trunk/OpenMPT/mptrack/TuningDialog.cpp 2015-06-13 14:57:08 UTC (rev 5307) +++ trunk/OpenMPT/mptrack/TuningDialog.cpp 2015-06-13 15:41:27 UTC (rev 5308) @@ -296,7 +296,7 @@ if(m_pActiveTuning->GetEditMask() == EM_CONST || m_pActiveTuning->GetEditMask() == EM_CONST_STRICT) { - CheckDlgButton(IDC_CHECK_READONLY, MF_CHECKED); + CheckDlgButton(IDC_CHECK_READONLY, BST_CHECKED); if(m_pActiveTuning->GetEditMask() == EM_CONST_STRICT) m_ButtonReadOnly.EnableWindow(FALSE); else @@ -306,7 +306,7 @@ } else { - CheckDlgButton(IDC_CHECK_READONLY, MF_UNCHECKED); + CheckDlgButton(IDC_CHECK_READONLY, BST_UNCHECKED); m_ButtonReadOnly.EnableWindow(); } @@ -805,14 +805,14 @@ if(IsDlgButtonChecked(IDC_CHECK_READONLY)) { if(m_pActiveTuning->SetEditMask(EM_CONST)) - CheckDlgButton(IDC_CHECK_READONLY, MF_UNCHECKED); + CheckDlgButton(IDC_CHECK_READONLY, BST_UNCHECKED); else UpdateView(UM_TUNINGDATA); } else { if(m_pActiveTuning->SetEditMask(EM_ALLOWALL)) - CheckDlgButton(IDC_CHECK_READONLY, MF_CHECKED); + CheckDlgButton(IDC_CHECK_READONLY, BST_CHECKED); else UpdateView(UM_TUNINGDATA); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |