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

84
samples/wizard/wizard.cpp
View File

@@ -128,13 +128,13 @@ public:
{
m_bitmap = wxBitmap(wiztest2_xpm);
m_checkbox = new wxCheckBox(this, wxID_ANY, _T("&Check me"));
m_checkbox = new wxCheckBox(this, wxID_ANY, wxT("&Check me"));
wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
mainSizer->Add(
new wxStaticText(this, wxID_ANY,
_T("You need to check the checkbox\n")
_T("below before going to the next page\n")),
wxT("You need to check the checkbox\n")
wxT("below before going to the next page\n")),
0,
wxALL,
5
@@ -153,7 +153,7 @@ public:
{
if ( !m_checkbox->GetValue() )
{
wxMessageBox(_T("Check the checkbox first!"), _T("No way"),
wxMessageBox(wxT("Check the checkbox first!"), wxT("No way"),
wxICON_WARNING | wxOK, this);
return false;
@@ -184,12 +184,12 @@ public:
// static wxString choices[] = { "forward", "backward", "both", "neither" };
// The above syntax can cause an internal compiler error with gcc.
wxString choices[4];
choices[0] = _T("forward");
choices[1] = _T("backward");
choices[2] = _T("both");
choices[3] = _T("neither");
choices[0] = wxT("forward");
choices[1] = wxT("backward");
choices[2] = wxT("both");
choices[3] = wxT("neither");
m_radio = new wxRadioBox(this, wxID_ANY, _T("Allow to proceed:"),
m_radio = new wxRadioBox(this, wxID_ANY, wxT("Allow to proceed:"),
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(choices), choices,
1, wxRA_SPECIFY_COLS);
@@ -209,7 +209,7 @@ public:
// wizard event handlers
void OnWizardCancel(wxWizardEvent& event)
{
if ( wxMessageBox(_T("Do you really want to cancel?"), _T("Question"),
if ( wxMessageBox(wxT("Do you really want to cancel?"), wxT("Question"),
wxICON_QUESTION | wxYES_NO, this) != wxYES )
{
// not confirmed
@@ -230,7 +230,7 @@ public:
if ( !event.GetDirection() && sel == Backward )
return;
wxMessageBox(_T("You can't go there"), _T("Not allowed"),
wxMessageBox(wxT("You can't go there"), wxT("Not allowed"),
wxICON_WARNING | wxOK, this);
event.Veto();
@@ -257,14 +257,14 @@ public:
wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
mainSizer->Add(
new wxStaticText(this, wxID_ANY, _T("Try checking the box below and\n")
_T("then going back and clearing it")),
new wxStaticText(this, wxID_ANY, wxT("Try checking the box below and\n")
wxT("then going back and clearing it")),
0, // No vertical stretching
wxALL,
5 // Border width
);
m_checkbox = new wxCheckBox(this, wxID_ANY, _T("&Skip the next page"));
m_checkbox = new wxCheckBox(this, wxID_ANY, wxT("&Skip the next page"));
mainSizer->Add(
m_checkbox,
0, // No vertical stretching
@@ -275,16 +275,16 @@ public:
#if wxUSE_CHECKLISTBOX
static const wxChar *aszChoices[] =
{
_T("Zeroth"),
_T("First"),
_T("Second"),
_T("Third"),
_T("Fourth"),
_T("Fifth"),
_T("Sixth"),
_T("Seventh"),
_T("Eighth"),
_T("Nineth")
wxT("Zeroth"),
wxT("First"),
wxT("Second"),
wxT("Third"),
wxT("Fourth"),
wxT("Fifth"),
wxT("Sixth"),
wxT("Seventh"),
wxT("Eighth"),
wxT("Nineth")
};
m_checklistbox = new wxCheckListBox
@@ -368,7 +368,7 @@ bool MyApp::OnInit()
if ( !wxApp::OnInit() )
return false;
MyFrame *frame = new MyFrame(_T("wxWizard Sample"));
MyFrame *frame = new MyFrame(wxT("wxWizard Sample"));
// and show it (the frames, unlike simple controls, are not shown when
// created initially)
@@ -383,7 +383,7 @@ bool MyApp::OnInit()
// ----------------------------------------------------------------------------
MyWizard::MyWizard(wxFrame *frame, bool useSizer)
: wxWizard(frame,wxID_ANY,_T("Absolutely Useless Wizard"),
: wxWizard(frame,wxID_ANY,wxT("Absolutely Useless Wizard"),
wxBitmap(wiztest_xpm),wxDefaultPosition,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
{
@@ -401,9 +401,9 @@ MyWizard::MyWizard(wxFrame *frame, bool useSizer)
m_page1 = new wxWizardPageSimple(this);
/* wxStaticText *text = */ new wxStaticText(m_page1, wxID_ANY,
_T("This wizard doesn't help you\nto do anything at all.\n")
_T("\n")
_T("The next pages will present you\nwith more useless controls."),
wxT("This wizard doesn't help you\nto do anything at all.\n")
wxT("\n")
wxT("The next pages will present you\nwith more useless controls."),
wxPoint(5,5)
);
@@ -437,24 +437,24 @@ MyFrame::MyFrame(const wxString& title)
wxDefaultPosition, wxSize(250, 150)) // small frame
{
wxMenu *menuFile = new wxMenu;
menuFile->Append(Wizard_RunModal, _T("&Run wizard modal...\tCtrl-R"));
menuFile->Append(Wizard_RunNoSizer, _T("Run wizard &without sizer..."));
menuFile->Append(Wizard_RunModeless, _T("Run wizard &modeless..."));
menuFile->Append(Wizard_RunModal, wxT("&Run wizard modal...\tCtrl-R"));
menuFile->Append(Wizard_RunNoSizer, wxT("Run wizard &without sizer..."));
menuFile->Append(Wizard_RunModeless, wxT("Run wizard &modeless..."));
menuFile->AppendSeparator();
menuFile->Append(Wizard_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
menuFile->Append(Wizard_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
wxMenu *menuOptions = new wxMenu;
menuOptions->AppendCheckItem(Wizard_LargeWizard, _T("&Scroll Wizard Pages"));
menuOptions->AppendCheckItem(Wizard_ExpandBitmap, _T("Si&ze Bitmap To Page"));
menuOptions->AppendCheckItem(Wizard_LargeWizard, wxT("&Scroll Wizard Pages"));
menuOptions->AppendCheckItem(Wizard_ExpandBitmap, wxT("Si&ze Bitmap To Page"));
wxMenu *helpMenu = new wxMenu;
helpMenu->Append(Wizard_About, _T("&About...\tF1"), _T("Show about dialog"));
helpMenu->Append(Wizard_About, wxT("&About...\tF1"), wxT("Show about dialog"));
// now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar();
menuBar->Append(menuFile, _T("&File"));
menuBar->Append(menuOptions, _T("&Options"));
menuBar->Append(helpMenu, _T("&Help"));
menuBar->Append(menuFile, wxT("&File"));
menuBar->Append(menuOptions, wxT("&Options"));
menuBar->Append(helpMenu, wxT("&Help"));
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
@@ -473,9 +473,9 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxMessageBox(_T("Demo of wxWizard class\n")
_T("(c) 1999, 2000 Vadim Zeitlin"),
_T("About wxWizard sample"), wxOK | wxICON_INFORMATION, this);
wxMessageBox(wxT("Demo of wxWizard class\n")
wxT("(c) 1999, 2000 Vadim Zeitlin"),
wxT("About wxWizard sample"), wxOK | wxICON_INFORMATION, this);
}
void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))