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

Remove more wxT() macros from samples

Browse Source 
Also use wxString instead of wxChar* strings.

Closes https://github.com/wxWidgets/wxWidgets/pull/950
This commit is contained in:
Blake Eryx
2018-09-28 21:45:15 -04:00
committed by Vadim Zeitlin
parent 480047ee9a
commit b70ed2d8c8
67 changed files with 1926 additions and 1932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/widgets/searchctrl.cpp
View File

@@ -130,7 +130,7 @@ wxEND_EVENT_TABLE()
#define FAMILY_CTRLS GENERIC_CTRLS
#endif
IMPLEMENT_WIDGETS_PAGE(SearchCtrlWidgetsPage, wxT("SearchCtrl"),
IMPLEMENT_WIDGETS_PAGE(SearchCtrlWidgetsPage, "SearchCtrl",
FAMILY_CTRLS | EDITABLE_CTRLS | ALL_CTRLS);
SearchCtrlWidgetsPage::SearchCtrlWidgetsPage(WidgetsBookCtrl *book,
@@ -147,12 +147,12 @@ void SearchCtrlWidgetsPage::CreateContent()
wxSizer* box = new wxStaticBoxSizer(
new wxStaticBox(this, -1, wxT("Options")),
new wxStaticBox(this, -1, "Options"),
wxVERTICAL);
m_searchBtnCheck = new wxCheckBox(this, ID_SEARCH_CB, wxT("Search button"));
m_cancelBtnCheck = new wxCheckBox(this, ID_CANCEL_CB, wxT("Cancel button"));
m_menuBtnCheck = new wxCheckBox(this, ID_MENU_CB, wxT("Search menu"));
m_searchBtnCheck = new wxCheckBox(this, ID_SEARCH_CB, "Search button");
m_cancelBtnCheck = new wxCheckBox(this, ID_CANCEL_CB, "Cancel button");
m_menuBtnCheck = new wxCheckBox(this, ID_MENU_CB, "Search menu");
m_searchBtnCheck->SetValue(true);
@@ -191,12 +191,12 @@ wxMenu* SearchCtrlWidgetsPage::CreateTestMenu()
{
wxMenu* menu = new wxMenu;
const int SEARCH_MENU_SIZE = 5;
wxMenuItem* menuItem = menu->Append(wxID_ANY, wxT("Recent Searches"), wxT(""), wxITEM_NORMAL);
wxMenuItem* menuItem = menu->Append(wxID_ANY, "Recent Searches", "", wxITEM_NORMAL);
menuItem->Enable(false);
for ( int i = 0; i < SEARCH_MENU_SIZE; i++ )
{
wxString itemText = wxString::Format(wxT("item %i"),i);
wxString tipText = wxString::Format(wxT("tip %i"),i);
wxString itemText = wxString::Format("item %i",i);
wxString tipText = wxString::Format("tip %i",i);
menu->Append(ID_SEARCHMENU+i, itemText, tipText, wxITEM_NORMAL);
}
return menu;