Fix issue #940: Replace slow (2)

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

diff --git a/Src/PropCodepage.h b/Src/PropCodepage.h
index a1bb2d1..ac67678 100644 (file)
--- a/Src/PropCodepage.h
+++ b/Src/PropCodepage.h
@@ -3,11 +3,7 @@
  *
  * @brief Declaration of PropCodepage class
  */
-// ID line follows -- this is updated by SVN
-// $Id: PropCodepage.h 6908 2009-07-11 08:29:49Z kimmov $
-
-#if !defined(AFX_PROPCODEPAGE_H__0DF931F8_E845_48B7_A658_3BEE6D3EAF85__INCLUDED_)
-#define AFX_PROPCODEPAGE_H__0DF931F8_E845_48B7_A658_3BEE6D3EAF85__INCLUDED_
+#pragma once
 
 #include "OptionsPanel.h"
 
@@ -17,11 +13,11 @@ class PropCodepage : public OptionsPanel
 {
 // Construction
 public:
-       PropCodepage(COptionsMgr *optionsMgr);
+       explicit PropCodepage(COptionsMgr *optionsMgr);
 
 // Implement IOptionsPanel
-       virtual void ReadOptions();
-       virtual void WriteOptions();
+       virtual void ReadOptions() override;
+       virtual void WriteOptions() override;
 
 // Dialog Data
        //{{AFX_DATA(PropCodepage)
@@ -30,9 +26,9 @@ public:
        CComboBox m_comboAutodetectType;
        int             m_nCodepageSystem;
        int             m_nCustomCodepageValue;
-       CString m_cCustomCodepageValue;
-       BOOL    m_bDetectCodepage;
-       BOOL    m_bDetectCodepage2;
+       String  m_cCustomCodepageValue;
+       bool    m_bDetectCodepage;
+       bool    m_bDetectCodepage2;
        int             m_nAutodetectType;
        //}}AFX_DATA
 
@@ -48,18 +44,13 @@ public:
 protected:
        // Generated message map functions
        //{{AFX_MSG(PropCodepage)
-       virtual void OnOK();
-       virtual BOOL OnInitDialog();
+       virtual BOOL OnInitDialog() override;
        void GetEncodingCodePageFromNameString();
        afx_msg void OnCpSystem();
        afx_msg void OnCpCustom();
        afx_msg void OnCpUi();
        afx_msg void OnDetectCodepage2();
+       afx_msg void OnDetectAutodetecttype();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 };
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROPCODEPAGE_H__0DF931F8_E845_48B7_A658_3BEE6D3EAF85__INCLUDED_)