From fafc5613f4c56f8b2ff7570ab0e7130f0756cfef Mon Sep 17 00:00:00 2001 From: PB Date: Sat, 10 Oct 2020 19:38:34 +0200 Subject: [PATCH] Fix slider event counter in widgets sample Commit 952e5f3 introduced logging wxEVT_SLIDER events in addition to scrolling events but the event count was incorrect as the wxEVT_SLIDER handler and scrolling events handler kept their own event count. Fix this by using a static member variable shared by both event handlers. --- samples/widgets/slider.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp index 4fbda64f11..75e9b2145c 100644 --- a/samples/widgets/slider.cpp +++ b/samples/widgets/slider.cpp @@ -162,6 +162,8 @@ protected: bool IsValidValue(int val) const { return (val >= m_min) && (val <= m_max); } + static int ms_numSliderEvents; + // the slider range int m_min, m_max; @@ -201,6 +203,8 @@ private: DECLARE_WIDGETS_PAGE(SliderWidgetsPage) }; +int SliderWidgetsPage::ms_numSliderEvents = 0; + // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- @@ -837,11 +841,8 @@ void SliderWidgetsPage::OnSlider(wxScrollEvent& event) wxASSERT_MSG(index >= 0 && (size_t)index < WXSIZEOF(eventNames), "Unknown slider event" ); - - static int s_numSliderEvents = 0; - wxLogMessage("Slider event #%d: %s (pos = %d, int value = %d)", - s_numSliderEvents++, + ms_numSliderEvents++, eventNames[index], event.GetPosition(), event.GetInt()); @@ -849,10 +850,8 @@ void SliderWidgetsPage::OnSlider(wxScrollEvent& event) void SliderWidgetsPage::OnSlider(wxCommandEvent& event) { - static int s_numSliderEvents = 0; - wxLogMessage("Slider event #%d: wxEVT_SLIDER (value = %d)", - s_numSliderEvents++, event.GetInt()); + ms_numSliderEvents++, event.GetInt()); } #endif // wxUSE_SLIDER