replaced T() makro with wxT() due to namespace probs, _T() exists, too
fixed compilation problems, mainly in html code compiles and links fine on Solaris, runs with samples and Mahogany git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -87,7 +87,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
|
||||
#endif //owner drawn
|
||||
m_strHelp(strHelp)
|
||||
{
|
||||
wxASSERT_MSG( pParentMenu != NULL, T("a menu item should have a parent") );
|
||||
wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );
|
||||
|
||||
#if wxUSE_OWNER_DRAWN
|
||||
// set default menu colors
|
||||
@@ -151,7 +151,7 @@ void wxMenuItem::Enable(bool bDoEnable)
|
||||
|
||||
void wxMenuItem::Check(bool bDoCheck)
|
||||
{
|
||||
wxCHECK_RET( IsCheckable(), T("only checkable items may be checked") );
|
||||
wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") );
|
||||
|
||||
if ( m_bChecked != bDoCheck ) {
|
||||
long rc = CheckMenuItem(GetHMenuOf(m_pParentMenu),
|
||||
@@ -210,7 +210,7 @@ void wxMenuItem::SetName(const wxString& strName)
|
||||
MF_BYCOMMAND | flagsOld,
|
||||
id, data) == 0xFFFFFFFF )
|
||||
{
|
||||
wxLogLastError(T("ModifyMenu"));
|
||||
wxLogLastError(wxT("ModifyMenu"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user