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

46
src/common/wincmn.cpp
View File

@@ -223,7 +223,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
// reserved for wxWidgets own usage)
wxASSERT_MSG( id == wxID_ANY || (id >= 0 && id < 32767) ||
(id >= wxID_AUTO_LOWEST && id <= wxID_AUTO_HIGHEST),
_T("invalid id value") );
wxT("invalid id value") );
// generate a new id if the user doesn't care about it
if ( id == wxID_ANY )
@@ -260,7 +260,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
bool wxWindowBase::ToggleWindowStyle(int flag)
{
wxASSERT_MSG( flag, _T("flags with 0 value can't be toggled") );
wxASSERT_MSG( flag, wxT("flags with 0 value can't be toggled") );
bool rc;
long style = GetWindowStyleFlag();
@@ -439,7 +439,7 @@ bool wxWindowBase::DestroyChildren()
void wxWindowBase::DoCentre(int dir)
{
wxCHECK_RET( !(dir & wxCENTRE_ON_SCREEN) && GetParent(),
_T("this method only implements centering child windows") );
wxT("this method only implements centering child windows") );
SetSize(GetRect().CentreIn(GetParent()->GetClientSize(), dir));
}
@@ -644,7 +644,7 @@ static int wxGetMetricOrDefault(wxSystemMetric what, const wxWindowBase* win)
break;
default:
wxFAIL_MSG( _T("unexpected wxGetMetricOrDefault() argument") );
wxFAIL_MSG( wxT("unexpected wxGetMetricOrDefault() argument") );
rc = 0;
}
}
@@ -684,7 +684,7 @@ wxSize wxWindowBase::GetWindowBorderSize() const
break;
default:
wxFAIL_MSG(_T("Unknown border style."));
wxFAIL_MSG(wxT("Unknown border style."));
break;
}
@@ -812,7 +812,7 @@ void wxWindowBase::DoSetWindowVariant( wxWindowVariant variant )
break;
default:
wxFAIL_MSG(_T("unexpected window variant"));
wxFAIL_MSG(wxT("unexpected window variant"));
break;
}
@@ -826,7 +826,7 @@ void wxWindowBase::DoSetSizeHints( int minW, int minH,
{
wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) &&
(minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH),
_T("min width/height must be less than max width/height!") );
wxT("min width/height must be less than max width/height!") );
m_minWidth = minW;
m_maxWidth = maxW;
@@ -1040,7 +1040,7 @@ void wxWindowBase::AddChild(wxWindowBase *child)
// this should never happen and it will lead to a crash later if it does
// because RemoveChild() will remove only one node from the children list
// and the other(s) one(s) will be left with dangling pointers in them
wxASSERT_MSG( !GetChildren().Find((wxWindow*)child), _T("AddChild() called twice") );
wxASSERT_MSG( !GetChildren().Find((wxWindow*)child), wxT("AddChild() called twice") );
GetChildren().Append((wxWindow*)child);
child->SetParent(this);
@@ -1234,7 +1234,7 @@ bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handlerToRemove)
handlerCur = handlerNext;
}
wxFAIL_MSG( _T("where has the event handler gone?") );
wxFAIL_MSG( wxT("where has the event handler gone?") );
return false;
}
@@ -1307,7 +1307,7 @@ wxColour wxWindowBase::GetBackgroundColour() const
{
if ( !m_backgroundColour.IsOk() )
{
wxASSERT_MSG( !m_hasBgCol, _T("we have invalid explicit bg colour?") );
wxASSERT_MSG( !m_hasBgCol, wxT("we have invalid explicit bg colour?") );
// get our default background colour
wxColour colBg = GetDefaultAttributes().colBg;
@@ -1387,7 +1387,7 @@ wxFont wxWindowBase::GetFont() const
// logic is the same as in GetBackgroundColour()
if ( !m_font.IsOk() )
{
wxASSERT_MSG( !m_hasFont, _T("we have invalid explicit font?") );
wxASSERT_MSG( !m_hasFont, wxT("we have invalid explicit font?") );
wxFont font = GetDefaultAttributes().font;
if ( !font.IsOk() )
@@ -2057,7 +2057,7 @@ void wxWindowBase::SetContainingSizer(wxSizer* sizer)
// associated wxSizerItem we're going to dereference a dangling
// pointer; so try to detect this as early as possible
wxASSERT_MSG( !sizer || m_containingSizer != sizer,
_T("Adding a window to the same sizer twice?") );
wxT("Adding a window to the same sizer twice?") );
m_containingSizer = sizer;
}
@@ -2751,9 +2751,9 @@ bool wxWindowBase::ms_winCaptureChanging = false;
void wxWindowBase::CaptureMouse()
{
wxLogTrace(_T("mousecapture"), _T("CaptureMouse(%p)"), static_cast<void*>(this));
wxLogTrace(wxT("mousecapture"), wxT("CaptureMouse(%p)"), static_cast<void*>(this));
wxASSERT_MSG( !ms_winCaptureChanging, _T("recursive CaptureMouse call?") );
wxASSERT_MSG( !ms_winCaptureChanging, wxT("recursive CaptureMouse call?") );
ms_winCaptureChanging = true;
@@ -2778,9 +2778,9 @@ void wxWindowBase::CaptureMouse()
void wxWindowBase::ReleaseMouse()
{
wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(%p)"), static_cast<void*>(this));
wxLogTrace(wxT("mousecapture"), wxT("ReleaseMouse(%p)"), static_cast<void*>(this));
wxASSERT_MSG( !ms_winCaptureChanging, _T("recursive ReleaseMouse call?") );
wxASSERT_MSG( !ms_winCaptureChanging, wxT("recursive ReleaseMouse call?") );
wxASSERT_MSG( GetCapture() == this,
"attempt to release mouse, but this window hasn't captured it" );
@@ -2805,8 +2805,8 @@ void wxWindowBase::ReleaseMouse()
ms_winCaptureChanging = false;
wxLogTrace(_T("mousecapture"),
(const wxChar *) _T("After ReleaseMouse() mouse is captured by %p"),
wxLogTrace(wxT("mousecapture"),
(const wxChar *) wxT("After ReleaseMouse() mouse is captured by %p"),
static_cast<void*>(GetCapture()));
}
@@ -2820,7 +2820,7 @@ static void DoNotifyWindowAboutCaptureLost(wxWindow *win)
// correctly if it loses capture unexpectedly; see the discussion here:
// http://sourceforge.net/tracker/index.php?func=detail&aid=1153662&group_id=9863&atid=109863
// http://article.gmane.org/gmane.comp.lib.wxwidgets.devel/82376
wxFAIL_MSG( _T("window that captured the mouse didn't process wxEVT_MOUSE_CAPTURE_LOST") );
wxFAIL_MSG( wxT("window that captured the mouse didn't process wxEVT_MOUSE_CAPTURE_LOST") );
}
}
@@ -2925,11 +2925,11 @@ bool wxWindowBase::TryAfter(wxEvent& event)
wxWindow *wxWindowBase::DoGetSibling(WindowOrder order) const
{
wxCHECK_MSG( GetParent(), NULL,
_T("GetPrev/NextSibling() don't work for TLWs!") );
wxT("GetPrev/NextSibling() don't work for TLWs!") );
wxWindowList& siblings = GetParent()->GetChildren();
wxWindowList::compatibility_iterator i = siblings.Find((wxWindow *)this);
wxCHECK_MSG( i, NULL, _T("window not a child of its parent?") );
wxCHECK_MSG( i, NULL, wxT("window not a child of its parent?") );
if ( order == OrderBefore )
i = i->GetPrevious();
@@ -2983,7 +2983,7 @@ void wxWindowBase::DoMoveInTabOrder(wxWindow *win, WindowOrder move)
{
// check that we're not a top level window
wxCHECK_RET( GetParent(),
_T("MoveBefore/AfterInTabOrder() don't work for TLWs!") );
wxT("MoveBefore/AfterInTabOrder() don't work for TLWs!") );
// detect the special case when we have nothing to do anyhow and when the
// code below wouldn't work
@@ -2993,7 +2993,7 @@ void wxWindowBase::DoMoveInTabOrder(wxWindow *win, WindowOrder move)
// find the target window in the siblings list
wxWindowList& siblings = GetParent()->GetChildren();
wxWindowList::compatibility_iterator i = siblings.Find(win);
wxCHECK_RET( i, _T("MoveBefore/AfterInTabOrder(): win is not a sibling") );
wxCHECK_RET( i, wxT("MoveBefore/AfterInTabOrder(): win is not a sibling") );
// unfortunately, when wxUSE_STL == 1 DetachNode() is not implemented so we
// can't just move the node around