fixes potential crash under gatekeeper

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

diff --git a/samples/widgets/gauge.cpp b/samples/widgets/gauge.cpp
index 477f8d429bf138dff75f928ed0a77a261efee944..6b16d3757aa49a696fa7ececd1451c3ff06b1179 100644 (file)
--- a/samples/widgets/gauge.cpp
+++ b/samples/widgets/gauge.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample

 // Name:        gauge.cpp
 // Purpose:     Part of the widgets sample showing wxGauge
 // Author:      Vadim Zeitlin
 // Created:     27.03.01
 // Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin
 // Name:        gauge.cpp
 // Purpose:     Part of the widgets sample showing wxGauge
 // Author:      Vadim Zeitlin
 // Created:     27.03.01
 // Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin

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

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


@@ -52,8 +52,9 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    GaugePage_Reset = 100,
+    GaugePage_Reset = wxID_HIGHEST,

     GaugePage_Progress,
     GaugePage_Progress,

+    GaugePage_IndeterminateProgress,

     GaugePage_Clear,
     GaugePage_SetValue,
     GaugePage_SetRange,
     GaugePage_Clear,
     GaugePage_SetValue,
     GaugePage_SetRange,


@@ -61,6 +62,7 @@ enum
     GaugePage_ValueText,
     GaugePage_RangeText,
     GaugePage_Timer,
     GaugePage_ValueText,
     GaugePage_RangeText,
     GaugePage_Timer,

+    GaugePage_IndeterminateTimer,

     GaugePage_Gauge
 };
 
     GaugePage_Gauge
 };
 


