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:
@@ -157,7 +157,7 @@ bool wxRadioBox::Create(wxWindow *parent,
|
||||
}
|
||||
else
|
||||
{
|
||||
wxFAIL_MSG( _T("you must specify wxRA_XXX style!") );
|
||||
wxFAIL_MSG( wxT("you must specify wxRA_XXX style!") );
|
||||
|
||||
// use default
|
||||
style = wxRA_SPECIFY_COLS | wxRA_LEFTTORIGHT;
|
||||
@@ -239,7 +239,7 @@ void wxRadioBox::Append(int count, const wxString *choices)
|
||||
|
||||
void wxRadioBox::SetSelection(int n)
|
||||
{
|
||||
wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::SetSelection") );
|
||||
wxCHECK_RET( IsValid(n), wxT("invalid index in wxRadioBox::SetSelection") );
|
||||
|
||||
m_selection = n;
|
||||
|
||||
@@ -259,7 +259,7 @@ int wxRadioBox::GetSelection() const
|
||||
|
||||
void wxRadioBox::SendRadioEvent()
|
||||
{
|
||||
wxCHECK_RET( m_selection != -1, _T("no active radio button") );
|
||||
wxCHECK_RET( m_selection != -1, wxT("no active radio button") );
|
||||
|
||||
wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, GetId());
|
||||
InitCommandEvent(event);
|
||||
@@ -272,7 +272,7 @@ void wxRadioBox::SendRadioEvent()
|
||||
void wxRadioBox::OnRadioButton(wxEvent& event)
|
||||
{
|
||||
int n = m_buttons.Index((wxRadioButton *)event.GetEventObject());
|
||||
wxCHECK_RET( n != wxNOT_FOUND, _T("click from alien radio button") );
|
||||
wxCHECK_RET( n != wxNOT_FOUND, wxT("click from alien radio button") );
|
||||
|
||||
m_selection = n;
|
||||
|
||||
@@ -286,42 +286,42 @@ void wxRadioBox::OnRadioButton(wxEvent& event)
|
||||
wxString wxRadioBox::GetString(unsigned int n) const
|
||||
{
|
||||
wxCHECK_MSG( IsValid(n), wxEmptyString,
|
||||
_T("invalid index in wxRadioBox::GetString") );
|
||||
wxT("invalid index in wxRadioBox::GetString") );
|
||||
|
||||
return m_buttons[n]->GetLabel();
|
||||
}
|
||||
|
||||
void wxRadioBox::SetString(unsigned int n, const wxString& label)
|
||||
{
|
||||
wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::SetString") );
|
||||
wxCHECK_RET( IsValid(n), wxT("invalid index in wxRadioBox::SetString") );
|
||||
|
||||
m_buttons[n]->SetLabel(label);
|
||||
}
|
||||
|
||||
bool wxRadioBox::Enable(unsigned int n, bool enable)
|
||||
{
|
||||
wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Enable") );
|
||||
wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxRadioBox::Enable") );
|
||||
|
||||
return m_buttons[n]->Enable(enable);
|
||||
}
|
||||
|
||||
bool wxRadioBox::IsItemEnabled(unsigned int n) const
|
||||
{
|
||||
wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::IsItemEnabled") );
|
||||
wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxRadioBox::IsItemEnabled") );
|
||||
|
||||
return m_buttons[n]->IsEnabled();
|
||||
}
|
||||
|
||||
bool wxRadioBox::Show(unsigned int n, bool show)
|
||||
{
|
||||
wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Show") );
|
||||
wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxRadioBox::Show") );
|
||||
|
||||
return m_buttons[n]->Show(show);
|
||||
}
|
||||
|
||||
bool wxRadioBox::IsItemShown(unsigned int n) const
|
||||
{
|
||||
wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::IsItemShown") );
|
||||
wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxRadioBox::IsItemShown") );
|
||||
|
||||
return m_buttons[n]->IsShown();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user