From 17b9c98121cff4261cc17a0e02ddfad8575ecfb1 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Thu, 9 Apr 2020 22:49:14 +0200 Subject: [PATCH] Add option to present wxButton with wxNO_BORDER style in widgets sample --- samples/widgets/button.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp index 18a3b477e0..e8f84ba022 100644 --- a/samples/widgets/button.cpp +++ b/samples/widgets/button.cpp @@ -131,7 +131,8 @@ protected: #endif // wxUSE_MARKUP *m_chkDefault, *m_chkUseBitmapClass, - *m_chkDisable; + *m_chkDisable, + *m_chkNoBorder; // more checkboxes for wxBitmapButton only wxCheckBox *m_chkUsePressed, @@ -215,6 +216,7 @@ ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book, m_chkDefault = m_chkUseBitmapClass = m_chkDisable = + m_chkNoBorder = m_chkUsePressed = m_chkUseFocused = m_chkUseCurrent = @@ -256,6 +258,7 @@ void ButtonWidgetsPage::CreateContent() m_chkUseBitmapClass->SetValue(true); m_chkDisable = CreateCheckBoxAndAddToSizer(sizerLeft, "Disable"); + m_chkNoBorder = CreateCheckBoxAndAddToSizer(sizerLeft, "No border"); sizerLeft->AddSpacer(5); @@ -373,6 +376,7 @@ void ButtonWidgetsPage::Reset() #endif // wxUSE_MARKUP m_chkUseBitmapClass->SetValue(true); m_chkDisable->SetValue(false); + m_chkNoBorder->SetValue(false); m_chkUsePressed->SetValue(true); m_chkUseFocused->SetValue(true); @@ -454,6 +458,10 @@ void ButtonWidgetsPage::CreateButton() { flags |= wxBU_EXACTFIT; } + if ( m_chkNoBorder->GetValue() ) + { + flags |= wxNO_BORDER; + } bool showsBitmap = false; if ( m_chkBitmapOnly->GetValue() )