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

62
samples/widgets/spinbtn.cpp
View File

@@ -196,7 +196,7 @@ END_EVENT_TABLE()
#define FAMILY_CTRLS NATIVE_CTRLS
#endif
IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, _T("Spin"),
IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, wxT("Spin"),
FAMILY_CTRLS | EDITABLE_CTRLS
);
@@ -227,25 +227,25 @@ void SpinBtnWidgetsPage::CreateContent()
wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
// left pane
wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style"));
wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style"));
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical"));
m_chkArrowKeys = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Arrow Keys"));
m_chkWrap = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Wrap"));
m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Vertical"));
m_chkArrowKeys = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Arrow Keys"));
m_chkWrap = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Wrap"));
m_chkProcessEnter = CreateCheckBoxAndAddToSizer(sizerLeft,
_T("Process &Enter"));
wxT("Process &Enter"));
sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
static const wxString halign[] =
{
_T("left"),
_T("centre"),
_T("right"),
wxT("left"),
wxT("centre"),
wxT("right"),
};
m_radioAlign = new wxRadioBox(this, wxID_ANY, _T("&Text alignment"),
m_radioAlign = new wxRadioBox(this, wxID_ANY, wxT("&Text alignment"),
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(halign), halign, 1);
@@ -253,17 +253,17 @@ void SpinBtnWidgetsPage::CreateContent()
sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
wxButton *btn = new wxButton(this, SpinBtnPage_Reset, _T("&Reset"));
wxButton *btn = new wxButton(this, SpinBtnPage_Reset, wxT("&Reset"));
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
// middle pane
wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY,
_T("&Change spinbtn value"));
wxT("&Change spinbtn value"));
wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
wxTextCtrl *text;
wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Current value"),
wxSizer *sizerRow = CreateSizerWithTextAndLabel(wxT("Current value"),
SpinBtnPage_CurValueText,
&text);
text->SetEditable(false);
@@ -271,21 +271,21 @@ void SpinBtnWidgetsPage::CreateContent()
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(SpinBtnPage_SetValue,
_T("Set &value"),
wxT("Set &value"),
SpinBtnPage_ValueText,
&m_textValue);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(SpinBtnPage_SetMinAndMax,
_T("&Min and max"),
wxT("&Min and max"),
SpinBtnPage_MinText,
&m_textMin);
m_textMax = new wxTextCtrl(this, SpinBtnPage_MaxText, wxEmptyString);
sizerRow->Add(m_textMax, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5);
m_textMin->SetValue( wxString::Format(_T("%d"), m_min) );
m_textMax->SetValue( wxString::Format(_T("%d"), m_max) );
m_textMin->SetValue( wxString::Format(wxT("%d"), m_min) );
m_textMax->SetValue( wxString::Format(wxT("%d"), m_max) );
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
@@ -342,7 +342,7 @@ void SpinBtnWidgetsPage::CreateSpin()
switch ( m_radioAlign->GetSelection() )
{
default:
wxFAIL_MSG(_T("unexpected radiobox selection"));
wxFAIL_MSG(wxT("unexpected radiobox selection"));
// fall through
case Align_Left:
@@ -378,13 +378,13 @@ void SpinBtnWidgetsPage::CreateSpin()
m_spinbtn->SetRange(m_min, m_max);
m_spinctrl = new wxSpinCtrl(this, SpinBtnPage_SpinCtrl,
wxString::Format(_T("%d"), val),
wxString::Format(wxT("%d"), val),
wxDefaultPosition, wxDefaultSize,
flags | textFlags,
m_min, m_max, val);
m_spinctrldbl = new wxSpinCtrlDouble(this, SpinBtnPage_SpinCtrlDouble,
wxString::Format(_T("%d"), val),
wxString::Format(wxT("%d"), val),
wxDefaultPosition, wxDefaultSize,
flags | textFlags,
m_min, m_max, val, 0.1);
@@ -426,7 +426,7 @@ void SpinBtnWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event))
!m_textMax->GetValue().ToLong(&maxNew) ||
minNew > maxNew )
{
wxLogWarning(_T("Invalid min/max values for the spinbtn."));
wxLogWarning(wxT("Invalid min/max values for the spinbtn."));
return;
}
@@ -444,7 +444,7 @@ void SpinBtnWidgetsPage::OnButtonSetValue(wxCommandEvent& WXUNUSED(event))
long val;
if ( !m_textValue->GetValue().ToLong(&val) || !IsValidValue(val) )
{
wxLogWarning(_T("Invalid spinbtn value."));
wxLogWarning(wxT("Invalid spinbtn value."));
return;
}
@@ -482,7 +482,7 @@ void SpinBtnWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
void SpinBtnWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)
{
event.SetText( wxString::Format(_T("%d"), m_spinbtn->GetValue()));
event.SetText( wxString::Format(wxT("%d"), m_spinbtn->GetValue()));
}
void SpinBtnWidgetsPage::OnSpinBtn(wxSpinEvent& event)
@@ -490,20 +490,20 @@ void SpinBtnWidgetsPage::OnSpinBtn(wxSpinEvent& event)
int value = event.GetInt();
wxASSERT_MSG( value == m_spinbtn->GetValue(),
_T("spinbtn value should be the same") );
wxT("spinbtn value should be the same") );
wxLogMessage(_T("Spin button value changed, now %d"), value);
wxLogMessage(wxT("Spin button value changed, now %d"), value);
}
void SpinBtnWidgetsPage::OnSpinBtnUp(wxSpinEvent& event)
{
wxLogMessage( _T("Spin button value incremented, will be %d (was %d)"),
wxLogMessage( wxT("Spin button value incremented, will be %d (was %d)"),
event.GetInt(), m_spinbtn->GetValue() );
}
void SpinBtnWidgetsPage::OnSpinBtnDown(wxSpinEvent& event)
{
wxLogMessage( _T("Spin button value decremented, will be %d (was %d)"),
wxLogMessage( wxT("Spin button value decremented, will be %d (was %d)"),
event.GetInt(), m_spinbtn->GetValue() );
}
@@ -512,21 +512,21 @@ void SpinBtnWidgetsPage::OnSpinCtrl(wxSpinEvent& event)
int value = event.GetInt();
wxASSERT_MSG( value == m_spinctrl->GetValue(),
_T("spinctrl value should be the same") );
wxT("spinctrl value should be the same") );
wxLogMessage(_T("Spin control value changed, now %d"), value);
wxLogMessage(wxT("Spin control value changed, now %d"), value);
}
void SpinBtnWidgetsPage::OnSpinCtrlDouble(wxSpinDoubleEvent& event)
{
double value = event.GetValue();
wxLogMessage(_T("Spin control value changed, now %g"), value);
wxLogMessage(wxT("Spin control value changed, now %g"), value);
}
void SpinBtnWidgetsPage::OnSpinText(wxCommandEvent& event)
{
wxLogMessage(_T("Text changed in spin control, now \"%s\""),
wxLogMessage(wxT("Text changed in spin control, now \"%s\""),
event.GetString().c_str());
}