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

Use wxString::t_str() in calls to Windows API functions in wxMSW.

Browse Source 
Use t_str() instead of wx_str() to make the code work correctly in UTF-8 build
in which wx_str() returns a pointer to UTF-8 buffer while we need a wchar_t
pointer for Windows.

Closes #14371.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-06-03 19:16:59 +00:00
parent f40f8e1722
commit 017dc06b50
58 changed files with 164 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/control.cpp
View File

@@ -132,7 +132,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
(
exstyle, // extended style
classname, // the kind of control to create
label.wx_str(), // the window name
label.t_str(), // the window name
style, // the window style
x, y, w, h, // the window position and size
GetHwndOf(GetParent()), // parent
@@ -163,7 +163,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
// Notice that 0xffff is not a valid Unicode character so the problem
// doesn't arise in Unicode build.
if ( !label.empty() && label[0] == -1 )
::SetWindowText(GetHwnd(), label.wx_str());
::SetWindowText(GetHwnd(), label.t_str());
#endif // !wxUSE_UNICODE
// saving the label in m_labelOrig to return it verbatim
@@ -453,7 +453,7 @@ int wxControlWithItems::MSWInsertOrAppendItem(unsigned pos,
unsigned wm)
{
LRESULT n = SendMessage((HWND)MSWGetItemsHWND(), wm, pos,
(LPARAM)item.wx_str());
wxMSW_CONV_LPARAM(item));
if ( n == CB_ERR || n == CB_ERRSPACE )
{
wxLogLastError(wxT("SendMessage(XX_ADD/INSERTSTRING)"));