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

66
samples/widgets/radiobox.cpp
View File

@@ -180,7 +180,7 @@ wxEND_EVENT_TABLE()
#define FAMILY_CTRLS NATIVE_CTRLS
#endif
IMPLEMENT_WIDGETS_PAGE(RadioWidgetsPage, wxT("Radio"),
IMPLEMENT_WIDGETS_PAGE(RadioWidgetsPage, "Radio",
FAMILY_CTRLS | WITH_ITEMS_CTRLS
);
@@ -207,7 +207,7 @@ void RadioWidgetsPage::CreateContent()
wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
// left pane
wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style"));
wxStaticBox *box = new wxStaticBox(this, wxID_ANY, "&Set style");
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
@@ -219,12 +219,12 @@ void RadioWidgetsPage::CreateContent()
static const wxString layoutDir[] =
{
wxT("default"),
wxT("left to right"),
wxT("top to bottom")
"default",
"left to right",
"top to bottom"
};
m_radioDir = new wxRadioBox(this, wxID_ANY, wxT("Numbering:"),
m_radioDir = new wxRadioBox(this, wxID_ANY, "Numbering:",
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(layoutDir), layoutDir,
1, wxRA_SPECIFY_COLS);
@@ -236,57 +236,57 @@ void RadioWidgetsPage::CreateContent()
#endif // wxRA_LEFTTORIGHT
wxSizer *sizerRow;
sizerRow = CreateSizerWithTextAndLabel(wxT("&Major dimension:"),
sizerRow = CreateSizerWithTextAndLabel("&Major dimension:",
wxID_ANY,
&m_textMajorDim);
sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
sizerRow = CreateSizerWithTextAndLabel(wxT("&Number of buttons:"),
sizerRow = CreateSizerWithTextAndLabel("&Number of buttons:",
wxID_ANY,
&m_textNumBtns);
sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
wxButton *btn;
btn = new wxButton(this, RadioPage_Update, wxT("&Update"));
btn = new wxButton(this, RadioPage_Update, "&Update");
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 5);
sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
btn = new wxButton(this, RadioPage_Reset, wxT("&Reset"));
btn = new wxButton(this, RadioPage_Reset, "&Reset");
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
// middle pane
wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Change parameters"));
wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, "&Change parameters");
wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
sizerRow = CreateSizerWithTextAndLabel(wxT("Current selection:"),
sizerRow = CreateSizerWithTextAndLabel("Current selection:",
wxID_ANY,
&m_textCurSel);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
sizerRow = CreateSizerWithTextAndButton(RadioPage_Selection,
wxT("&Change selection:"),
"&Change selection:",
wxID_ANY,
&m_textSel);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
sizerRow = CreateSizerWithTextAndButton(RadioPage_Label,
wxT("&Label for box:"),
"&Label for box:",
wxID_ANY,
&m_textLabel);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
sizerRow = CreateSizerWithTextAndButton(RadioPage_LabelBtn,
wxT("&Label for buttons:"),
"&Label for buttons:",
wxID_ANY,
&m_textLabelBtns);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
m_chkEnableItem = CreateCheckBoxAndAddToSizer(sizerMiddle,
wxT("Disable &2nd item"),
"Disable &2nd item",
RadioPage_EnableItem);
m_chkShowItem = CreateCheckBoxAndAddToSizer(sizerMiddle,
wxT("Hide 2nd &item"),
"Hide 2nd &item",
RadioPage_ShowItem);
// right pane
@@ -312,10 +312,10 @@ void RadioWidgetsPage::CreateContent()
void RadioWidgetsPage::Reset()
{
m_textMajorDim->SetValue(wxString::Format(wxT("%u"), DEFAULT_MAJOR_DIM));
m_textNumBtns->SetValue(wxString::Format(wxT("%u"), DEFAULT_NUM_ENTRIES));
m_textLabel->SetValue(wxT("I'm a radiobox"));
m_textLabelBtns->SetValue(wxT("item"));
m_textMajorDim->SetValue(wxString::Format("%u", DEFAULT_MAJOR_DIM));
m_textNumBtns->SetValue(wxString::Format("%u", DEFAULT_NUM_ENTRIES));
m_textLabel->SetValue("I'm a radiobox");
m_textLabelBtns->SetValue("item");
m_chkSpecifyRows->SetValue(false);
m_chkEnableItem->SetValue(true);
@@ -342,7 +342,7 @@ void RadioWidgetsPage::CreateRadio()
unsigned long count;
if ( !m_textNumBtns->GetValue().ToULong(&count) )
{
wxLogWarning(wxT("Should have a valid number for number of items."));
wxLogWarning("Should have a valid number for number of items.");
// fall back to default
count = DEFAULT_NUM_ENTRIES;
@@ -351,7 +351,7 @@ void RadioWidgetsPage::CreateRadio()
unsigned long majorDim;
if ( !m_textMajorDim->GetValue().ToULong(&majorDim) )
{
wxLogWarning(wxT("Should have a valid major dimension number."));
wxLogWarning("Should have a valid major dimension number.");
// fall back to default
majorDim = DEFAULT_MAJOR_DIM;
@@ -362,7 +362,7 @@ void RadioWidgetsPage::CreateRadio()
wxString labelBtn = m_textLabelBtns->GetValue();
for ( size_t n = 0; n < count; n++ )
{
items[n] = wxString::Format(wxT("%s %lu"),
items[n] = wxString::Format("%s %lu",
labelBtn.c_str(), (unsigned long)n + 1);
}
@@ -375,7 +375,7 @@ void RadioWidgetsPage::CreateRadio()
switch ( m_radioDir->GetSelection() )
{
default:
wxFAIL_MSG( wxT("unexpected wxRadioBox layout direction") );
wxFAIL_MSG( "unexpected wxRadioBox layout direction" );
// fall through
case RadioDir_Default:
@@ -434,12 +434,12 @@ void RadioWidgetsPage::OnRadioBox(wxCommandEvent& event)
int event_sel = event.GetSelection();
wxUnusedVar(event_sel);
wxLogMessage(wxT("Radiobox selection changed, now %d"), sel);
wxLogMessage("Radiobox selection changed, now %d", sel);
wxASSERT_MSG( sel == event_sel,
wxT("selection should be the same in event and radiobox") );
"selection should be the same in event and radiobox" );
m_textCurSel->SetValue(wxString::Format(wxT("%d"), sel));
m_textCurSel->SetValue(wxString::Format("%d", sel));
}
void RadioWidgetsPage::OnButtonRecreate(wxCommandEvent& WXUNUSED(event))
@@ -458,7 +458,7 @@ void RadioWidgetsPage::OnButtonSelection(wxCommandEvent& WXUNUSED(event))
if ( !m_textSel->GetValue().ToULong(&sel) ||
(sel >= (size_t)m_radio->GetCount()) )
{
wxLogWarning(wxT("Invalid number specified as new selection."));
wxLogWarning("Invalid number specified as new selection.");
}
else
{
@@ -516,14 +516,14 @@ void RadioWidgetsPage::OnUpdateUIReset(wxUpdateUIEvent& event)
void RadioWidgetsPage::OnUpdateUIEnableItem(wxUpdateUIEvent& event)
{
event.SetText(m_radio->IsItemEnabled(TEST_BUTTON) ? wxT("Disable &2nd item")
: wxT("Enable &2nd item"));
event.SetText(m_radio->IsItemEnabled(TEST_BUTTON) ? "Disable &2nd item"
: "Enable &2nd item");
}
void RadioWidgetsPage::OnUpdateUIShowItem(wxUpdateUIEvent& event)
{
event.SetText(m_radio->IsItemShown(TEST_BUTTON) ? wxT("Hide 2nd &item")
: wxT("Show 2nd &item"));
event.SetText(m_radio->IsItemShown(TEST_BUTTON) ? "Hide 2nd &item"
: "Show 2nd &item");
}
#endif // wxUSE_RADIOBOX