Index: src/ch/OptionsDlg.h
===================================================================
diff -u -N -r9ea1e103b5fa4ddfebf8028f121ce16e917eec04 -rcb4e9d4b60d62b25ae2cf556c0642601af56c787
--- src/ch/OptionsDlg.h	(.../OptionsDlg.h)	(revision 9ea1e103b5fa4ddfebf8028f121ce16e917eec04)
+++ src/ch/OptionsDlg.h	(.../OptionsDlg.h)	(revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
@@ -28,43 +28,36 @@
 
 class COptionsDlg : public ictranslate::CLanguageDialog
 {
-// Construction
 public:
-	void SendClosingNotify();
-	COptionsDlg(CWnd* pParent = NULL);   // standard constructor
+	enum { IDD = IDD_OPTIONS_DIALOG };
 
+public:
+	explicit COptionsDlg(CWnd* pParent = NULL);   // standard constructor
+
 	virtual void OnLanguageChanged();
 
+	void SendClosingNotify();
+
+	friend void CustomPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
+	friend void ShortcutsPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
+	friend void RecentPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
+
+public:
 	static bool m_bLock;				// locker
 
 	std::vector<CString> m_cvRecent;
 	std::vector<CString> m_cvShortcuts;
 
 	// for languages
 	vector<ictranslate::CLangData> m_vld;
-	TCHAR m_szLangPath[_MAX_PATH];	// the full path to a folder with langs (@read)
+	TCHAR m_szLangPath[ _MAX_PATH ];	// the full path to a folder with langs (@read)
 
-	friend void CustomPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
-	friend void ShortcutsPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
-	friend void RecentPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
-
-// Dialog Data
-	//{{AFX_DATA(COptionsDlg)
-	enum { IDD = IDD_OPTIONS_DIALOG };
 	CPropertyListCtrl	m_ctlProperties;
-	//}}AFX_DATA
 
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptionsDlg)
-	public:
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
 
-// Implementation
-protected:
+private:
 	void FillPropertyList();
 	void ApplyProperties();
 
@@ -74,18 +67,18 @@
 	bool GetBoolProp(int iPosition);
 	CString MakeCompoundString(UINT uiBase, int iCount, LPCTSTR lpszSeparator);
 
-	TCHAR m_szBuffer[_MAX_PATH];	// for macro use
-	CString m_strTemp;
-	int m_iSel;
-
 	// Generated message map functions
-	//{{AFX_MSG(COptionsDlg)
 	virtual BOOL OnInitDialog();
 	virtual void OnOK();
 	virtual void OnCancel();
 	afx_msg void OnApplyButton();
-	//}}AFX_MSG
+
 	DECLARE_MESSAGE_MAP()
+
+private:
+	TCHAR m_szBuffer[ _MAX_PATH ];	// for macro use
+	CString m_strTemp;
+	int m_iSel = 0;
 };
 
 //{{AFX_INSERT_LOCATION}}