Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to avoid sending a string through mbstowcs() when already Unicode

Browse Source 
(added #if wxUSE_UNICODE etc).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
2000-03-25 23:12:57 +00:00
parent ad5730d735
commit ad7e243fbd
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/tbar95.cpp
View File

@@ -707,6 +707,9 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
} }
else else
{ {
#if wxUSE_UNICODE
ttText->lpszText = (wxChar *)help.c_str();
#else
// VZ: I don't know why it happens, but the versions of // VZ: I don't know why it happens, but the versions of
// comctl32.dll starting from 4.70 sometimes send TTN_NEEDTEXTW // comctl32.dll starting from 4.70 sometimes send TTN_NEEDTEXTW
// even to ANSI programs (normally, this message is supposed // even to ANSI programs (normally, this message is supposed
@@ -733,6 +736,7 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
dst[lenUnicode] = 0; dst[lenUnicode] = 0;
delete [] pwz; delete [] pwz;
#endif
} }
} }