Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -564,7 +564,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
|
||||
// the app from starting up under Windows 95/NT 4
|
||||
typedef BOOL (WINAPI *SetMenuInfo_t)(HMENU, MENUINFO *);
|
||||
|
||||
wxDynamicLibrary dllUser(_T("user32"));
|
||||
wxDynamicLibrary dllUser(wxT("user32"));
|
||||
wxDYNLIB_FUNCTION(SetMenuInfo_t, SetMenuInfo, dllUser);
|
||||
if ( pfnSetMenuInfo )
|
||||
{
|
||||
@@ -572,7 +572,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
|
||||
mi.dwStyle = MNS_CHECKORBMP;
|
||||
if ( !(*pfnSetMenuInfo)(GetHmenu(), &mi) )
|
||||
{
|
||||
wxLogLastError(_T("SetMenuInfo(MNS_NOCHECK)"));
|
||||
wxLogLastError(wxT("SetMenuInfo(MNS_NOCHECK)"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -639,7 +639,7 @@ void wxMenu::EndRadioGroup()
|
||||
|
||||
wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
|
||||
{
|
||||
wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") );
|
||||
wxCHECK_MSG( item, NULL, wxT("NULL item in wxMenu::DoAppend") );
|
||||
|
||||
bool check = false;
|
||||
|
||||
@@ -671,7 +671,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
|
||||
}
|
||||
else
|
||||
{
|
||||
wxFAIL_MSG( _T("where is the radio group start item?") );
|
||||
wxFAIL_MSG( wxT("where is the radio group start item?") );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user