Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove (most) occurrences of wxT() macro from the samples

Browse Source 
Also replace wxChar* with wxString.

Closes https://github.com/wxWidgets/wxWidgets/pull/945
This commit is contained in:
Blake-Eryx
2018-09-23 01:15:08 +02:00
committed by Vadim Zeitlin
parent e768046774
commit f58ea62596
93 changed files with 4362 additions and 4358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
samples/sound/sound.cpp
View File

@@ -39,7 +39,7 @@
#include "../sample.xpm"
#endif
#define WAV_FILE wxT("doggrowl.wav")
#define WAV_FILE "doggrowl.wav"
// ----------------------------------------------------------------------------
// private classes
@@ -166,7 +166,7 @@ bool MyApp::OnInit()
return false;
// create the main application window
MyFrame *frame = new MyFrame(wxT("wxWidgets Sound Sample"));
MyFrame *frame = new MyFrame("wxWidgets Sound Sample");
// and show it (the frames, unlike simple controls, are not shown when
// created initially)
@@ -194,32 +194,32 @@ MyFrame::MyFrame(const wxString& title)
SetIcon(wxICON(sample));
wxMenu *menuFile = new wxMenu;
menuFile->Append(Sound_SelectFile, wxT("Select WAV &file...\tCtrl-O"), wxT("Select a new wav file to play"));
menuFile->Append(Sound_SelectFile, "Select WAV &file...\tCtrl-O", "Select a new wav file to play");
#ifdef __WXMSW__
menuFile->Append(Sound_SelectResource, wxT("Select WAV &resource...\tCtrl-R"), wxT("Select a new resource to play"));
menuFile->Append(Sound_SelectMemory, wxT("Select WAV &data\tCtrl-M"), wxT("Choose to play from memory buffer"));
menuFile->Append(Sound_SelectResource, "Select WAV &resource...\tCtrl-R", "Select a new resource to play");
menuFile->Append(Sound_SelectMemory, "Select WAV &data\tCtrl-M", "Choose to play from memory buffer");
#endif // __WXMSW__
menuFile->Append(Sound_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
menuFile->Append(Sound_Quit, "E&xit\tAlt-X", "Quit this program");
wxMenu *playMenu = new wxMenu;
playMenu->Append(Sound_PlaySync, wxT("Play sound &synchronously\tCtrl-S"));
playMenu->Append(Sound_PlayAsync, wxT("Play sound &asynchronously\tCtrl-A"));
playMenu->Append(Sound_PlayAsyncOnStack, wxT("Play sound asynchronously (&object on stack)\tCtrl-K"));
playMenu->Append(Sound_PlayLoop, wxT("&Loop sound\tCtrl-L"));
playMenu->Append(Sound_PlaySync, "Play sound &synchronously\tCtrl-S");
playMenu->Append(Sound_PlayAsync, "Play sound &asynchronously\tCtrl-A");
playMenu->Append(Sound_PlayAsyncOnStack, "Play sound asynchronously (&object on stack)\tCtrl-K");
playMenu->Append(Sound_PlayLoop, "&Loop sound\tCtrl-L");
playMenu->AppendSeparator();
playMenu->Append(Sound_Stop, wxT("&Stop playing\tCtrl-T"));
playMenu->Append(Sound_Stop, "&Stop playing\tCtrl-T");
playMenu->AppendSeparator();
playMenu->Append(Sound_PlayBell, wxT("Play system bell"));
playMenu->Append(Sound_PlayBell, "Play system bell");
wxMenu *helpMenu = new wxMenu;
helpMenu->Append(Sound_About, wxT("&About\tF1"), wxT("Show about dialog"));
helpMenu->Append(Sound_About, "&About\tF1", "Show about dialog");
// now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar();
menuBar->Append(menuFile, wxT("&File"));
menuBar->Append(playMenu, wxT("&Play"));
menuBar->Append(helpMenu, wxT("&Help"));
menuBar->Append(menuFile, "&File");
menuBar->Append(playMenu, "&Play");
menuBar->Append(helpMenu, "&Help");
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
@@ -991,7 +991,7 @@ wxSound* MyFrame::TryCreateSound() const
void MyFrame::NotifyUsingFile(const wxString& name)
{
wxString msg;
msg << wxT("Using sound file: ") << name << wxT("\n");
msg << "Using sound file: " << name << "\n";
m_tc->AppendText(msg);
}
@@ -1002,7 +1002,7 @@ void MyFrame::NotifyUsingFile(const wxString& name)
void MyFrame::OnSelectFile(wxCommandEvent& WXUNUSED(event))
{
#if wxUSE_FILEDLG
wxFileDialog dlg(this, wxT("Choose a sound file"),
wxFileDialog dlg(this, "Choose a sound file",
wxEmptyString, wxEmptyString,
wxString::Format
(
@@ -1031,9 +1031,9 @@ void MyFrame::OnSelectResource(wxCommandEvent& WXUNUSED(event))
{
m_soundRes = wxGetTextFromUser
(
wxT("Enter resource name:"),
wxT("wxWidgets Sound Sample"),
wxT("FromResource"),
"Enter resource name:",
"wxWidgets Sound Sample",
"FromResource",
this
);
if ( m_soundRes.empty() )
@@ -1044,7 +1044,7 @@ void MyFrame::OnSelectResource(wxCommandEvent& WXUNUSED(event))
wxDELETE(m_sound);
NotifyUsingFile(wxT("Windows WAV resource"));
NotifyUsingFile("Windows WAV resource");
}
#endif // __WXMSW__
@@ -1053,7 +1053,7 @@ void MyFrame::OnSelectMemory(wxCommandEvent& WXUNUSED(event))
{
m_useMemory = true;
NotifyUsingFile(wxT("embedded sound fragment"));
NotifyUsingFile("embedded sound fragment");
}
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
@@ -1109,10 +1109,10 @@ void MyFrame::OnPlayBell(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxString msg;
msg.Printf( wxT("This is the About dialog of the sound sample.\n")
wxT("Welcome to %s"), wxVERSION_STRING);
msg.Printf( "This is the About dialog of the sound sample.\n"
"Welcome to %s", wxVERSION_STRING);
wxMessageBox(msg, wxT("About"), wxOK | wxICON_INFORMATION, this);
wxMessageBox(msg, "About", wxOK | wxICON_INFORMATION, this);
}
void MyFrame::OnStop(wxCommandEvent& WXUNUSED(event))