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

74
samples/widgets/slider.cpp
View File

@@ -226,7 +226,7 @@ END_EVENT_TABLE()
#define FAMILY_CTRLS NATIVE_CTRLS
#endif
IMPLEMENT_WIDGETS_PAGE(SliderWidgetsPage, _T("Slider"), FAMILY_CTRLS );
IMPLEMENT_WIDGETS_PAGE(SliderWidgetsPage, wxT("Slider"), FAMILY_CTRLS );
SliderWidgetsPage::SliderWidgetsPage(WidgetsBookCtrl *book,
wxImageList *imaglist)
@@ -252,41 +252,41 @@ void SliderWidgetsPage::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_chkInverse = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Inverse"));
m_chkTicks = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &ticks"));
m_chkLabels = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &labels"));
m_chkInverse = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Inverse"));
m_chkTicks = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Show &ticks"));
m_chkLabels = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Show &labels"));
static const wxString sides[] =
{
_T("top"),
_T("bottom"),
_T("left"),
_T("right"),
wxT("top"),
wxT("bottom"),
wxT("left"),
wxT("right"),
};
m_radioSides = new wxRadioBox(this, SliderPage_RadioSides, _T("&Ticks/Labels"),
m_radioSides = new wxRadioBox(this, SliderPage_RadioSides, wxT("&Ticks/Labels"),
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(sides), sides,
1, wxRA_SPECIFY_COLS);
sizerLeft->Add(m_radioSides, 0, wxGROW | wxALL, 5);
m_chkBothSides = CreateCheckBoxAndAddToSizer
(sizerLeft, _T("&Both sides"), SliderPage_BothSides);
(sizerLeft, wxT("&Both sides"), SliderPage_BothSides);
#if wxUSE_TOOLTIPS
m_chkBothSides->SetToolTip( _T("\"Both sides\" is only supported \nin Win95 and Universal") );
m_chkBothSides->SetToolTip( wxT("\"Both sides\" is only supported \nin Win95 and Universal") );
#endif // wxUSE_TOOLTIPS
sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
wxButton *btn = new wxButton(this, SliderPage_Reset, _T("&Reset"));
wxButton *btn = new wxButton(this, SliderPage_Reset, wxT("&Reset"));
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
// middle pane
wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, _T("&Change slider value"));
wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Change slider value"));
wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
wxTextCtrl *text;
wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Current value"),
wxSizer *sizerRow = CreateSizerWithTextAndLabel(wxT("Current value"),
SliderPage_CurValueText,
&text);
text->SetEditable(false);
@@ -294,49 +294,49 @@ void SliderWidgetsPage::CreateContent()
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(SliderPage_SetValue,
_T("Set &value"),
wxT("Set &value"),
SliderPage_ValueText,
&m_textValue);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(SliderPage_SetMinAndMax,
_T("&Min and max"),
wxT("&Min and max"),
SliderPage_MinText,
&m_textMin);
m_textMax = new wxTextCtrl(this, SliderPage_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);
sizerRow = CreateSizerWithTextAndButton(SliderPage_SetLineSize,
_T("Li&ne size"),
wxT("Li&ne size"),
SliderPage_LineSizeText,
&m_textLineSize);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(SliderPage_SetPageSize,
_T("P&age size"),
wxT("P&age size"),
SliderPage_PageSizeText,
&m_textPageSize);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(SliderPage_SetTickFreq,
_T("Tick &frequency"),
wxT("Tick &frequency"),
SliderPage_TickFreqText,
&m_textTickFreq);
m_textTickFreq->SetValue(_T("10"));
m_textTickFreq->SetValue(wxT("10"));
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(SliderPage_SetThumbLen,
_T("Thumb &length"),
wxT("Thumb &length"),
SliderPage_ThumbLenText,
&m_textThumbLen);
@@ -350,8 +350,8 @@ void SliderWidgetsPage::CreateContent()
Reset();
CreateSlider();
m_textLineSize->SetValue(wxString::Format(_T("%d"), m_slider->GetLineSize()));
m_textPageSize->SetValue(wxString::Format(_T("%d"), m_slider->GetPageSize()));
m_textLineSize->SetValue(wxString::Format(wxT("%d"), m_slider->GetLineSize()));
m_textPageSize->SetValue(wxString::Format(wxT("%d"), m_slider->GetPageSize()));
// the 3 panes panes compose the window
sizerTop->Add(sizerLeft, 0, wxGROW | (wxALL & ~wxLEFT), 10);
@@ -414,7 +414,7 @@ void SliderWidgetsPage::CreateSlider()
break;
default:
wxFAIL_MSG(_T("unexpected radiobox selection"));
wxFAIL_MSG(wxT("unexpected radiobox selection"));
// fall through
}
@@ -473,7 +473,7 @@ void SliderWidgetsPage::DoSetLineSize()
long lineSize;
if ( !m_textLineSize->GetValue().ToLong(&lineSize) )
{
wxLogWarning(_T("Invalid slider line size"));
wxLogWarning(wxT("Invalid slider line size"));
return;
}
@@ -482,7 +482,7 @@ void SliderWidgetsPage::DoSetLineSize()
if ( m_slider->GetLineSize() != lineSize )
{
wxLogWarning(_T("Invalid line size in slider."));
wxLogWarning(wxT("Invalid line size in slider."));
}
}
@@ -491,7 +491,7 @@ void SliderWidgetsPage::DoSetPageSize()
long pageSize;
if ( !m_textPageSize->GetValue().ToLong(&pageSize) )
{
wxLogWarning(_T("Invalid slider page size"));
wxLogWarning(wxT("Invalid slider page size"));
return;
}
@@ -500,7 +500,7 @@ void SliderWidgetsPage::DoSetPageSize()
if ( m_slider->GetPageSize() != pageSize )
{
wxLogWarning(_T("Invalid page size in slider."));
wxLogWarning(wxT("Invalid page size in slider."));
}
}
@@ -509,7 +509,7 @@ void SliderWidgetsPage::DoSetTickFreq()
long freq;
if ( !m_textTickFreq->GetValue().ToLong(&freq) )
{
wxLogWarning(_T("Invalid slider tick frequency"));
wxLogWarning(wxT("Invalid slider tick frequency"));
return;
}
@@ -522,7 +522,7 @@ void SliderWidgetsPage::DoSetThumbLen()
long len;
if ( !m_textThumbLen->GetValue().ToLong(&len) )
{
wxLogWarning(_T("Invalid slider thumb length"));
wxLogWarning(wxT("Invalid slider thumb length"));
return;
}
@@ -569,7 +569,7 @@ void SliderWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event))
!m_textMax->GetValue().ToLong(&maxNew) ||
minNew >= maxNew )
{
wxLogWarning(_T("Invalid min/max values for the slider."));
wxLogWarning(wxT("Invalid min/max values for the slider."));
return;
}
@@ -582,7 +582,7 @@ void SliderWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event))
if ( m_slider->GetMin() != m_min ||
m_slider->GetMax() != m_max )
{
wxLogWarning(_T("Invalid range in slider."));
wxLogWarning(wxT("Invalid range in slider."));
}
}
@@ -591,7 +591,7 @@ void SliderWidgetsPage::OnButtonSetValue(wxCommandEvent& WXUNUSED(event))
long val;
if ( !m_textValue->GetValue().ToLong(&val) || !IsValidValue(val) )
{
wxLogWarning(_T("Invalid slider value."));
wxLogWarning(wxT("Invalid slider value."));
return;
}
@@ -657,7 +657,7 @@ void SliderWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
void SliderWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)
{
event.SetText( wxString::Format(_T("%d"), m_slider->GetValue()) );
event.SetText( wxString::Format(wxT("%d"), m_slider->GetValue()) );
}
void SliderWidgetsPage::OnUpdateUIRadioSides(wxUpdateUIEvent& event)