autoit.cpp - Macros >> User 1 ..... Variable >> User 2 (#749) (2)

[winmerge-jp/winmerge-jp.git] / Src / DirColsDlg.h

diff --git a/Src/DirColsDlg.h b/Src/DirColsDlg.h
index d26115b..519b589 100644 (file)
--- a/Src/DirColsDlg.h
+++ b/Src/DirColsDlg.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <vector>
+#include "TrDialogs.h"
 #include "UnicodeString.h"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -24,7 +25,7 @@
  * must be always be last in the list with order number -1.
  * @todo: Allow hidden columns between visible columns.
  */
-class CDirColsDlg : public CDialog
+class CDirColsDlg : public CTrDialog
 {
 // Public types
 public:
@@ -43,7 +44,7 @@ public:
 
 // Construction
 public:
-       CDirColsDlg(CWnd* pParent = NULL);   // standard constructor
+       explicit CDirColsDlg(CWnd* pParent = nullptr);   // standard constructor
        void AddColumn(const String & name, const String & desc, int log, int phy=-1)
                { column c(name, desc, log, phy); m_cols.push_back(c); }
        void AddDefColumn(const String & name, int log, int phy=-1)
@@ -84,16 +85,13 @@ private:
 
        // Generated message map functions
        //{{AFX_MSG(CDirColsDlg)
-       virtual BOOL OnInitDialog();
+       virtual BOOL OnInitDialog() override;
        afx_msg void OnUp();
        afx_msg void OnDown();
-       virtual void OnOK();
+       virtual void OnOK() override;
        afx_msg void OnDefaults();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 public:
        afx_msg void OnLvnItemchangedColdlgList(NMHDR *pNMHDR, LRESULT *pResult);
 };
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.