github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Win32 TrayIcon i18n fix

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@583 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2008-10-31 13:48:13 +00:00
parent 2b1a82035a
commit 3fc79a4b4c
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
uppsrc/CtrlLib/TrayIconWin32.cpp
View file

@ -54,8 +54,9 @@ void TrayIcon::Notify(dword msg)
if(nid.icon)
DestroyIcon(nid.icon);
nid.icon = IconWin32(icon);
int len = min(tip.GetLength(), 60);
memcpy(nid.tip, tip, len);
String stip = ToSystemCharset(tip);
int len = min(stip.GetLength(), 60);
memcpy(nid.tip, stip, len);
nid.tip[len] = 0;
VERIFY(Shell_NotifyIcon(msg, (NOTIFYICONDATA *)&nid));
}
@ -68,11 +69,13 @@ void TrayIcon::Message(int type, const char *title, const char *text, int timeou
nid.flags = 0x10;
*nid.info = *nid.title = 0;
if(text) {
memcpy(nid.info, text, min((int)strlen(text), 255) + 1);
String h = ToSystemCharset(text);
memcpy(nid.info, h, min(h.GetLength(), 255) + 1);
nid.info[255] = 0;
}
if(title) {
memcpy(nid.title, title, min((int)strlen(title), 63) + 1);
String h = ToSystemCharset(title);
memcpy(nid.title, h, min(h.GetLength(), 63) + 1);
nid.title[63] = 0;
}
nid.infoflags = type;