Menu
▾
▴
[OMPT-svn-commit] OpenMPT r21691 - trunk/OpenMPT/mptrack
|
From: <sv...@op...> - 2024-09-23 13:20:25
|
Author: sagamusix Date: Mon Sep 23 15:20:13 2024 New Revision: 21691 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21691 Log: [Ref] Remove final inclusion of resource.h in a header file. Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp trunk/OpenMPT/mptrack/Childfrm.cpp trunk/OpenMPT/mptrack/Ctrl_com.cpp trunk/OpenMPT/mptrack/Ctrl_gen.cpp trunk/OpenMPT/mptrack/Ctrl_ins.cpp trunk/OpenMPT/mptrack/Ctrl_seq.cpp trunk/OpenMPT/mptrack/Ctrl_smp.cpp trunk/OpenMPT/mptrack/EffectVis.cpp trunk/OpenMPT/mptrack/Globals.cpp trunk/OpenMPT/mptrack/Globals.h trunk/OpenMPT/mptrack/Moddoc.cpp trunk/OpenMPT/mptrack/Mptrack.cpp trunk/OpenMPT/mptrack/PatternClipboard.cpp trunk/OpenMPT/mptrack/View_ins.cpp trunk/OpenMPT/mptrack/View_pat.cpp trunk/OpenMPT/mptrack/View_smp.cpp trunk/OpenMPT/mptrack/View_tre.cpp trunk/OpenMPT/mptrack/view_com.cpp trunk/OpenMPT/mptrack/view_com.h Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp ============================================================================== --- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -18,6 +18,7 @@ #include "Mainfrm.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "VstPresets.h" #include "Vstplug.h" #include "../common/FileReader.h" Modified: trunk/OpenMPT/mptrack/Childfrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Childfrm.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Childfrm.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -18,6 +18,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Mptrack.h" +#include "resource.h" #include "view_com.h" #include "View_gen.h" #include "View_ins.h" Modified: trunk/OpenMPT/mptrack/Ctrl_com.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_com.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Ctrl_com.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -16,6 +16,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Mptrack.h" +#include "resource.h" #include "TrackerSettings.h" #include "view_com.h" #include "../soundlib/mod_specifications.h" Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_gen.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -17,6 +17,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Mptrack.h" +#include "resource.h" #include "TrackerSettings.h" #include "View_gen.h" #include "WindowMessages.h" Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_ins.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -21,6 +21,7 @@ #include "Moddoc.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "SelectPluginDialog.h" #include "TrackerSettings.h" #include "TuningDialog.h" Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_seq.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -19,6 +19,7 @@ #include "MPTrackUtil.h" #include "PatternClipboard.h" #include "Reporting.h" +#include "resource.h" #include "TrackerSettings.h" #include "WindowMessages.h" #include "../soundlib/mod_specifications.h" Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_smp.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -24,6 +24,7 @@ #include "ProgressDialog.h" #include "PSRatioCalc.h" #include "Reporting.h" +#include "resource.h" #include "SampleEditorDialogs.h" #include "TrackerSettings.h" #include "View_smp.h" Modified: trunk/OpenMPT/mptrack/EffectVis.cpp ============================================================================== --- trunk/OpenMPT/mptrack/EffectVis.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/EffectVis.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -16,6 +16,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Mptrack.h" +#include "resource.h" #include "View_pat.h" Modified: trunk/OpenMPT/mptrack/Globals.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Globals.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Globals.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -22,6 +22,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Mptrack.h" +#include "resource.h" #include "TrackerSettings.h" #include "../soundlib/mod_specifications.h" @@ -109,6 +110,18 @@ } +afx_msg void CModControlDlg::OnEditCut() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_CUT, 0); } +afx_msg void CModControlDlg::OnEditCopy() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_COPY, 0); } +afx_msg void CModControlDlg::OnEditPaste() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PASTE, 0); } +afx_msg void CModControlDlg::OnEditMixPaste() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE, 0); } +afx_msg void CModControlDlg::OnEditMixPasteITStyle() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE_ITSTYLE, 0); } +afx_msg void CModControlDlg::OnEditPasteFlood() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PASTEFLOOD, 0); } +afx_msg void CModControlDlg::OnEditPushForwardPaste() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PUSHFORWARDPASTE, 0); } +afx_msg void CModControlDlg::OnEditFind() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FIND, 0); } +afx_msg void CModControlDlg::OnEditFindNext() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FINDNEXT, 0); } +afx_msg void CModControlDlg::OnSwitchToView() { if(m_hWndView) ::PostMessage(m_hWndView, WM_MOD_VIEWMSG, VIEWMSG_SETFOCUS, 0); } + + LRESULT CModControlDlg::OnModCtrlMsg(WPARAM wParam, LPARAM lParam) { switch(wParam) @@ -513,6 +526,15 @@ return 0; } +afx_msg void CModControlView::OnEditCut() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_CUT, 0); } +afx_msg void CModControlView::OnEditCopy() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_COPY, 0); } +afx_msg void CModControlView::OnEditPaste() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PASTE, 0); } +afx_msg void CModControlView::OnEditMixPaste() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE, 0); } +afx_msg void CModControlView::OnEditMixPasteITStyle() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE_ITSTYLE, 0); } +afx_msg void CModControlView::OnEditFind() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FIND, 0); } +afx_msg void CModControlView::OnEditFindNext() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FINDNEXT, 0); } +afx_msg void CModControlView::OnSwitchToView() { if(m_hWndView) ::PostMessage(m_hWndView, WM_MOD_VIEWMSG, VIEWMSG_SETFOCUS, 0); } + LRESULT CModControlView::OnModCtrlMsg(WPARAM wParam, LPARAM lParam) { Modified: trunk/OpenMPT/mptrack/Globals.h ============================================================================== --- trunk/OpenMPT/mptrack/Globals.h Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Globals.h Mon Sep 23 15:20:13 2024 (r21691) @@ -12,7 +12,6 @@ #include "openmpt/all/BuildSettings.hpp" #include "DialogBase.h" -#include "resource.h" #include "Settings.h" #include "UpdateHints.h" #include "WindowMessages.h" @@ -67,16 +66,16 @@ void ForgetLastFocusItem() { m_lastFocusItem = nullptr; } void RestoreLastFocusItem(); - afx_msg void OnEditCut() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_CUT, 0); } - afx_msg void OnEditCopy() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_COPY, 0); } - afx_msg void OnEditPaste() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PASTE, 0); } - afx_msg void OnEditMixPaste() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE, 0); } - afx_msg void OnEditMixPasteITStyle() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE_ITSTYLE, 0); } - afx_msg void OnEditPasteFlood() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PASTEFLOOD, 0); } - afx_msg void OnEditPushForwardPaste() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PUSHFORWARDPASTE, 0); } - afx_msg void OnEditFind() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FIND, 0); } - afx_msg void OnEditFindNext() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FINDNEXT, 0); } - afx_msg void OnSwitchToView() { if (m_hWndView) ::PostMessage(m_hWndView, WM_MOD_VIEWMSG, VIEWMSG_SETFOCUS, 0); } + afx_msg void OnEditCut(); + afx_msg void OnEditCopy(); + afx_msg void OnEditPaste(); + afx_msg void OnEditMixPaste(); + afx_msg void OnEditMixPasteITStyle(); + afx_msg void OnEditPasteFlood(); + afx_msg void OnEditPushForwardPaste(); + afx_msg void OnEditFind(); + afx_msg void OnEditFindNext(); + afx_msg void OnSwitchToView(); //{{AFX_VIRTUAL(CModControlDlg) void OnOK() override {} @@ -167,14 +166,14 @@ afx_msg void OnSize(UINT nType, int cx, int cy); afx_msg void OnDestroy(); afx_msg void OnTabSelchange(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnEditCut() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_CUT, 0); } - afx_msg void OnEditCopy() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_COPY, 0); } - afx_msg void OnEditPaste() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PASTE, 0); } - afx_msg void OnEditMixPaste() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE, 0); } //rewbs.mixPaste - afx_msg void OnEditMixPasteITStyle() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE_ITSTYLE, 0); } - afx_msg void OnEditFind() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FIND, 0); } - afx_msg void OnEditFindNext() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FINDNEXT, 0); } - afx_msg void OnSwitchToView() { if (m_hWndView) ::PostMessage(m_hWndView, WM_MOD_VIEWMSG, VIEWMSG_SETFOCUS, 0); } + afx_msg void OnEditCut(); + afx_msg void OnEditCopy(); + afx_msg void OnEditPaste(); + afx_msg void OnEditMixPaste(); + afx_msg void OnEditMixPasteITStyle(); + afx_msg void OnEditFind(); + afx_msg void OnEditFindNext(); + afx_msg void OnSwitchToView(); afx_msg LRESULT OnActivateModView(WPARAM, LPARAM); afx_msg LRESULT OnModCtrlMsg(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnGetToolTipText(WPARAM, LPARAM); Modified: trunk/OpenMPT/mptrack/Moddoc.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Moddoc.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Moddoc.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -27,6 +27,7 @@ #include "ModDocTemplate.h" #include "Mpdlgs.h" #include "Reporting.h" +#include "resource.h" #include "openmpt/streamencoder/StreamEncoderAU.hpp" #include "openmpt/streamencoder/StreamEncoderFLAC.hpp" #include "openmpt/streamencoder/StreamEncoderMP3.hpp" Modified: trunk/OpenMPT/mptrack/Mptrack.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Mptrack.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -28,6 +28,7 @@ #include "MPTrackWine.h" #include "PlugNotFoundDlg.h" #include "Reporting.h" +#include "resource.h" #include "TrackerSettings.h" #include "UpdateCheck.h" #include "WelcomeDialog.h" Modified: trunk/OpenMPT/mptrack/PatternClipboard.cpp ============================================================================== --- trunk/OpenMPT/mptrack/PatternClipboard.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/PatternClipboard.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -14,6 +14,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Clipboard.h" +#include "resource.h" #include "View_pat.h" #include "../soundlib/mod_specifications.h" #include "../soundlib/Tables.h" Modified: trunk/OpenMPT/mptrack/View_ins.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_ins.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/View_ins.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -23,6 +23,7 @@ #include "Moddoc.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "ScaleEnvPointsDlg.h" #include "WindowMessages.h" #include "../common/mptStringBuffer.h" Modified: trunk/OpenMPT/mptrack/View_pat.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_pat.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/View_pat.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -25,6 +25,7 @@ #include "PatternFont.h" #include "PatternGotoDialog.h" #include "Reporting.h" +#include "resource.h" #include "SampleEditorDialogs.h" // For amplification dialog (which is re-used from sample editor) #include "WindowMessages.h" #include "WindowMessages.h" Modified: trunk/OpenMPT/mptrack/View_smp.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_smp.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/View_smp.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -24,6 +24,7 @@ #include "Mptrack.h" #include "OPLInstrDlg.h" #include "Reporting.h" +#include "resource.h" #include "SampleEditorDialogs.h" #include "WindowMessages.h" #include "../common/FileReader.h" Modified: trunk/OpenMPT/mptrack/View_tre.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_tre.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/View_tre.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -25,6 +25,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Reporting.h" +#include "resource.h" #include "TrackerSettings.h" #include "WindowMessages.h" #include "../common/FileReader.h" Modified: trunk/OpenMPT/mptrack/view_com.cpp ============================================================================== --- trunk/OpenMPT/mptrack/view_com.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/view_com.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -21,6 +21,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Mptrack.h" +#include "resource.h" #include "WindowMessages.h" #include "../common/mptStringBuffer.h" #include "../soundlib/mod_specifications.h" @@ -617,6 +618,11 @@ } +void CViewComments::OnShowSamples() { SwitchToList(IDC_LIST_SAMPLES); } +void CViewComments::OnShowInstruments() { SwitchToList(IDC_LIST_INSTRUMENTS); } +void CViewComments::OnShowPatterns() { SwitchToList(IDC_LIST_PATTERNS); } + + bool CViewComments::SwitchToList(int list) { if(list == m_nListId) Modified: trunk/OpenMPT/mptrack/view_com.h ============================================================================== --- trunk/OpenMPT/mptrack/view_com.h Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/view_com.h Mon Sep 23 15:20:13 2024 (r21691) @@ -54,9 +54,9 @@ // cppcheck-suppress duplInheritedMember afx_msg void OnDestroy(); afx_msg void OnSize(UINT nType, int cx, int cy); - afx_msg void OnShowSamples() { SwitchToList(IDC_LIST_SAMPLES); } - afx_msg void OnShowInstruments() { SwitchToList(IDC_LIST_INSTRUMENTS); } - afx_msg void OnShowPatterns() { SwitchToList(IDC_LIST_PATTERNS); } + afx_msg void OnShowSamples(); + afx_msg void OnShowInstruments(); + afx_msg void OnShowPatterns(); afx_msg void OnEndLabelEdit(LPNMHDR pnmhdr, LRESULT *pLResult); afx_msg void OnBeginLabelEdit(LPNMHDR pnmhdr, LRESULT *pLResult); afx_msg void OnDblClickListItem(NMHDR *, LRESULT *); |
