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

20
samples/splash/splash.cpp
View File

@@ -129,7 +129,7 @@ bool MyApp::OnInit()
wxImage::AddHandler(new wxPNGHandler);
// create the main application window
MyFrame *frame = new MyFrame(_T("wxSplashScreen sample application"));
MyFrame *frame = new MyFrame(wxT("wxSplashScreen sample application"));
wxBitmap bitmap;
@@ -138,7 +138,7 @@ bool MyApp::OnInit()
bool ok = frame->m_isPda
? bitmap.Ok()
: bitmap.LoadFile(_T("splash.png"), wxBITMAP_TYPE_PNG);
: bitmap.LoadFile(wxT("splash.png"), wxBITMAP_TYPE_PNG);
if (ok)
{
@@ -182,14 +182,14 @@ MyFrame::MyFrame(const wxString& title)
// the "About" item should be in the help menu
wxMenu *helpMenu = new wxMenu;
helpMenu->Append(wxID_ABOUT, _T("&About...\tF1"), _T("Show about frame"));
helpMenu->Append(wxID_ABOUT, wxT("&About...\tF1"), wxT("Show about frame"));
menuFile->Append(wxID_EXIT, _T("E&xit\tAlt-X"), _T("Quit this program"));
menuFile->Append(wxID_EXIT, 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);
@@ -198,7 +198,7 @@ MyFrame::MyFrame(const wxString& title)
#if 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
}
@@ -219,7 +219,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
bool ok = m_isPda
? bitmap.Ok()
: bitmap.LoadFile(_T("splash.png"), wxBITMAP_TYPE_PNG);
: bitmap.LoadFile(wxT("splash.png"), wxBITMAP_TYPE_PNG);
if (ok)
{
@@ -237,12 +237,12 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
wxWindow *win = splash->GetSplashWindow();
#if wxUSE_MEDIACTRL
wxMediaCtrl *media = new wxMediaCtrl( win, wxID_EXIT, _T("press.mpg"), wxPoint(2,2));
wxMediaCtrl *media = new wxMediaCtrl( win, wxID_EXIT, wxT("press.mpg"), wxPoint(2,2));
media->Play();
#else
wxStaticText *text = new wxStaticText( win,
wxID_EXIT,
_T("click somewhere\non this image"),
wxT("click somewhere\non this image"),
wxPoint(m_isPda ? 0 : 13,
m_isPda ? 0 : 11)
);