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

48
samples/widgets/hyperlnk.cpp
View File

@@ -142,7 +142,7 @@ wxEND_EVENT_TABLE()
// implementation
// ============================================================================
IMPLEMENT_WIDGETS_PAGE(HyperlinkWidgetsPage, wxT("Hyperlink"),
IMPLEMENT_WIDGETS_PAGE(HyperlinkWidgetsPage, "Hyperlink",
GENERIC_CTRLS
);
@@ -157,33 +157,33 @@ void HyperlinkWidgetsPage::CreateContent()
wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
// left pane
wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("Hyperlink details"));
wxStaticBox *box = new wxStaticBox(this, wxID_ANY, "Hyperlink details");
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
sizerLeft->Add( CreateSizerWithTextAndButton( HyperlinkPage_SetLabel , wxT("Set &Label"), wxID_ANY, &m_label ),
sizerLeft->Add( CreateSizerWithTextAndButton( HyperlinkPage_SetLabel , "Set &Label", wxID_ANY, &m_label ),
0, wxALL | wxALIGN_RIGHT , 5 );
sizerLeft->Add( CreateSizerWithTextAndButton( HyperlinkPage_SetURL , wxT("Set &URL"), wxID_ANY, &m_url ),
sizerLeft->Add( CreateSizerWithTextAndButton( HyperlinkPage_SetURL , "Set &URL", wxID_ANY, &m_url ),
0, wxALL | wxALIGN_RIGHT , 5 );
static const wxString alignments[] =
{
wxT("&left"),
wxT("&centre"),
wxT("&right")
"&left",
"&centre",
"&right"
};
wxCOMPILE_TIME_ASSERT( WXSIZEOF(alignments) == Align_Max,
AlignMismatch );
m_radioAlignMode = new wxRadioBox(this, wxID_ANY, wxT("alignment"),
m_radioAlignMode = new wxRadioBox(this, wxID_ANY, "alignment",
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(alignments), alignments);
m_radioAlignMode->SetSelection(1); // start with "centre" selected since
// wxHL_DEFAULT_STYLE contains wxHL_ALIGN_CENTRE
sizerLeft->Add(m_radioAlignMode, 0, wxALL|wxGROW, 5);
m_checkGeneric = new wxCheckBox(this, wxID_ANY, wxT("Use generic version"),
m_checkGeneric = new wxCheckBox(this, wxID_ANY, "Use generic version",
wxDefaultPosition, wxDefaultSize);
sizerLeft->Add(m_checkGeneric, 0, wxALL|wxGROW, 5);
@@ -191,24 +191,24 @@ void HyperlinkWidgetsPage::CreateContent()
wxSizer *szHyperlinkLong = new wxBoxSizer(wxVERTICAL);
wxSizer *szHyperlink = new wxBoxSizer(wxHORIZONTAL);
m_visit = new wxStaticText(this, wxID_ANY, wxT("Visit "));
m_visit = new wxStaticText(this, wxID_ANY, "Visit ");
if (m_checkGeneric->IsChecked())
{
m_hyperlink = new wxGenericHyperlinkCtrl(this,
HyperlinkPage_Ctrl,
wxT("wxWidgets website"),
wxT("www.wxwidgets.org"));
"wxWidgets website",
"www.wxwidgets.org");
}
else
{
m_hyperlink = new wxHyperlinkCtrl(this,
HyperlinkPage_Ctrl,
wxT("wxWidgets website"),
wxT("www.wxwidgets.org"));
"wxWidgets website",
"www.wxwidgets.org");
}
m_fun = new wxStaticText(this, wxID_ANY, wxT(" for fun!"));
m_fun = new wxStaticText(this, wxID_ANY, " for fun!");
szHyperlink->Add(0, 0, 1, wxCENTRE);
szHyperlink->Add(m_visit, 0, wxCENTRE);
@@ -221,15 +221,15 @@ void HyperlinkWidgetsPage::CreateContent()
{
m_hyperlinkLong = new wxGenericHyperlinkCtrl(this,
wxID_ANY,
wxT("This is a long hyperlink"),
wxT("www.wxwidgets.org"));
"This is a long hyperlink",
"www.wxwidgets.org");
}
else
{
m_hyperlinkLong = new wxHyperlinkCtrl(this,
wxID_ANY,
wxT("This is a long hyperlink"),
wxT("www.wxwidgets.org"));
"This is a long hyperlink",
"www.wxwidgets.org");
}
szHyperlinkLong->Add(0, 0, 1, wxCENTRE);
@@ -307,8 +307,8 @@ void HyperlinkWidgetsPage::CreateHyperlinkLong(long align)
{
hyp = new wxGenericHyperlinkCtrl(this,
wxID_ANY,
wxT("This is a long hyperlink"),
wxT("www.wxwidgets.org"),
"This is a long hyperlink",
"www.wxwidgets.org",
wxDefaultPosition,
wxDefaultSize,
style);
@@ -317,8 +317,8 @@ void HyperlinkWidgetsPage::CreateHyperlinkLong(long align)
{
hyp = new wxHyperlinkCtrl(this,
wxID_ANY,
wxT("This is a long hyperlink"),
wxT("www.wxwidgets.org"),
"This is a long hyperlink",
"www.wxwidgets.org",
wxDefaultPosition,
wxDefaultSize,
style);
@@ -365,7 +365,7 @@ void HyperlinkWidgetsPage::OnAlignment(wxCommandEvent& WXUNUSED(event))
{
default:
case Align_Max:
wxFAIL_MSG( wxT("unknown alignment") );
wxFAIL_MSG( "unknown alignment" );
// fall through
case Align_Left: