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

18
samples/joytest/joytest.cpp
View File

@@ -49,12 +49,12 @@ bool MyApp::OnInit()
wxJoystick stick(wxJOYSTICK1);
if (!stick.IsOk())
{
wxMessageBox(_T("No joystick detected!"));
wxMessageBox(wxT("No joystick detected!"));
return false;
}
#if wxUSE_SOUND
m_fire.Create(_T("buttonpress.wav"));
m_fire.Create(wxT("buttonpress.wav"));
#endif // wxUSE_SOUND
m_minX = stick.GetXMin();
@@ -64,25 +64,25 @@ bool MyApp::OnInit()
// Create the main frame window
frame = new MyFrame(NULL, _T("Joystick Demo"), wxDefaultPosition,
frame = new MyFrame(NULL, wxT("Joystick Demo"), wxDefaultPosition,
wxSize(500, 400), wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
// Give it an icon (this is ignored in MDI mode: uses resources)
#ifdef __WXMSW__
frame->SetIcon(wxIcon(_T("joyicon")));
frame->SetIcon(wxIcon(wxT("joyicon")));
#endif
#ifdef __X__
frame->SetIcon(wxIcon(_T("joyicon.xbm")));
frame->SetIcon(wxIcon(wxT("joyicon.xbm")));
#endif
// Make a menubar
wxMenu *file_menu = new wxMenu;
file_menu->Append(JOYTEST_QUIT, _T("&Exit"));
file_menu->Append(JOYTEST_QUIT, wxT("&Exit"));
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, _T("&File"));
menu_bar->Append(file_menu, wxT("&File"));
// Associate the menu bar with the frame
frame->SetMenuBar(menu_bar);
@@ -158,9 +158,9 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
#if wxUSE_STATUSBAR
wxString buf;
if (event.ButtonDown())
buf.Printf(_T("Joystick (%d, %d) #%i Fire!"), pt.x, pt.y, event.GetButtonChange());
buf.Printf(wxT("Joystick (%d, %d) #%i Fire!"), pt.x, pt.y, event.GetButtonChange());
else
buf.Printf(_T("Joystick (%d, %d) "), pt.x, pt.y);
buf.Printf(wxT("Joystick (%d, %d) "), pt.x, pt.y);
/*
for(int i = 0; i < nButtons; ++i)