Fix handling of help buttons with non-empty label under OS X.

[wxWidgets.git] / samples / widgets / gauge.cpp

diff --git a/samples/widgets/gauge.cpp b/samples/widgets/gauge.cpp
index 011702d0c31e20fdaa1cd9a4c9beb46a4b97d27f..ca1f0f092e8af8bf4af16876e00155f2b886ded5 100644 (file)
--- a/samples/widgets/gauge.cpp
+++ b/samples/widgets/gauge.cpp
@@ -6,7 +6,7 @@
 // Created:     27.03.01
 // Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin
 // Created:     27.03.01
 // Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin

-// License:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -335,8 +335,7 @@ void GaugeWidgetsPage::StopTimer(wxButton *clicked)
     wxCHECK_RET( m_timer, wxT("shouldn't be called") );
 
     m_timer->Stop();
     wxCHECK_RET( m_timer, wxT("shouldn't be called") );
 
     m_timer->Stop();

-    delete m_timer;
-    m_timer = NULL;
+    wxDELETE(m_timer);

 
     if (clicked->GetId() == GaugePage_Progress)
     {
 
     if (clicked->GetId() == GaugePage_Progress)
     {


@@ -389,6 +388,8 @@ void GaugeWidgetsPage::OnButtonIndeterminateProgress(wxCommandEvent& event)
     {
         StopTimer(b);
 
     {
         StopTimer(b);
 

+        m_gauge->SetValue(0);
+

         wxLogMessage(wxT("Stopped the timer."));
     }
 }
         wxLogMessage(wxT("Stopped the timer."));
     }
 }