Remove #ifdef _UNICODE (2)

diff --git a/Src/Common/LanguageSelect.cpp b/Src/Common/LanguageSelect.cpp
index b2fa9a0..52f641f 100644 (file)
--- a/Src/Common/LanguageSelect.cpp
+++ b/Src/Common/LanguageSelect.cpp
@@ -724,12 +724,7 @@ bool CLanguageSelect::TranslateString(const std::wstring& msgid, std::wstring &s
 
 bool CLanguageSelect::TranslateString(const std::string& msgid, String& s) const
 {
-#ifdef _UNICODE
        bool result = TranslateString(std::wstring(msgid.begin(), msgid.end()), s);
-#else
-       bool result = TranslateString(std::wstring(msgid.begin(), msgid.end()), ws);
-       s = ucr::toTString(ws);
-#endif
        return result;
 }
 

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 70bd142..f06c194 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -2102,17 +2102,10 @@ BOOL CMainFrame::OnToolTipText(UINT, NMHDR* pNMHDR, LRESULT* pResult)
                // this is the command id, not the button index
                AfxExtractSubString(strTipText, strFullText.c_str(), 1, '\n');
        }
-#ifndef _UNICODE
-       if (pNMHDR->code == TTN_NEEDTEXTA)
-               lstrcpyn(pTTTA->szText, strTipText, std::size(pTTTA->szText));
-       else
-               _mbstowcsz(pTTTW->szText, strTipText, std::size(pTTTW->szText));
-#else
        if (pNMHDR->code == TTN_NEEDTEXTA)
                _wcstombsz(pTTTA->szText, strTipText, static_cast<ULONG>(std::size(pTTTA->szText)));
        else
                lstrcpyn(pTTTW->szText, strTipText, static_cast<int>(std::size(pTTTW->szText)));
-#endif
        *pResult = 0;
 
        // bring the tooltip window above other popup windows