Merge with stable

[winmerge-jp/winmerge-jp.git] / Src / Common / LanguageSelect.h

diff --git a/Src/Common/LanguageSelect.h b/Src/Common/LanguageSelect.h
index 3712815..c6b3e49 100644 (file)
--- a/Src/Common/LanguageSelect.h
+++ b/Src/Common/LanguageSelect.h
@@ -9,10 +9,10 @@
 #if !defined(AFX_LANGUAGESELECT_H__4395A84F_E8DF_11D1_BBCB_00A024706EDC__INCLUDED_)
 #define AFX_LANGUAGESELECT_H__4395A84F_E8DF_11D1_BBCB_00A024706EDC__INCLUDED_
 
-#include "CMoveConstraint.h"
-
 #include <vector>
 #include <string>
+#include <map>
+#include "CMoveConstraint.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CLanguageSelect dialog
@@ -37,6 +37,7 @@ public:
 
        bool TranslateString(size_t line, std::string &) const;
        bool TranslateString(size_t line, std::wstring &) const;
+       bool TranslateString(const std::string&, String &) const;
        void SetIndicators(CStatusBar &, const UINT *, int) const;
        void TranslateMenu(HMENU) const;
        void TranslateDialog(HWND) const;
@@ -54,6 +55,8 @@ private:
        HINSTANCE m_hCurrentDll;
        LANGID m_wCurLanguage;
        std::vector<std::string> m_strarray;
+       typedef std::map<std::string, int> EngLinenoMap;
+       EngLinenoMap m_map_lineno;
        unsigned m_codepage;
 // Implementation methods
 private: