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

Revert "Add option to present wxButton with wxNO_BORDER style in widgets sample"

Browse Source 
This reverts commit 17b9c98121.

This option to select border style is already implemented in the widgets sample.
This commit is contained in:
Artur Wieczorek
2020-04-10 20:48:21 +02:00
parent c4f5fd3581
commit 802ee492d6
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/widgets/button.cpp
View File

@@ -131,8 +131,7 @@ protected:
#endif // wxUSE_MARKUP #endif // wxUSE_MARKUP
*m_chkDefault, *m_chkDefault,
*m_chkUseBitmapClass, *m_chkUseBitmapClass,
*m_chkDisable, *m_chkDisable;
*m_chkNoBorder;
// more checkboxes for wxBitmapButton only // more checkboxes for wxBitmapButton only
wxCheckBox *m_chkUsePressed, wxCheckBox *m_chkUsePressed,
@@ -216,7 +215,6 @@ ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book,
m_chkDefault = m_chkDefault =
m_chkUseBitmapClass = m_chkUseBitmapClass =
m_chkDisable = m_chkDisable =
m_chkNoBorder =
m_chkUsePressed = m_chkUsePressed =
m_chkUseFocused = m_chkUseFocused =
m_chkUseCurrent = m_chkUseCurrent =
@@ -258,7 +256,6 @@ void ButtonWidgetsPage::CreateContent()
m_chkUseBitmapClass->SetValue(true); m_chkUseBitmapClass->SetValue(true);
m_chkDisable = CreateCheckBoxAndAddToSizer(sizerLeft, "Disable"); m_chkDisable = CreateCheckBoxAndAddToSizer(sizerLeft, "Disable");
m_chkNoBorder = CreateCheckBoxAndAddToSizer(sizerLeft, "No border");
sizerLeft->AddSpacer(5); sizerLeft->AddSpacer(5);
@@ -376,7 +373,6 @@ void ButtonWidgetsPage::Reset()
#endif // wxUSE_MARKUP #endif // wxUSE_MARKUP
m_chkUseBitmapClass->SetValue(true); m_chkUseBitmapClass->SetValue(true);
m_chkDisable->SetValue(false); m_chkDisable->SetValue(false);
m_chkNoBorder->SetValue(false);
m_chkUsePressed->SetValue(true); m_chkUsePressed->SetValue(true);
m_chkUseFocused->SetValue(true); m_chkUseFocused->SetValue(true);
@@ -458,10 +454,6 @@ void ButtonWidgetsPage::CreateButton()
{ {
flags |= wxBU_EXACTFIT; flags |= wxBU_EXACTFIT;
} }
if ( m_chkNoBorder->GetValue() )
{
flags |= wxNO_BORDER;
}
bool showsBitmap = false; bool showsBitmap = false;
if ( m_chkBitmapOnly->GetValue() ) if ( m_chkBitmapOnly->GetValue() )