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

44
samples/sashtest/sashtest.cpp
View File

@@ -44,30 +44,30 @@ bool MyApp::OnInit(void)
// Create the main frame window
frame = new MyFrame(NULL, wxID_ANY, wxT("Sash Demo"), wxPoint(0, 0), wxSize(500, 400),
frame = new MyFrame(NULL, wxID_ANY, "Sash Demo", wxPoint(0, 0), wxSize(500, 400),
wxDEFAULT_FRAME_STYLE |
wxNO_FULL_REPAINT_ON_RESIZE |
wxHSCROLL | wxVSCROLL);
// Give it an icon (this is ignored in MDI mode: uses resources)
#ifdef __WXMSW__
frame->SetIcon(wxIcon(wxT("sashtest_icn")));
frame->SetIcon(wxIcon("sashtest_icn"));
#endif
// Make a menubar
wxMenu *file_menu = new wxMenu;
file_menu->Append(SASHTEST_NEW_WINDOW, wxT("&New window"));
file_menu->Append(SASHTEST_TOGGLE_WINDOW, wxT("&Toggle window"));
file_menu->Append(SASHTEST_QUIT, wxT("&Exit"));
file_menu->Append(SASHTEST_NEW_WINDOW, "&New window");
file_menu->Append(SASHTEST_TOGGLE_WINDOW, "&Toggle window");
file_menu->Append(SASHTEST_QUIT, "&Exit");
wxMenu *help_menu = new wxMenu;
help_menu->Append(SASHTEST_ABOUT, wxT("&About"));
help_menu->Append(SASHTEST_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, wxT("&File"));
menu_bar->Append(help_menu, wxT("&Help"));
menu_bar->Append(file_menu, "&File");
menu_bar->Append(help_menu, "&Help");
// Associate the menu bar with the frame
frame->SetMenuBar(menu_bar);
@@ -138,7 +138,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
wxTextCtrl* textWindow = new wxTextCtrl(win, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE|wxSUNKEN_BORDER);
// wxTE_MULTILINE|wxNO_BORDER);
textWindow->SetValue(wxT("A help window"));
textWindow->SetValue("A help window");
m_leftWindow1 = win;
@@ -162,7 +162,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
(void)wxMessageBox(wxT("wxWidgets 2.0 Sash Demo\nAuthor: Julian Smart (c) 1998"), wxT("About Sash Demo"));
(void)wxMessageBox("wxWidgets 2.0 Sash Demo\nAuthor: Julian Smart (c) 1998", "About Sash Demo");
}
void MyFrame::OnToggleWindow(wxCommandEvent& WXUNUSED(event))
@@ -222,17 +222,17 @@ void MyFrame::OnSashDrag(wxSashEvent& event)
void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event))
{
// Make another frame, containing a canvas
MyChild *subframe = new MyChild(frame, wxT("Canvas Frame"),
MyChild *subframe = new MyChild(frame, "Canvas Frame",
wxPoint(10, 10), wxSize(300, 300),
wxDEFAULT_FRAME_STYLE |
wxNO_FULL_REPAINT_ON_RESIZE);
subframe->SetTitle(wxString::Format(wxT("Canvas Frame %d"), winNumber));
subframe->SetTitle(wxString::Format("Canvas Frame %d", winNumber));
winNumber ++;
// Give it an icon (this is ignored in MDI mode: uses resources)
#ifdef __WXMSW__
subframe->SetIcon(wxIcon(wxT("sashtest_icn")));
subframe->SetIcon(wxIcon("sashtest_icn"));
#endif
#if wxUSE_STATUSBAR
@@ -243,23 +243,23 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event))
// Make a menubar
wxMenu *file_menu = new wxMenu;
file_menu->Append(SASHTEST_NEW_WINDOW, wxT("&New window"));
file_menu->Append(SASHTEST_CHILD_QUIT, wxT("&Close child"));
file_menu->Append(SASHTEST_QUIT, wxT("&Exit"));
file_menu->Append(SASHTEST_NEW_WINDOW, "&New window");
file_menu->Append(SASHTEST_CHILD_QUIT, "&Close child");
file_menu->Append(SASHTEST_QUIT, "&Exit");
wxMenu *option_menu = new wxMenu;
// Dummy option
option_menu->Append(SASHTEST_REFRESH, wxT("&Refresh picture"));
option_menu->Append(SASHTEST_REFRESH, "&Refresh picture");
wxMenu *help_menu = new wxMenu;
help_menu->Append(SASHTEST_ABOUT, wxT("&About"));
help_menu->Append(SASHTEST_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, wxT("&File"));
menu_bar->Append(option_menu, wxT("&Options"));
menu_bar->Append(help_menu, wxT("&Help"));
menu_bar->Append(file_menu, "&File");
menu_bar->Append(option_menu, "&Options");
menu_bar->Append(help_menu, "&Help");
// Associate the menu bar with the frame
subframe->SetMenuBar(menu_bar);
@@ -306,7 +306,7 @@ void MyCanvas::OnDraw(wxDC& dc)
dc.DrawSpline(50, 200, 50, 100, 200, 10);
#endif // wxUSE_SPLINES
dc.DrawLine(50, 230, 200, 230);
dc.DrawText(wxT("This is a test string"), 50, 230);
dc.DrawText("This is a test string", 50, 230);
wxPoint points[3];
points[0].x = 200; points[0].y = 300;