From 6b11c372a1108f563fc95239bf1628864772983d Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Mon, 28 Jan 2019 08:57:32 +0000 Subject: [PATCH] Fix recently introduced build error in widgets sample Make it compile again when wxHAS_BITMAPTOGGLEBUTTON is not defined, which is notably the case in wxQt. Closes https://github.com/wxWidgets/wxWidgets/pull/1189 --- samples/widgets/toggle.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/samples/widgets/toggle.cpp b/samples/widgets/toggle.cpp index 2f61d261b3..52a4b6215c 100644 --- a/samples/widgets/toggle.cpp +++ b/samples/widgets/toggle.cpp @@ -490,9 +490,8 @@ void ToggleWidgetsPage::CreateToggle() m_chkUseFocused->Enable(showsBitmap); m_chkUseCurrent->Enable(showsBitmap); m_chkUseDisabled->Enable(showsBitmap); -#endif // wxHAS_BITMAPTOGGLEBUTTON - m_toggle->Enable(!m_chkDisable->IsChecked()); +#endif // wxHAS_BITMAPTOGGLEBUTTON AddButtonToSizer(); @@ -501,6 +500,7 @@ void ToggleWidgetsPage::CreateToggle() void ToggleWidgetsPage::AddButtonToSizer() { +#ifdef wxHAS_BITMAPTOGGLEBUTTON if ( m_chkFit->GetValue() ) { m_sizerToggle->AddStretchSpacer(1); @@ -508,6 +508,7 @@ void ToggleWidgetsPage::AddButtonToSizer() m_sizerToggle->AddStretchSpacer(1); } else // take up the entire space +#endif // wxHAS_BITMAPTOGGLEBUTTON { m_sizerToggle->Add(m_toggle, wxSizerFlags(1).Expand().Border()); } @@ -540,8 +541,10 @@ void ToggleWidgetsPage::OnButtonChangeLabel(wxCommandEvent& WXUNUSED(event)) #endif // wxUSE_MARKUP m_toggle->SetLabel(labelText); +#ifdef wxHAS_BITMAPTOGGLEBUTTON if ( m_chkBitmapOnly->IsChecked() ) CreateToggle(); +#endif // wxHAS_BITMAPTOGGLEBUTTON } #ifdef wxHAS_BITMAPTOGGLEBUTTON