Index: src/ch/shortcutsdlg.h =================================================================== diff -u -N -r9ea1e103b5fa4ddfebf8028f121ce16e917eec04 -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 --- src/ch/shortcutsdlg.h (.../shortcutsdlg.h) (revision 9ea1e103b5fa4ddfebf8028f121ce16e917eec04) +++ src/ch/shortcutsdlg.h (.../shortcutsdlg.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787) @@ -24,38 +24,21 @@ class CShortcutsDlg : public ictranslate::CLanguageDialog { -// Construction public: - CShortcutsDlg(CWnd* pParent = NULL); // standard constructor - -// Dialog Data - //{{AFX_DATA(CShortcutsDlg) enum { IDD = IDD_SHORTCUTEDIT_DIALOG }; - CComboBoxEx m_ctlPath; - CListCtrl m_ctlShortcuts; - CString m_strName; - //}}AFX_DATA +// Construction +public: + explicit CShortcutsDlg(CWnd* pParent = NULL); // standard constructor -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CShortcutsDlg) - protected: +protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL -// Implementation -public: - const std::vector *m_pcvRecent; // one way only - std::vector m_cvShortcuts; // two-way - shortcuts are being returned through this member protected: void UpdateComboIcon(); void SetComboPath(LPCTSTR lpszPath); - HIMAGELIST m_himl, m_hliml; - bool m_bActualisation; // Generated message map functions - //{{AFX_MSG(CShortcutsDlg) virtual BOOL OnInitDialog(); afx_msg void OnItemchangedShortcutList(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnEditchangePathComboboxex(); @@ -65,11 +48,20 @@ afx_msg void OnBrowseButton(); afx_msg void OnUpButton(); afx_msg void OnDownButton(); - //}}AFX_MSG + DECLARE_MESSAGE_MAP() -}; -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. +public: + const std::vector *m_pcvRecent = nullptr; // one way only + std::vector m_cvShortcuts; // two-way - shortcuts are being returned through this member +private: + HIMAGELIST m_himl = nullptr; + HIMAGELIST m_hliml = nullptr; + bool m_bActualisation = false; + CComboBoxEx m_ctlPath; + CListCtrl m_ctlShortcuts; + CString m_strName; +}; + #endif