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:
@@ -210,7 +210,7 @@ bool wxSlider::ChangeValueTo(int value)
|
||||
|
||||
// this method is protected and we should only call it with normalized
|
||||
// value!
|
||||
wxCHECK_MSG( IsInRange(value), false, _T("invalid slider value") );
|
||||
wxCHECK_MSG( IsInRange(value), false, wxT("invalid slider value") );
|
||||
|
||||
m_value = value;
|
||||
|
||||
@@ -287,14 +287,14 @@ int wxSlider::GetMax() const
|
||||
|
||||
void wxSlider::SetLineSize(int lineSize)
|
||||
{
|
||||
wxCHECK_RET( lineSize >= 0, _T("invalid slider line size") );
|
||||
wxCHECK_RET( lineSize >= 0, wxT("invalid slider line size") );
|
||||
|
||||
m_lineSize = lineSize;
|
||||
}
|
||||
|
||||
void wxSlider::SetPageSize(int pageSize)
|
||||
{
|
||||
wxCHECK_RET( pageSize >= 0, _T("invalid slider page size") );
|
||||
wxCHECK_RET( pageSize >= 0, wxT("invalid slider page size") );
|
||||
|
||||
m_pageSize = pageSize;
|
||||
}
|
||||
@@ -323,7 +323,7 @@ int wxSlider::GetPageSize() const
|
||||
|
||||
void wxSlider::SetThumbLength(int lenPixels)
|
||||
{
|
||||
wxCHECK_RET( lenPixels >= 0, _T("invalid slider thumb size") );
|
||||
wxCHECK_RET( lenPixels >= 0, wxT("invalid slider thumb size") );
|
||||
|
||||
// use m_thumbSize here directly and not GetThumbLength() to avoid setting
|
||||
// it to the default value as we don't need it
|
||||
@@ -356,7 +356,7 @@ int wxSlider::GetThumbLength() const
|
||||
|
||||
void wxSlider::SetTickFreq(int n, int WXUNUSED(dummy))
|
||||
{
|
||||
wxCHECK_RET (n > 0, _T("invalid slider tick frequency"));
|
||||
wxCHECK_RET (n > 0, wxT("invalid slider tick frequency"));
|
||||
|
||||
if ( n != m_tickFreq )
|
||||
{
|
||||
@@ -376,7 +376,7 @@ wxSize wxSlider::CalcLabelSize() const
|
||||
|
||||
// there is no sense in trying to calc the labels size if we haven't got
|
||||
// any, the caller must check for it
|
||||
wxCHECK_MSG( HasLabels(), size, _T("shouldn't be called") );
|
||||
wxCHECK_MSG( HasLabels(), size, wxT("shouldn't be called") );
|
||||
|
||||
wxCoord w1, h1, w2, h2;
|
||||
GetTextExtent(FormatValue(m_min), &w1, &h1);
|
||||
@@ -690,7 +690,7 @@ void wxSlider::CalcThumbRect(const wxRect *rectShaftIn,
|
||||
|
||||
wxString wxSlider::FormatValue(int value) const
|
||||
{
|
||||
return wxString::Format(_T("%d"), value);
|
||||
return wxString::Format(wxT("%d"), value);
|
||||
}
|
||||
|
||||
void wxSlider::DoDraw(wxControlRenderer *renderer)
|
||||
|
Reference in New Issue
Block a user