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

Use border style consistently in the widgets sample

Browse Source 
Use GetAttrs().m_defaultFlags everywhere when creating the widgets, it
was done for some but not all of them before, without any apparent
reason.

This should make setting various border styles work (for the widgets
supporting them).
This commit is contained in:
Vadim Zeitlin
2018-03-17 17:50:56 +01:00
parent 0acb119ccb
commit 7e8fb1e294
13 changed files with 83 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samples/widgets/hyperlnk.cpp
View File

@@ -99,7 +99,7 @@ protected:
// (re)create the hyperctrl
void CreateHyperlink();
void CreateHyperlinkLong(long);
void CreateHyperlinkLong(long align);
// the controls
// ------------
@@ -259,6 +259,9 @@ void HyperlinkWidgetsPage::CreateHyperlink()
{
const wxString label = m_hyperlink->GetLabel();
const wxString url = m_hyperlink->GetURL();
long style = GetAttrs().m_defaultFlags;
style |= wxHL_DEFAULT_STYLE & ~wxBORDER_MASK;
wxGenericHyperlinkCtrl *hyp;
if (m_checkGeneric->IsChecked())
@@ -266,14 +269,20 @@ void HyperlinkWidgetsPage::CreateHyperlink()
hyp = new wxGenericHyperlinkCtrl(this,
HyperlinkPage_Ctrl,
label,
url);
url,
wxDefaultPosition,
wxDefaultSize,
style);
}
else
{
hyp = new wxHyperlinkCtrl(this,
HyperlinkPage_Ctrl,
label,
url);
url,
wxDefaultPosition,
wxDefaultSize,
style);
}
// update sizer's child window
@@ -287,9 +296,11 @@ void HyperlinkWidgetsPage::CreateHyperlink()
GetSizer()->Layout();
}
void HyperlinkWidgetsPage::CreateHyperlinkLong(long style)
void HyperlinkWidgetsPage::CreateHyperlinkLong(long align)
{
style = (wxHL_DEFAULT_STYLE & ~wxHL_ALIGN_CENTRE)|style;
long style = GetAttrs().m_defaultFlags;
style |= align;
style |= wxHL_DEFAULT_STYLE & ~(wxHL_ALIGN_CENTRE | wxBORDER_MASK);
wxGenericHyperlinkCtrl *hyp;
if (m_checkGeneric->IsChecked())