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

30
samples/render/render.cpp
View File

@@ -436,7 +436,7 @@ bool MyApp::OnInit()
MyFrame::MyFrame()
: wxFrame(NULL,
wxID_ANY,
wxT("Render wxWidgets Sample"))
"Render wxWidgets Sample")
{
// set the frame icon
SetIcon(wxICON(sample));
@@ -471,8 +471,8 @@ MyFrame::MyFrame()
menuFile->AppendCheckItem(Render_UseGeneric, "Use &generic renderer\tCtrl-G");
#if wxUSE_DYNLIB_CLASS
menuFile->Append(Render_Load, wxT("&Load renderer...\tCtrl-L"));
menuFile->Append(Render_Unload, wxT("&Unload renderer\tCtrl-U"));
menuFile->Append(Render_Load, "&Load renderer...\tCtrl-L");
menuFile->Append(Render_Unload, "&Unload renderer\tCtrl-U");
menuFile->AppendSeparator();
#endif // wxUSE_DYNLIB_CLASS
menuFile->Append(Render_Quit);
@@ -483,8 +483,8 @@ MyFrame::MyFrame()
// now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar();
menuBar->Append(menuFile, wxT("&File"));
menuBar->Append(helpMenu, wxT("&Help"));
menuBar->Append(menuFile, "&File");
menuBar->Append(helpMenu, "&Help");
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
@@ -497,7 +497,7 @@ MyFrame::MyFrame()
#if wxUSE_STATUSBAR
// create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(2);
SetStatusText(wxT("Welcome to wxWidgets!"));
SetStatusText("Welcome to wxWidgets!");
#endif // wxUSE_STATUSBAR
Show();
@@ -551,12 +551,12 @@ void MyFrame::OnUseGeneric(wxCommandEvent& event)
void MyFrame::OnLoad(wxCommandEvent& WXUNUSED(event))
{
static wxString s_name = wxT("renddll");
static wxString s_name = "renddll";
wxString name = wxGetTextFromUser
(
wxT("Name of the renderer to load:"),
wxT("Render wxWidgets Sample"),
"Name of the renderer to load:",
"Render wxWidgets Sample",
s_name,
this
);
@@ -593,11 +593,11 @@ void MyFrame::OnUnload(wxCommandEvent& WXUNUSED(event))
m_panel->Refresh();
wxLogStatus(this, wxT("Unloaded the previously loaded renderer."));
wxLogStatus(this, "Unloaded the previously loaded renderer.");
}
else
{
wxLogWarning(wxT("No renderer to unload."));
wxLogWarning("No renderer to unload.");
}
}
@@ -611,10 +611,10 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxMessageBox(wxT("Render sample shows how to use custom renderers.\n")
wxT("\n")
wxT("(c) 2003 Vadim Zeitlin"),
wxT("About Render wxWidgets Sample"),
wxMessageBox("Render sample shows how to use custom renderers.\n"
"\n"
"(c) 2003 Vadim Zeitlin",
"About Render wxWidgets Sample",
wxOK | wxICON_INFORMATION, this);
}