@@ -71,13 +73,20 @@ enum
 class GaugeWidgetsPage : public WidgetsPage
 {
 public:
 class GaugeWidgetsPage : public WidgetsPage
 {
 public:

-    GaugeWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
+    GaugeWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);

     virtual ~GaugeWidgetsPage();
 
     virtual ~GaugeWidgetsPage();
 

+    virtual wxControl *GetWidget() const { return m_gauge; }
+    virtual void RecreateWidget() { CreateGauge(); }
+
+    // lazy creation of the content
+    virtual void CreateContent();
+

 protected:
     // event handlers
     void OnButtonReset(wxCommandEvent& event);
     void OnButtonProgress(wxCommandEvent& event);
 protected:
     // event handlers
     void OnButtonReset(wxCommandEvent& event);
     void OnButtonProgress(wxCommandEvent& event);

+    void OnButtonIndeterminateProgress(wxCommandEvent& event);

     void OnButtonClear(wxCommandEvent& event);
     void OnButtonSetValue(wxCommandEvent& event);
     void OnButtonSetRange(wxCommandEvent& event);
     void OnButtonClear(wxCommandEvent& event);
     void OnButtonSetValue(wxCommandEvent& event);
     void OnButtonSetRange(wxCommandEvent& event);


@@ -91,6 +100,7 @@ protected:
     void OnUpdateUICurValueText(wxUpdateUIEvent& event);
 
     void OnProgressTimer(wxTimerEvent& event);
     void OnUpdateUICurValueText(wxUpdateUIEvent& event);
 
     void OnProgressTimer(wxTimerEvent& event);

+    void OnIndeterminateProgressTimer(wxTimerEvent& event);

 
     // reset the gauge parameters
     void Reset();
 
     // reset the gauge parameters
     void Reset();


@@ -98,8 +108,11 @@ protected:
     // (re)create the gauge
     void CreateGauge();
 
     // (re)create the gauge
     void CreateGauge();
 

+    // start progress timer
+    void StartTimer(wxButton*);
+

     // stop the progress timer
     // stop the progress timer

-    void StopTimer();
+    void StopTimer(wxButton*);

 
     // the gauge range
     unsigned long m_range;
 
     // the gauge range
     unsigned long m_range;


@@ -134,6 +147,7 @@ private:
 BEGIN_EVENT_TABLE(GaugeWidgetsPage, WidgetsPage)
     EVT_BUTTON(GaugePage_Reset, GaugeWidgetsPage::OnButtonReset)
     EVT_BUTTON(GaugePage_Progress, GaugeWidgetsPage::OnButtonProgress)
 BEGIN_EVENT_TABLE(GaugeWidgetsPage, WidgetsPage)
     EVT_BUTTON(GaugePage_Reset, GaugeWidgetsPage::OnButtonReset)
     EVT_BUTTON(GaugePage_Progress, GaugeWidgetsPage::OnButtonProgress)

+    EVT_BUTTON(GaugePage_IndeterminateProgress, GaugeWidgetsPage::OnButtonIndeterminateProgress)

     EVT_BUTTON(GaugePage_Clear, GaugeWidgetsPage::OnButtonClear)
     EVT_BUTTON(GaugePage_SetValue, GaugeWidgetsPage::OnButtonSetValue)
     EVT_BUTTON(GaugePage_SetRange, GaugeWidgetsPage::OnButtonSetRange)
     EVT_BUTTON(GaugePage_Clear, GaugeWidgetsPage::OnButtonClear)
     EVT_BUTTON(GaugePage_SetValue, GaugeWidgetsPage::OnButtonSetValue)
     EVT_BUTTON(GaugePage_SetRange, GaugeWidgetsPage::OnButtonSetRange)


@@ -144,24 +158,29 @@ BEGIN_EVENT_TABLE(GaugeWidgetsPage, WidgetsPage)
 
     EVT_UPDATE_UI(GaugePage_CurValueText, GaugeWidgetsPage::OnUpdateUICurValueText)
 
 
     EVT_UPDATE_UI(GaugePage_CurValueText, GaugeWidgetsPage::OnUpdateUICurValueText)
 

-    EVT_CHECKBOX(-1, GaugeWidgetsPage::OnCheckOrRadioBox)
-    EVT_RADIOBOX(-1, GaugeWidgetsPage::OnCheckOrRadioBox)
+    EVT_CHECKBOX(wxID_ANY, GaugeWidgetsPage::OnCheckOrRadioBox)
+    EVT_RADIOBOX(wxID_ANY, GaugeWidgetsPage::OnCheckOrRadioBox)

 
     EVT_TIMER(GaugePage_Timer, GaugeWidgetsPage::OnProgressTimer)
 
     EVT_TIMER(GaugePage_Timer, GaugeWidgetsPage::OnProgressTimer)

+    EVT_TIMER(GaugePage_IndeterminateTimer, GaugeWidgetsPage::OnIndeterminateProgressTimer)

 END_EVENT_TABLE()
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 END_EVENT_TABLE()
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(GaugeWidgetsPage, _T("Gauge"));
+#if defined(__WXUNIVERSAL__)
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#endif

 
 

-GaugeWidgetsPage::GaugeWidgetsPage(wxNotebook *notebook,
-                                       wxImageList *imaglist)
-                  : WidgetsPage(notebook)
-{
-    imaglist->Add(wxBitmap(gauge_xpm));
+IMPLEMENT_WIDGETS_PAGE(GaugeWidgetsPage, wxT("Gauge"), FAMILY_CTRLS );

 
 

+GaugeWidgetsPage::GaugeWidgetsPage(WidgetsBookCtrl *book,
+                                   wxImageList *imaglist)
+                 :WidgetsPage(book, imaglist, gauge_xpm)
+{

     // init everything
     m_range = 100;
 
     // init everything
     m_range = 100;
 


@@ -172,51 +191,58 @@ GaugeWidgetsPage::GaugeWidgetsPage(wxNotebook *notebook,
 
     m_gauge = (wxGauge *)NULL;
     m_sizerGauge = (wxSizer *)NULL;
 
     m_gauge = (wxGauge *)NULL;
     m_sizerGauge = (wxSizer *)NULL;

+}

 
 

+void GaugeWidgetsPage::CreateContent()
+{

     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane

-    wxStaticBox *box = new wxStaticBox(this, -1, _T("&Set style"));
+    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style"));

 
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 
 
     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
 
 
     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
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane

-    wxStaticBox *box2 = new wxStaticBox(this, -1, _T("&Change gauge value"));
+    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Change gauge value"));

     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 
     wxTextCtrl *text;
     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 
     wxTextCtrl *text;

-    wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Current value"),
+    wxSizer *sizerRow = CreateSizerWithTextAndLabel(wxT("Current value"),

                                                     GaugePage_CurValueText,
                                                     &text);
                                                     GaugePage_CurValueText,
                                                     &text);

-    text->SetEditable(FALSE);
+    text->SetEditable(false);

 
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
     sizerRow = CreateSizerWithTextAndButton(GaugePage_SetValue,
 
     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,
                                             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);
                                             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);
 
     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,
+                       wxT("Simulate &indeterminate job"));

     sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
 
     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
     sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
 
     // right pane


@@ -234,10 +260,7 @@ GaugeWidgetsPage::GaugeWidgetsPage(wxNotebook *notebook,
     // final initializations
     Reset();
 
     // final initializations
     Reset();
 

-    SetAutoLayout(TRUE);

     SetSizer(sizerTop);
     SetSizer(sizerTop);

-
-    sizerTop->Fit(this);

 }
 
 GaugeWidgetsPage::~GaugeWidgetsPage()
 }
 
 GaugeWidgetsPage::~GaugeWidgetsPage()


@@ -251,13 +274,13 @@ GaugeWidgetsPage::~GaugeWidgetsPage()
 
 void GaugeWidgetsPage::Reset()
 {
 
 void GaugeWidgetsPage::Reset()
 {

-    m_chkVert->SetValue(FALSE);
-    m_chkSmooth->SetValue(FALSE);
+    m_chkVert->SetValue(false);
+    m_chkSmooth->SetValue(false);

 }
 
 void GaugeWidgetsPage::CreateGauge()
 {
 }
 
 void GaugeWidgetsPage::CreateGauge()
 {

-    int flags = 0;
+    int flags = ms_defaultFlags;

 
     if ( m_chkVert->GetValue() )
         flags |= wxGA_VERTICAL;
 
     if ( m_chkVert->GetValue() )
         flags |= wxGA_VERTICAL;


@@ -289,6 +312,45 @@ void GaugeWidgetsPage::CreateGauge()
     m_sizerGauge->Layout();
 }
 
     m_sizerGauge->Layout();
 }
 

