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:
@@ -175,7 +175,7 @@ bool MyApp::OnInit()
|
||||
wxHelpProvider::Set(new wxSimpleHelpProvider());
|
||||
|
||||
// create the main application window
|
||||
MyFrame *frame = new MyFrame(_T("AccessTest wxWidgets App"),
|
||||
MyFrame *frame = new MyFrame(wxT("AccessTest wxWidgets App"),
|
||||
wxPoint(50, 50), wxSize(450, 340));
|
||||
|
||||
// and show it (the frames, unlike simple controls, are not shown when
|
||||
@@ -187,7 +187,7 @@ bool MyApp::OnInit()
|
||||
// application would exit immediately.
|
||||
return true;
|
||||
#else
|
||||
wxMessageBox( _T("This sample has to be compiled with wxUSE_ACCESSIBILITY"), _T("Building error"), wxOK);
|
||||
wxMessageBox( wxT("This sample has to be compiled with wxUSE_ACCESSIBILITY"), wxT("Building error"), wxOK);
|
||||
return false;
|
||||
#endif // wxUSE_ACCESSIBILITY
|
||||
}
|
||||
@@ -337,16 +337,16 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
|
||||
|
||||
// the "About" item should be in the help menu
|
||||
wxMenu *helpMenu = new wxMenu;
|
||||
helpMenu->Append(AccessTest_About, _T("&About..."), _T("Show about dialog"));
|
||||
helpMenu->Append(AccessTest_About, wxT("&About..."), wxT("Show about dialog"));
|
||||
|
||||
menuFile->Append(AccessTest_Query, _T("Query"), _T("Query the window hierarchy"));
|
||||
menuFile->Append(AccessTest_Query, wxT("Query"), wxT("Query the window hierarchy"));
|
||||
menuFile->AppendSeparator();
|
||||
menuFile->Append(AccessTest_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
|
||||
menuFile->Append(AccessTest_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
|
||||
|
||||
// now append the freshly created menu to the menu bar...
|
||||
wxMenuBar *menuBar = new wxMenuBar();
|
||||
menuBar->Append(menuFile, _T("&File"));
|
||||
menuBar->Append(helpMenu, _T("&Help"));
|
||||
menuBar->Append(menuFile, wxT("&File"));
|
||||
menuBar->Append(helpMenu, wxT("&Help"));
|
||||
|
||||
// ... and attach this menu bar to the frame
|
||||
SetMenuBar(menuBar);
|
||||
@@ -355,7 +355,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
|
||||
#if 0 // wxUSE_STATUSBAR
|
||||
// create a status bar just for fun (by default with 1 pane only)
|
||||
CreateStatusBar(2);
|
||||
SetStatusText(_T("Welcome to wxWidgets!"));
|
||||
SetStatusText(wxT("Welcome to wxWidgets!"));
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
||||
|
||||
@@ -395,10 +395,10 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
|
||||
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
wxString msg;
|
||||
msg.Printf( _T("This is the About dialog of the AccessTest sample.\n")
|
||||
_T("Welcome to %s"), wxVERSION_STRING);
|
||||
msg.Printf( wxT("This is the About dialog of the AccessTest sample.\n")
|
||||
wxT("Welcome to %s"), wxVERSION_STRING);
|
||||
|
||||
wxMessageBox(msg, _T("About AccessTest"), wxOK | wxICON_INFORMATION, this);
|
||||
wxMessageBox(msg, wxT("About AccessTest"), wxOK | wxICON_INFORMATION, this);
|
||||
}
|
||||
|
||||
void MyFrame::OnQuery(wxCommandEvent& WXUNUSED(event))
|
||||
|
Reference in New Issue
Block a user