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

18
src/univ/toolbar.cpp
View File

@@ -260,7 +260,7 @@ void wxToolBar::SetToolShortHelp(int id, const wxString& help)
{
wxToolBarToolBase *tool = FindById(id);
wxCHECK_RET( tool, _T("SetToolShortHelp: no such tool") );
wxCHECK_RET( tool, wxT("SetToolShortHelp: no such tool") );
tool->SetShortHelp(help);
}
@@ -344,7 +344,7 @@ wxRect wxToolBar::GetToolRect(wxToolBarToolBase *toolBase) const
wxRect rect;
wxCHECK_MSG( tool, rect, _T("GetToolRect: NULL tool") );
wxCHECK_MSG( tool, rect, wxT("GetToolRect: NULL tool") );
// ensure that we always have the valid tool position
if ( m_needsLayout )
@@ -463,7 +463,7 @@ void wxToolBar::SetWindowStyleFlag( long style )
void wxToolBar::DoLayout()
{
wxASSERT_MSG( m_needsLayout, _T("why are we called?") );
wxASSERT_MSG( m_needsLayout, wxT("why are we called?") );
m_needsLayout = false;
@@ -604,7 +604,7 @@ void wxToolBar::GetRectLimits(const wxRect& rect,
wxCoord *start,
wxCoord *end) const
{
wxCHECK_RET( start && end, _T("NULL pointer in GetRectLimits") );
wxCHECK_RET( start && end, wxT("NULL pointer in GetRectLimits") );
if ( IsVertical() )
{
@@ -744,7 +744,7 @@ bool wxToolBar::PerformAction(const wxControlAction& action,
}
else if ( action == wxACTION_TOOLBAR_PRESS )
{
wxLogTrace(_T("toolbar"), _T("Button '%s' pressed."), tool->GetShortHelp().c_str());
wxLogTrace(wxT("toolbar"), wxT("Button '%s' pressed."), tool->GetShortHelp().c_str());
tool->Invert();
@@ -752,9 +752,9 @@ bool wxToolBar::PerformAction(const wxControlAction& action,
}
else if ( action == wxACTION_TOOLBAR_RELEASE )
{
wxLogTrace(_T("toolbar"), _T("Button '%s' released."), tool->GetShortHelp().c_str());
wxLogTrace(wxT("toolbar"), wxT("Button '%s' released."), tool->GetShortHelp().c_str());
wxASSERT_MSG( tool->IsInverted(), _T("release unpressed button?") );
wxASSERT_MSG( tool->IsInverted(), wxT("release unpressed button?") );
if(tool->IsInverted())
{
@@ -790,7 +790,7 @@ bool wxToolBar::PerformAction(const wxControlAction& action,
}
else if ( action == wxACTION_TOOLBAR_ENTER )
{
wxCHECK_MSG( tool, false, _T("no tool to enter?") );
wxCHECK_MSG( tool, false, wxT("no tool to enter?") );
if ( HasFlag(wxTB_FLAT) && tool->IsEnabled() )
{
@@ -802,7 +802,7 @@ bool wxToolBar::PerformAction(const wxControlAction& action,
}
else if ( action == wxACTION_TOOLBAR_LEAVE )
{
wxCHECK_MSG( tool, false, _T("no tool to leave?") );
wxCHECK_MSG( tool, false, wxT("no tool to leave?") );
if ( HasFlag(wxTB_FLAT) && tool->IsEnabled() )
{