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 1fb6161..519b589 100644 (file)
--- a/Src/DirColsDlg.h
+++ b/Src/DirColsDlg.h
@@ -5,15 +5,10 @@
  *
  * @date  Created: 2003-08-19
  */
-// ID line follows -- this is updated by SVN
-// $Id$
-
-
-#if !defined(AFX_DIRCOLSDLG_H__2FCB576C_C609_4623_8C55_F3870F22CA0B__INCLUDED_)
-#define AFX_DIRCOLSDLG_H__2FCB576C_C609_4623_8C55_F3870F22CA0B__INCLUDED_
 #pragma once
 
 #include <vector>
+#include "TrDialogs.h"
 #include "UnicodeString.h"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -30,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:
@@ -49,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)
@@ -60,7 +55,7 @@ public:
        //{{AFX_DATA(CDirColsDlg)
        enum { IDD = IDD_DIRCOLS };
        CListCtrl m_listColumns;
-       BOOL m_bReset;
+       bool m_bReset;
        //}}AFX_DATA
 
 
@@ -79,7 +74,7 @@ protected:
        void LoadDefLists();
        void SortArrayToLogicalOrder();
        void MoveItem(int index, int newIndex);
-       void MoveSelectedItems(BOOL bUp);
+       void MoveSelectedItems(bool bUp);
        void SanitizeOrder();
 
 // Implementation data
@@ -90,18 +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.
-
-#endif // !defined(AFX_DIRCOLSDLG_H__2FCB576C_C609_4623_8C55_F3870F22CA0B__INCLUDED_)