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:
@@ -147,7 +147,7 @@ wxDisplay::~wxDisplay()
|
||||
|
||||
/* static */ int wxDisplay::GetFromWindow(const wxWindow *window)
|
||||
{
|
||||
wxCHECK_MSG( window, wxNOT_FOUND, _T("invalid window") );
|
||||
wxCHECK_MSG( window, wxNOT_FOUND, wxT("invalid window") );
|
||||
|
||||
return Factory().GetFromWindow(window);
|
||||
}
|
||||
@@ -158,21 +158,21 @@ wxDisplay::~wxDisplay()
|
||||
|
||||
wxRect wxDisplay::GetGeometry() const
|
||||
{
|
||||
wxCHECK_MSG( IsOk(), wxRect(), _T("invalid wxDisplay object") );
|
||||
wxCHECK_MSG( IsOk(), wxRect(), wxT("invalid wxDisplay object") );
|
||||
|
||||
return m_impl->GetGeometry();
|
||||
}
|
||||
|
||||
wxRect wxDisplay::GetClientArea() const
|
||||
{
|
||||
wxCHECK_MSG( IsOk(), wxRect(), _T("invalid wxDisplay object") );
|
||||
wxCHECK_MSG( IsOk(), wxRect(), wxT("invalid wxDisplay object") );
|
||||
|
||||
return m_impl->GetClientArea();
|
||||
}
|
||||
|
||||
wxString wxDisplay::GetName() const
|
||||
{
|
||||
wxCHECK_MSG( IsOk(), wxString(), _T("invalid wxDisplay object") );
|
||||
wxCHECK_MSG( IsOk(), wxString(), wxT("invalid wxDisplay object") );
|
||||
|
||||
return m_impl->GetName();
|
||||
}
|
||||
@@ -186,21 +186,21 @@ bool wxDisplay::IsPrimary() const
|
||||
|
||||
wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
|
||||
{
|
||||
wxCHECK_MSG( IsOk(), wxArrayVideoModes(), _T("invalid wxDisplay object") );
|
||||
wxCHECK_MSG( IsOk(), wxArrayVideoModes(), wxT("invalid wxDisplay object") );
|
||||
|
||||
return m_impl->GetModes(mode);
|
||||
}
|
||||
|
||||
wxVideoMode wxDisplay::GetCurrentMode() const
|
||||
{
|
||||
wxCHECK_MSG( IsOk(), wxVideoMode(), _T("invalid wxDisplay object") );
|
||||
wxCHECK_MSG( IsOk(), wxVideoMode(), wxT("invalid wxDisplay object") );
|
||||
|
||||
return m_impl->GetCurrentMode();
|
||||
}
|
||||
|
||||
bool wxDisplay::ChangeMode(const wxVideoMode& mode)
|
||||
{
|
||||
wxCHECK_MSG( IsOk(), false, _T("invalid wxDisplay object") );
|
||||
wxCHECK_MSG( IsOk(), false, wxT("invalid wxDisplay object") );
|
||||
|
||||
return m_impl->ChangeMode(mode);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user