remove _T()s, they're unneeded now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -125,7 +125,7 @@ bool MyApp::OnInit()
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// create the main application window
|
// create the main application window
|
||||||
MyFrame *frame = new MyFrame(_T("Minimal wxWidgets App"));
|
MyFrame *frame = new MyFrame("Minimal wxWidgets App");
|
||||||
|
|
||||||
// and show it (the frames, unlike simple controls, are not shown when
|
// and show it (the frames, unlike simple controls, are not shown when
|
||||||
// created initially)
|
// created initially)
|
||||||
@@ -154,14 +154,14 @@ MyFrame::MyFrame(const wxString& title)
|
|||||||
|
|
||||||
// the "About" item should be in the help menu
|
// the "About" item should be in the help menu
|
||||||
wxMenu *helpMenu = new wxMenu;
|
wxMenu *helpMenu = new wxMenu;
|
||||||
helpMenu->Append(Minimal_About, _T("&About...\tF1"), _T("Show about dialog"));
|
helpMenu->Append(Minimal_About, "&About...\tF1", "Show about dialog");
|
||||||
|
|
||||||
fileMenu->Append(Minimal_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
|
fileMenu->Append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program");
|
||||||
|
|
||||||
// now append the freshly created menu to the menu bar...
|
// now append the freshly created menu to the menu bar...
|
||||||
wxMenuBar *menuBar = new wxMenuBar();
|
wxMenuBar *menuBar = new wxMenuBar();
|
||||||
menuBar->Append(fileMenu, _T("&File"));
|
menuBar->Append(fileMenu, "&File");
|
||||||
menuBar->Append(helpMenu, _T("&Help"));
|
menuBar->Append(helpMenu, "&Help");
|
||||||
|
|
||||||
// ... and attach this menu bar to the frame
|
// ... and attach this menu bar to the frame
|
||||||
SetMenuBar(menuBar);
|
SetMenuBar(menuBar);
|
||||||
@@ -170,7 +170,7 @@ MyFrame::MyFrame(const wxString& title)
|
|||||||
#if wxUSE_STATUSBAR
|
#if wxUSE_STATUSBAR
|
||||||
// create a status bar just for fun (by default with 1 pane only)
|
// create a status bar just for fun (by default with 1 pane only)
|
||||||
CreateStatusBar(2);
|
CreateStatusBar(2);
|
||||||
SetStatusText(_T("Welcome to wxWidgets!"));
|
SetStatusText("Welcome to wxWidgets!");
|
||||||
#endif // wxUSE_STATUSBAR
|
#endif // wxUSE_STATUSBAR
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -185,15 +185,16 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
|
|||||||
|
|
||||||
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
wxMessageBox(wxString::Format(
|
wxMessageBox(wxString::Format
|
||||||
_T("Welcome to %s!\n")
|
(
|
||||||
_T("\n")
|
"Welcome to %s!\n"
|
||||||
_T("This is the minimal wxWidgets sample\n")
|
"\n"
|
||||||
_T("running under %s."),
|
"This is the minimal wxWidgets sample\n"
|
||||||
|
"running under %s.",
|
||||||
wxVERSION_STRING,
|
wxVERSION_STRING,
|
||||||
wxGetOsDescription().c_str()
|
wxGetOsDescription()
|
||||||
),
|
),
|
||||||
_T("About wxWidgets minimal sample"),
|
"About wxWidgets minimal sample",
|
||||||
wxOK | wxICON_INFORMATION,
|
wxOK | wxICON_INFORMATION,
|
||||||
this);
|
this);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user