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

76
samples/calendar/calendar.cpp
View File

@@ -319,7 +319,7 @@ bool MyApp::OnInit()
return false;
// Create the main application window
MyFrame *frame = new MyFrame(_T("Calendar wxWidgets sample")
MyFrame *frame = new MyFrame(wxT("Calendar wxWidgets sample")
#ifndef __WXWINCE__
,wxPoint(50, 50), wxSize(450, 340)
#endif
@@ -346,11 +346,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// create a menu bar
wxMenu *menuFile = new wxMenu;
menuFile->Append(Calendar_File_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
menuFile->Append(Calendar_File_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog"));
menuFile->AppendSeparator();
menuFile->Append(Calendar_File_ClearLog, _T("&Clear log\tCtrl-L"));
menuFile->Append(Calendar_File_ClearLog, wxT("&Clear log\tCtrl-L"));
menuFile->AppendSeparator();
menuFile->Append(Calendar_File_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
menuFile->Append(Calendar_File_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
wxMenu *menuCal = new wxMenu;
#ifdef wxHAS_NATIVE_CALENDARCTRL
@@ -359,62 +359,62 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
menuCal->AppendSeparator();
#endif // wxHAS_NATIVE_CALENDARCTRL
menuCal->Append(Calendar_Cal_Monday,
_T("Monday &first weekday\tCtrl-F"),
_T("Toggle between Mon and Sun as the first week day"),
wxT("Monday &first weekday\tCtrl-F"),
wxT("Toggle between Mon and Sun as the first week day"),
true);
menuCal->Append(Calendar_Cal_Holidays, _T("Show &holidays\tCtrl-H"),
_T("Toggle highlighting the holidays"),
menuCal->Append(Calendar_Cal_Holidays, wxT("Show &holidays\tCtrl-H"),
wxT("Toggle highlighting the holidays"),
true);
menuCal->Append(Calendar_Cal_Special, _T("Highlight &special dates\tCtrl-S"),
_T("Test custom highlighting"),
menuCal->Append(Calendar_Cal_Special, wxT("Highlight &special dates\tCtrl-S"),
wxT("Test custom highlighting"),
true);
menuCal->Append(Calendar_Cal_SurroundWeeks,
_T("Show s&urrounding weeks\tCtrl-W"),
_T("Show the neighbouring weeks in the prev/next month"),
wxT("Show s&urrounding weeks\tCtrl-W"),
wxT("Show the neighbouring weeks in the prev/next month"),
true);
menuCal->Append(Calendar_Cal_WeekNumbers,
_T("Show &week numbers"),
_T("Toggle week numbers"),
wxT("Show &week numbers"),
wxT("Toggle week numbers"),
true);
menuCal->AppendSeparator();
menuCal->Append(Calendar_Cal_SeqMonth,
_T("Toggle month selector st&yle\tCtrl-Y"),
_T("Use another style for the calendar controls"),
wxT("Toggle month selector st&yle\tCtrl-Y"),
wxT("Use another style for the calendar controls"),
true);
menuCal->Append(Calendar_Cal_Month, _T("&Month can be changed\tCtrl-M"),
_T("Allow changing the month in the calendar"),
menuCal->Append(Calendar_Cal_Month, wxT("&Month can be changed\tCtrl-M"),
wxT("Allow changing the month in the calendar"),
true);
menuCal->AppendSeparator();
menuCal->Append(Calendar_Cal_SetDate, _T("Call &SetDate(2005-12-24)"), _T("Set date to 2005-12-24."));
menuCal->Append(Calendar_Cal_Today, _T("Call &Today()"), _T("Set to the current date."));
menuCal->Append(Calendar_Cal_SetDate, wxT("Call &SetDate(2005-12-24)"), wxT("Set date to 2005-12-24."));
menuCal->Append(Calendar_Cal_Today, wxT("Call &Today()"), wxT("Set to the current date."));
menuCal->Append(Calendar_Cal_BeginDST, "Call SetDate(GetBeginDST())");
menuCal->AppendSeparator();
menuCal->AppendCheckItem(Calendar_Cal_Resizable, _T("Make &resizable\tCtrl-R"));
menuCal->AppendCheckItem(Calendar_Cal_Resizable, wxT("Make &resizable\tCtrl-R"));
#if wxUSE_DATEPICKCTRL
wxMenu *menuDate = new wxMenu;
menuDate->AppendCheckItem(Calendar_DatePicker_ShowCentury,
_T("Al&ways show century"));
wxT("Al&ways show century"));
menuDate->AppendCheckItem(Calendar_DatePicker_DropDown,
_T("Use &drop down control"));
wxT("Use &drop down control"));
menuDate->AppendCheckItem(Calendar_DatePicker_AllowNone,
_T("Allow &no date"));
wxT("Allow &no date"));
menuDate->AppendCheckItem(Calendar_DatePicker_StartWithNone,
_T("Start &with no date"));
wxT("Start &with no date"));
#if wxUSE_DATEPICKCTRL_GENERIC
menuDate->AppendCheckItem(Calendar_DatePicker_Generic,
_T("Use &generic version of the control"));
wxT("Use &generic version of the control"));
#endif // wxUSE_DATEPICKCTRL_GENERIC
menuDate->AppendSeparator();
menuDate->Append(Calendar_DatePicker_AskDate, _T("&Choose date...\tCtrl-D"), _T("Show dialog with wxDatePickerCtrl"));
menuDate->Append(Calendar_DatePicker_AskDate, wxT("&Choose date...\tCtrl-D"), wxT("Show dialog with wxDatePickerCtrl"));
#endif // wxUSE_DATEPICKCTRL
// now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar;
menuBar->Append(menuFile, _T("&File"));
menuBar->Append(menuCal, _T("&Calendar"));
menuBar->Append(menuFile, wxT("&File"));
menuBar->Append(menuCal, wxT("&Calendar"));
#if wxUSE_DATEPICKCTRL
menuBar->Append(menuDate, _T("&Date picker"));
menuBar->Append(menuDate, wxT("&Date picker"));
#endif // wxUSE_DATEPICKCTRL
menuBar->Check(Calendar_Cal_Monday, true);
@@ -448,8 +448,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxMessageBox(_T("wxCalendarCtrl sample\n(c) 2000--2008 Vadim Zeitlin"),
_T("About Calendar"), wxOK | wxICON_INFORMATION, this);
wxMessageBox(wxT("wxCalendarCtrl sample\n(c) 2000--2008 Vadim Zeitlin"),
wxT("About Calendar"), wxOK | wxICON_INFORMATION, this);
}
void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
@@ -604,16 +604,16 @@ void MyFrame::OnAskDate(wxCommandEvent& WXUNUSED(event))
if ( dt.GetDay() == today.GetDay() &&
dt.GetMonth() == today.GetMonth() )
{
wxMessageBox(_T("Happy birthday!"), _T("Calendar Sample"));
wxMessageBox(wxT("Happy birthday!"), wxT("Calendar Sample"));
}
m_panel->SetDate(dt);
wxLogStatus(_T("Changed the date to your input"));
wxLogStatus(wxT("Changed the date to your input"));
}
else
{
wxLogStatus(_T("No date entered"));
wxLogStatus(wxT("No date entered"));
}
}
}
@@ -781,7 +781,7 @@ void MyPanel::HighlightSpecial(bool on)
#if wxUSE_DATEPICKCTRL
MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
: wxDialog(parent, wxID_ANY, wxString(_T("Calendar: Choose a date")))
: wxDialog(parent, wxID_ANY, wxString(wxT("Calendar: Choose a date")))
{
wxStdDialogButtonSizer *sizerBtns = new wxStdDialogButtonSizer;
sizerBtns->AddButton(new wxButton(this, wxID_OK));
@@ -789,7 +789,7 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
sizerBtns->Realize();
wxSizer *sizerText = new wxBoxSizer(wxHORIZONTAL);
sizerText->Add(new wxStaticText(this, wxID_ANY, _T("Date in ISO format: ")),
sizerText->Add(new wxStaticText(this, wxID_ANY, wxT("Date in ISO format: ")),
wxSizerFlags().Border().Align(wxALIGN_CENTRE_VERTICAL));
m_text = new wxTextCtrl(this, wxID_ANY);
sizerText->Add(m_text, wxSizerFlags().
@@ -799,7 +799,7 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
sizerTop->Add(new wxStaticText
(
this, wxID_ANY,
_T("Enter your birthday date (not before 20th century):")
wxT("Enter your birthday date (not before 20th century):")
),
wxSizerFlags().Border());