From 2a68715604212f62d96950341de9fa172c62d8c2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 31 Jul 2017 11:02:34 +0300 Subject: LPGEN to be applied to the string itself --- include/m_message.h | 5 ++--- src/mir_app/src/srmm_base.cpp | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/m_message.h b/include/m_message.h index a5454c3138..23e6f0ca63 100644 --- a/include/m_message.h +++ b/include/m_message.h @@ -26,8 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define M_MESSAGE_H__ 1 #include - -extern int hLangpack; +#include ///////////////////////////////////////////////////////////////////////////////////////// // brings up the send message dialog for a contact @@ -204,7 +203,7 @@ struct StatusIconClickData // srmm toolbar icons' support // default section for all SRMM toolbar hotkeys -#define BB_HK_SECTION "Message window toolbar" +#define BB_HK_SECTION LPGEN("Message window toolbar") // button state flags #define BBSF_HIDDEN (1<<0) diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index f3f8b7d1db..77e611242e 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -176,7 +176,7 @@ LRESULT CSrmmBaseDialog::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) case WM_SYSKEYDOWN: if (!(GetKeyState(VK_RMENU) & 0x8000)) { MSG message = { m_hwnd, msg, wParam, lParam }; - LRESULT iButtonFrom = Hotkey_Check(&message, LPGEN(BB_HK_SECTION)); + LRESULT iButtonFrom = Hotkey_Check(&message, BB_HK_SECTION); if (iButtonFrom) { Srmm_ProcessToolbarHotkey(m_hContact, iButtonFrom, m_hwnd); return TRUE; @@ -340,7 +340,7 @@ LRESULT CSrmmBaseDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) case WM_SYSKEYDOWN: if (!(GetKeyState(VK_RMENU) & 0x8000)) { MSG message = { m_hwnd, msg, wParam, lParam }; - LRESULT iButtonFrom = Hotkey_Check(&message, LPGEN(BB_HK_SECTION)); + LRESULT iButtonFrom = Hotkey_Check(&message, BB_HK_SECTION); if (iButtonFrom) { Srmm_ProcessToolbarHotkey(m_hContact, iButtonFrom, m_hwnd); return TRUE; -- cgit v1.2.3