+void GaugeWidgetsPage::StartTimer(wxButton *clicked)
+{
+    static const int INTERVAL = 300;
+
+    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(wxT("&Stop timer"));
+
+    if (clicked->GetId() == GaugePage_Progress)
+        FindWindow(GaugePage_IndeterminateProgress)->Disable();
+    else
+        FindWindow(GaugePage_Progress)->Disable();
+}
+
+void GaugeWidgetsPage::StopTimer(wxButton *clicked)
+{
+    wxCHECK_RET( m_timer, wxT("shouldn't be called") );
+
+    m_timer->Stop();
+    wxDELETE(m_timer);
+
+    if (clicked->GetId() == GaugePage_Progress)
+    {
+        clicked->SetLabel(wxT("Simulate &progress"));
+        FindWindow(GaugePage_IndeterminateProgress)->Enable();
+    }
+    else
+    {
+        clicked->SetLabel(wxT("Simulate indeterminate job"));
+        FindWindow(GaugePage_Progress)->Enable();
+    }
+
+    wxLogMessage(wxT("Progress finished."));
+}
+

 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------


@@ -302,23 +364,33 @@ void GaugeWidgetsPage::OnButtonReset(wxCommandEvent& WXUNUSED(event))
 
 void GaugeWidgetsPage::OnButtonProgress(wxCommandEvent& event)
 {
 
 void GaugeWidgetsPage::OnButtonProgress(wxCommandEvent& event)
 {

+    wxButton *b = (wxButton *)event.GetEventObject();

     if ( !m_timer )
     {
     if ( !m_timer )
     {

-        static const int INTERVAL = 300;
-
-        wxLogMessage(_T("Launched progress timer (interval = %d ms)"), INTERVAL);
+        StartTimer(b);
+    }
+    else // stop the running timer
+    {
+        StopTimer(b);

 
 

-        m_timer = new wxTimer(this, GaugePage_Timer);
-        m_timer->Start(INTERVAL);
+        wxLogMessage(wxT("Stopped the timer."));
+    }
+}

 
 

-        wxButton *btn = (wxButton *)event.GetEventObject();
-        btn->SetLabel(_T("&Stop timer"));
+void GaugeWidgetsPage::OnButtonIndeterminateProgress(wxCommandEvent& event)
+{
+    wxButton *b = (wxButton *)event.GetEventObject();
+    if ( !m_timer )
+    {
+        StartTimer(b);

     }
     else // stop the running timer
     {
     }
     else // stop the running timer
     {

-        StopTimer();
+        StopTimer(b);
+
+        m_gauge->SetValue(0);

 
 

-        wxLogMessage(_T("Stopped the timer."));
+        wxLogMessage(wxT("Stopped the timer."));

     }
 }
 
     }
 }
 


@@ -333,6 +405,7 @@ void GaugeWidgetsPage::OnButtonSetRange(wxCommandEvent& WXUNUSED(event))
     if ( !m_textRange->GetValue().ToULong(&val) )
         return;
 
     if ( !m_textRange->GetValue().ToULong(&val) )
         return;
 

+    m_range = val;

     m_gauge->SetRange(val);
 }
 
     m_gauge->SetRange(val);
 }
 


@@ -376,29 +449,21 @@ void GaugeWidgetsPage::OnProgressTimer(wxTimerEvent& WXUNUSED(event))
     }
     else // reached the end
     {
     }
     else // reached the end
     {

-        StopTimer();
+        wxButton *btn = (wxButton *)FindWindow(GaugePage_Progress);
+        wxCHECK_RET( btn, wxT("no progress button?") );
+
+        StopTimer(btn);

     }
 }
 
     }
 }
 

-void GaugeWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)
+void GaugeWidgetsPage::OnIndeterminateProgressTimer(wxTimerEvent& WXUNUSED(event))

 {
 {

-    event.SetText( wxString::Format(_T("%d"), m_gauge->GetValue()));
+    m_gauge->Pulse();

 }
 
 }
 

-void GaugeWidgetsPage::StopTimer()
+void GaugeWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)

 {
 {

-    wxCHECK_RET( m_timer, _T("shouldn't be called") );
-
-    m_timer->Stop();
-    delete m_timer;
-    m_timer = NULL;
-
-    wxButton *btn = (wxButton *)FindWindow(GaugePage_Progress);
-    wxCHECK_RET( btn, _T("no progress button?") );
-
-    btn->SetLabel(_T("Simulate &progress"));
-
-    wxLogMessage(_T("Progress finished."));
+    event.SetText( wxString::Format(wxT("%d"), m_gauge->GetValue()));

 }
 
 #endif
 }
 
 #endif