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

Globally replace _T() with wxT().

Browse Source 
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:
Vadim Zeitlin
2009-07-23 20:30:22 +00:00
parent 32cdc45397
commit 9a83f86094
798 changed files with 10370 additions and 10349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/menuitem.cpp
View File

@@ -176,7 +176,7 @@ void wxMenuItem::Init()
SetMarginWidth(GetMarginWidth());
// tell the owner drawing code to show the accel string as well
SetAccelString(m_text.AfterFirst(_T('\t')));
SetAccelString(m_text.AfterFirst(wxT('\t')));
#endif // wxUSE_OWNER_DRAWN
}
@@ -232,7 +232,7 @@ void wxMenuItem::SetAsRadioGroupStart()
void wxMenuItem::SetRadioGroupStart(int start)
{
wxASSERT_MSG( !m_isRadioGroupStart,
_T("should only be called for the next radio items") );
wxT("should only be called for the next radio items") );
m_radioGroup.start = start;
}
@@ -240,7 +240,7 @@ void wxMenuItem::SetRadioGroupStart(int start)
void wxMenuItem::SetRadioGroupEnd(int end)
{
wxASSERT_MSG( m_isRadioGroupStart,
_T("should only be called for the first radio item") );
wxT("should only be called for the first radio item") );
m_radioGroup.end = end;
}
@@ -292,7 +292,7 @@ void wxMenuItem::Check(bool check)
const wxMenuItemList& items = m_parentMenu->GetMenuItems();
int pos = items.IndexOf(this);
wxCHECK_RET( pos != wxNOT_FOUND,
_T("menuitem not found in the menu items list?") );
wxT("menuitem not found in the menu items list?") );
// get the radio group range
int start,
@@ -316,7 +316,7 @@ void wxMenuItem::Check(bool check)
// (NT4 SP6) and I suspect this could happen to the others as well,
// so don't do it!
wxCHECK_RET( start != -1 && end != -1,
_T("invalid ::CheckMenuRadioItem() parameter(s)") );
wxT("invalid ::CheckMenuRadioItem() parameter(s)") );
if ( !::CheckMenuRadioItem(hmenu,
start, // the first radio group item
@@ -324,7 +324,7 @@ void wxMenuItem::Check(bool check)
pos, // the one to check
MF_BYPOSITION) )
{
wxLogLastError(_T("CheckMenuRadioItem"));
wxLogLastError(wxT("CheckMenuRadioItem"));
}
#endif // __WIN32__
@@ -346,7 +346,7 @@ void wxMenuItem::Check(bool check)
GetMSWId(),
MF_BYCOMMAND | flags) == (DWORD)-1 )
{
wxFAIL_MSG(_T("CheckMenuItem() failed, item not in the menu?"));
wxFAIL_MSG(wxT("CheckMenuItem() failed, item not in the menu?"));
}
}
}
@@ -371,7 +371,7 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(m_text) );
#if wxUSE_OWNER_DRAWN
// tell the owner drawing code to to show the accel string as well
SetAccelString(m_text.AfterFirst(_T('\t')));
SetAccelString(m_text.AfterFirst(wxT('\t')));
#endif
// the item can be not attached to any menu yet and SetItemLabel() is still