added wxSetCCUnicodeFormat() and use it in wxTreeCtrl/wxToolBar; also replaced SendMessage(LVM_SETUNICODEFORMAT) with a call to it in wxListCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -43,5 +43,17 @@
|
||||
// define things which might be missing from our commctrl.h
|
||||
#include "wx/msw/missing.h"
|
||||
|
||||
// Set Unicode format for a common control
|
||||
inline void wxSetCCUnicodeFormat(HWND hwnd)
|
||||
{
|
||||
SendMessage(hwnd, CCM_SETUNICODEFORMAT,
|
||||
#if wxUSE_UNICODE
|
||||
TRUE
|
||||
#else
|
||||
FALSE
|
||||
#endif
|
||||
, 0);
|
||||
}
|
||||
|
||||
#endif // _WX_MSW_WRAPCCTL_H_
|
||||
|
||||
|
@@ -353,9 +353,7 @@ bool wxListCtrl::Create(wxWindow *parent,
|
||||
|
||||
// explicitly say that we want to use Unicode because otherwise we get ANSI
|
||||
// versions of _some_ messages (notably LVN_GETDISPINFOA) in MSLU build
|
||||
#if wxUSE_UNICODE
|
||||
::SendMessage(GetHwnd(), LVM_SETUNICODEFORMAT, TRUE, 0);
|
||||
#endif
|
||||
wxSetCCUnicodeFormat(GetHwnd());
|
||||
|
||||
// for comctl32.dll v 4.70+ we want to have this attribute because it's
|
||||
// prettier (and also because wxGTK does it like this)
|
||||
|
@@ -240,6 +240,8 @@ bool wxToolBar::Create(wxWindow *parent,
|
||||
if ( !MSWCreateToolbar(pos, size) )
|
||||
return FALSE;
|
||||
|
||||
wxSetCCUnicodeFormat(GetHwnd());
|
||||
|
||||
// set up the colors and fonts
|
||||
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
|
||||
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
|
||||
|
@@ -757,6 +757,8 @@ bool wxTreeCtrl::Create(wxWindow *parent,
|
||||
|
||||
SetSize(pos.x, pos.y, size.x, size.y);
|
||||
|
||||
wxSetCCUnicodeFormat(GetHwnd());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user