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

34
utils/emulator/src/emulator.cpp
View File

@@ -117,10 +117,10 @@ bool wxEmulatorApp::OnInit()
// If the development version, go up a directory.
#ifdef __WXMSW__
if ((m_appDir.Right(5).CmpNoCase(_T("DEBUG")) == 0) ||
(m_appDir.Right(11).CmpNoCase(_T("DEBUGSTABLE")) == 0) ||
(m_appDir.Right(7).CmpNoCase(_T("RELEASE")) == 0) ||
(m_appDir.Right(13).CmpNoCase(_T("RELEASESTABLE")) == 0)
if ((m_appDir.Right(5).CmpNoCase(wxT("DEBUG")) == 0) ||
(m_appDir.Right(11).CmpNoCase(wxT("DEBUGSTABLE")) == 0) ||
(m_appDir.Right(7).CmpNoCase(wxT("RELEASE")) == 0) ||
(m_appDir.Right(13).CmpNoCase(wxT("RELEASESTABLE")) == 0)
)
m_appDir = wxPathOnly(m_appDir);
#endif
@@ -176,7 +176,7 @@ bool wxEmulatorApp::OnInit()
}
// create the main application window
wxEmulatorFrame *frame = new wxEmulatorFrame(_T("wxEmulator"),
wxEmulatorFrame *frame = new wxEmulatorFrame(wxT("wxEmulator"),
wxPoint(50, 50), wxSize(450, 340));
#if wxUSE_STATUSBAR
@@ -274,14 +274,14 @@ wxEmulatorFrame::wxEmulatorFrame(const wxString& title,
// the "About" item should be in the help menu
wxMenu *helpMenu = new wxMenu;
helpMenu->Append(Emulator_About, _T("&About...\tF1"), _T("Show about dialog"));
helpMenu->Append(Emulator_About, wxT("&About...\tF1"), wxT("Show about dialog"));
menuFile->Append(Emulator_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
menuFile->Append(Emulator_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);
@@ -305,9 +305,9 @@ void wxEmulatorFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void wxEmulatorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxString msg;
msg.Printf( _T("wxEmulator is an environment for testing embedded X11 apps.\n"));
msg.Printf( wxT("wxEmulator is an environment for testing embedded X11 apps.\n"));
wxMessageBox(msg, _T("About wxEmulator"), wxOK | wxICON_INFORMATION, this);
wxMessageBox(msg, wxT("About wxEmulator"), wxOK | wxICON_INFORMATION, this);
}
void wxEmulatorFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
@@ -523,17 +523,17 @@ wxBitmapType wxDetermineImageType(const wxString& filename)
wxFileName::SplitPath(filename, & path, & name, & ext);
ext.MakeLower();
if (ext == _T("jpg") || ext == _T("jpeg"))
if (ext == wxT("jpg") || ext == wxT("jpeg"))
return wxBITMAP_TYPE_JPEG;
if (ext == _T("gif"))
if (ext == wxT("gif"))
return wxBITMAP_TYPE_GIF;
if (ext == _T("bmp"))
if (ext == wxT("bmp"))
return wxBITMAP_TYPE_BMP;
if (ext == _T("png"))
if (ext == wxT("png"))
return wxBITMAP_TYPE_PNG;
if (ext == _T("pcx"))
if (ext == wxT("pcx"))
return wxBITMAP_TYPE_PCX;
if (ext == _T("tif") || ext == _T("tiff"))
if (ext == wxT("tif") || ext == wxT("tiff"))
return wxBITMAP_TYPE_TIF;
return wxBITMAP_TYPE_INVALID;