From 8b7239f98e8842a3d7ec6db858ebc765acd8d046 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 6 Nov 2023 13:19:07 +0300 Subject: =?UTF-8?q?fixes=20#3821=20(NewStory:=20=D0=BF=D1=80=D0=BE=D0=BF?= =?UTF-8?q?=D0=B0=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=20?= =?UTF-8?q?=D1=83=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20=D0=B2=20=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B5=20=D1=88=D0=B0?= =?UTF-8?q?=D0=B1=D0=BB=D0=BE=D0=BD=D0=BE=D0=B2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mir_core/src/Windows/CCtrlMButton.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/mir_core/src/Windows/CCtrlMButton.cpp b/src/mir_core/src/Windows/CCtrlMButton.cpp index cc05a3a8e4..c300ba9814 100644 --- a/src/mir_core/src/Windows/CCtrlMButton.cpp +++ b/src/mir_core/src/Windows/CCtrlMButton.cpp @@ -25,14 +25,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ///////////////////////////////////////////////////////////////////////////////////////// // CCtrlMButton -CCtrlMButton::CCtrlMButton(CDlgBase *dlg, int ctrlId, HICON hIcon, const char* tooltip) - : CCtrlButton(dlg, ctrlId), +CCtrlMButton::CCtrlMButton(CDlgBase *dlg, int ctrlId, HICON hIcon, const char* tooltip) : + CCtrlButton(dlg, ctrlId), m_hIcon(hIcon), m_toolTip(tooltip) {} -CCtrlMButton::CCtrlMButton(CDlgBase *dlg, int ctrlId, int iCoreIcon, const char* tooltip) - : CCtrlButton(dlg, ctrlId), +CCtrlMButton::CCtrlMButton(CDlgBase *dlg, int ctrlId, int iCoreIcon, const char* tooltip) : + CCtrlButton(dlg, ctrlId), m_hIcon(::Skin_LoadIcon(iCoreIcon)), m_toolTip(tooltip) {} @@ -47,8 +47,8 @@ void CCtrlMButton::OnInit() CCtrlButton::OnInit(); SendMessage(m_hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)m_hIcon); - SendMessage(m_hwnd, BUTTONADDTOOLTIP, (WPARAM)m_toolTip, 0); - SendMessage(m_hwnd, BUTTONSETASFLATBTN, (WPARAM)m_toolTip, 0); + SendMessage(m_hwnd, BUTTONADDTOOLTIP, (WPARAM)TranslateW_LP(_A2T(m_toolTip), m_parentWnd->GetPlugin()), BATF_UNICODE); + SendMessage(m_hwnd, BUTTONSETASFLATBTN, TRUE, 0); } void CCtrlMButton::MakeFlat() -- cgit v1.2.3