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

22
samples/dialup/nettest.cpp
View File

@@ -158,7 +158,7 @@ bool MyApp::OnInit()
return false;
// Create the main application window
MyFrame *frame = new MyFrame(_T("Dial-up wxWidgets demo"),
MyFrame *frame = new MyFrame(wxT("Dial-up wxWidgets demo"),
wxPoint(50, 50), wxSize(450, 340));
// Show it and tell the application that it's our main window
@@ -183,7 +183,7 @@ bool MyApp::OnInit()
}
#if wxUSE_STATUSBAR
frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? _T("LAN") : _T("No LAN"), 2);
frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? wxT("LAN") : wxT("No LAN"), 2);
#endif // wxUSE_STATUSBAR
return true;
@@ -229,19 +229,19 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// create a menu bar
wxMenu *menuFile = new wxMenu;
menuFile->Append(NetTest_Dial, _T("&Dial\tCtrl-D"), _T("Dial default ISP"));
menuFile->Append(NetTest_HangUp, _T("&HangUp\tCtrl-H"), _T("Hang up modem"));
menuFile->Append(NetTest_Dial, wxT("&Dial\tCtrl-D"), wxT("Dial default ISP"));
menuFile->Append(NetTest_HangUp, wxT("&HangUp\tCtrl-H"), wxT("Hang up modem"));
menuFile->AppendSeparator();
menuFile->Append(NetTest_EnumISP, _T("&Enumerate ISPs...\tCtrl-E"));
menuFile->Append(NetTest_Check, _T("&Check connection status...\tCtrl-C"));
menuFile->Append(NetTest_EnumISP, wxT("&Enumerate ISPs...\tCtrl-E"));
menuFile->Append(NetTest_Check, wxT("&Check connection status...\tCtrl-C"));
menuFile->AppendSeparator();
menuFile->Append(NetTest_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
menuFile->Append(NetTest_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog"));
menuFile->AppendSeparator();
menuFile->Append(NetTest_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
menuFile->Append(NetTest_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(menuFile, wxT("&File"));
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
@@ -324,7 +324,7 @@ void MyFrame::OnEnumISPs(wxCommandEvent& WXUNUSED(event))
}
else
{
wxString msg = _T("Known ISPs:\n");
wxString msg = wxT("Known ISPs:\n");
for ( size_t n = 0; n < nCount; n++ )
{
msg << names[n] << '\n';
@@ -350,7 +350,7 @@ void MyFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
s_isOnline = isOnline;
#if wxUSE_STATUSBAR
SetStatusText(isOnline ? _T("Online") : _T("Offline"), 1);
SetStatusText(isOnline ? wxT("Online") : wxT("Offline"), 1);
#endif // wxUSE_STATUSBAR
}
}