X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be16b85933283014930eb4973ab65706f75c94d8..cd15bcaf50ead53ccf9d50965312f0dc754affb4:/samples/widgets/gauge.cpp

diff --git a/samples/widgets/gauge.cpp b/samples/widgets/gauge.cpp
index 8ff34d47d2..6b16d3757a 100644
--- 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
-// License:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -175,7 +175,7 @@ END_EVENT_TABLE()
     #define FAMILY_CTRLS NATIVE_CTRLS
 #endif
 
-IMPLEMENT_WIDGETS_PAGE(GaugeWidgetsPage, _T("Gauge"), FAMILY_CTRLS );
+IMPLEMENT_WIDGETS_PAGE(GaugeWidgetsPage, wxT("Gauge"), FAMILY_CTRLS );
 
 GaugeWidgetsPage::GaugeWidgetsPage(WidgetsBookCtrl *book,
                                    wxImageList *imaglist)
@@ -198,25 +198,24 @@ void GaugeWidgetsPage::CreateContent()
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane
-    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style"));
+    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style"));
 
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 
-    m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical"));
-    m_chkSmooth = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Smooth"));
+    m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Vertical"));
+    m_chkSmooth = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Smooth"));
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 
-    wxButton *btn = new wxButton(this, GaugePage_Reset, _T("&Reset"));
+    wxButton *btn = new wxButton(this, GaugePage_Reset, wxT("&Reset"));
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane
-    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY,
-        _T("&Change gauge value"));
+    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Change gauge value"));
     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 
     wxTextCtrl *text;
-    wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Current value"),
+    wxSizer *sizerRow = CreateSizerWithTextAndLabel(wxT("Current value"),
                                                     GaugePage_CurValueText,
                                                     &text);
     text->SetEditable(false);
@@ -224,25 +223,26 @@ void GaugeWidgetsPage::CreateContent()
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
     sizerRow = CreateSizerWithTextAndButton(GaugePage_SetValue,
-                                            _T("Set &value"),
+                                            wxT("Set &value"),
                                             GaugePage_ValueText,
                                             &m_textValue);
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
     sizerRow = CreateSizerWithTextAndButton(GaugePage_SetRange,
-                                            _T("Set &range"),
+                                            wxT("Set &range"),
                                             GaugePage_RangeText,
                                             &m_textRange);
-    m_textRange->SetValue( wxString::Format(_T("%lu"), m_range) );
+    m_textRange->SetValue( wxString::Format(wxT("%lu"), m_range) );
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
-    btn = new wxButton(this, GaugePage_Progress, _T("Simulate &progress"));
+    btn = new wxButton(this, GaugePage_Progress, wxT("Simulate &progress"));
     sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
 
-    btn = new wxButton(this, GaugePage_IndeterminateProgress, _T("Simulate undeterminate job"));
+    btn = new wxButton(this, GaugePage_IndeterminateProgress,
+                       wxT("Simulate &indeterminate job"));
     sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
 
-    btn = new wxButton(this, GaugePage_Clear, _T("&Clear"));
+    btn = new wxButton(this, GaugePage_Clear, wxT("&Clear"));
     sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
 
     // right pane
@@ -303,7 +303,7 @@ void GaugeWidgetsPage::CreateGauge()
                           wxDefaultPosition, wxDefaultSize,
                           flags);
     m_gauge->SetValue(val);
-    
+
     if ( flags & wxGA_VERTICAL )
         m_sizerGauge->Add(m_gauge, 0, wxGROW | wxALL, 5);
     else
@@ -316,13 +316,13 @@ void GaugeWidgetsPage::StartTimer(wxButton *clicked)
 {
     static const int INTERVAL = 300;
 
-    wxLogMessage(_T("Launched progress timer (interval = %d ms)"), INTERVAL);
+    wxLogMessage(wxT("Launched progress timer (interval = %d ms)"), INTERVAL);
 
     m_timer = new wxTimer(this,
         clicked->GetId() == GaugePage_Progress ? GaugePage_Timer : GaugePage_IndeterminateTimer);
     m_timer->Start(INTERVAL);
 
-    clicked->SetLabel(_T("&Stop timer"));
+    clicked->SetLabel(wxT("&Stop timer"));
 
     if (clicked->GetId() == GaugePage_Progress)
         FindWindow(GaugePage_IndeterminateProgress)->Disable();
@@ -332,24 +332,23 @@ void GaugeWidgetsPage::StartTimer(wxButton *clicked)
 
 void GaugeWidgetsPage::StopTimer(wxButton *clicked)
 {
-    wxCHECK_RET( m_timer, _T("shouldn't be called") );
+    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)
     {
-        clicked->SetLabel(_T("Simulate &progress"));
+        clicked->SetLabel(wxT("Simulate &progress"));
         FindWindow(GaugePage_IndeterminateProgress)->Enable();
     }
     else
     {
-        clicked->SetLabel(_T("Simulate undeterminate job"));
+        clicked->SetLabel(wxT("Simulate indeterminate job"));
         FindWindow(GaugePage_Progress)->Enable();
     }
 
-    wxLogMessage(_T("Progress finished."));
+    wxLogMessage(wxT("Progress finished."));
 }
 
 // ----------------------------------------------------------------------------
@@ -374,7 +373,7 @@ void GaugeWidgetsPage::OnButtonProgress(wxCommandEvent& event)
     {
         StopTimer(b);
 
-        wxLogMessage(_T("Stopped the timer."));
+        wxLogMessage(wxT("Stopped the timer."));
     }
 }
 
@@ -389,7 +388,9 @@ void GaugeWidgetsPage::OnButtonIndeterminateProgress(wxCommandEvent& event)
     {
         StopTimer(b);
 
-        wxLogMessage(_T("Stopped the timer."));
+        m_gauge->SetValue(0);
+
+        wxLogMessage(wxT("Stopped the timer."));
     }
 }
 
@@ -449,7 +450,7 @@ void GaugeWidgetsPage::OnProgressTimer(wxTimerEvent& WXUNUSED(event))
     else // reached the end
     {
         wxButton *btn = (wxButton *)FindWindow(GaugePage_Progress);
-        wxCHECK_RET( btn, _T("no progress button?") );
+        wxCHECK_RET( btn, wxT("no progress button?") );
 
         StopTimer(btn);
     }
@@ -462,7 +463,7 @@ void GaugeWidgetsPage::OnIndeterminateProgressTimer(wxTimerEvent& WXUNUSED(event
 
 void GaugeWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)
 {
-    event.SetText( wxString::Format(_T("%d"), m_gauge->GetValue()));
+    event.SetText( wxString::Format(wxT("%d"), m_gauge->GetValue()));
 }
 
 #endif