Merge with stable

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

diff --git a/Src/SelectUnpackerDlg.h b/Src/SelectUnpackerDlg.h
index 282e76a..548de5a 100644 (file)
--- a/Src/SelectUnpackerDlg.h
+++ b/Src/SelectUnpackerDlg.h
@@ -30,6 +30,7 @@
 #define AFX_SELECTUNPACKERDLG_H__C8FD4C3A_5ED5_43D3_ADAE_A2378369705C__INCLUDED_
 
 #include <vector>
+#include "UnicodeString.h"
 #include <boost/scoped_ptr.hpp>
 
 /////////////////////////////////////////////////////////////////////////////
@@ -46,8 +47,8 @@ private:
 
 public:
 // Construction
-       CSelectUnpackerDlg(LPCTSTR filename, CWnd* pParent /*=NULL*/);
-       CSelectUnpackerDlg(LPCTSTR filename1, LPCTSTR filename2, CWnd* pParent /*=NULL*/);
+       CSelectUnpackerDlg(const String& filename, CWnd* pParent /*=NULL*/);
+       CSelectUnpackerDlg(const String& filename1, const String& filename2, CWnd* pParent /*=NULL*/);
        ~CSelectUnpackerDlg();
 
        void SetInitialInfoHandler(PackingInfo * infoHandler);
@@ -58,9 +59,9 @@ public:
        enum { IDD = IDD_SELECTUNPACKER };
        CButton m_btnOK;
        CComboBox       m_cboUnpackerName;
-       BOOL    m_bNoExtensionCheck;
-       CString m_strDescription;
-       CString m_strExtensions;
+       bool    m_bNoExtensionCheck;
+       String  m_strDescription;
+       String  m_strExtensions;
        //}}AFX_DATA
 
 
@@ -83,12 +84,12 @@ protected:
        boost::scoped_ptr<PluginInfo> automaticPlugin;
 
        // input value
-       CString m_filteredFilenames;
+       String m_filteredFilenames;
 
        /// current plugin choice
        PluginInfo * m_pPlugin;
        /// current plugin choice
-       CString m_strPluginName;
+       String m_strPluginName;
 
        void prepareListbox();