make sure virtual method isn't inlined away

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

diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp
index a774835921f2b529d96273befbaf41b7e3ec52a0..8f8980664604a48807d449fb3a3a001d09aa85d0 100644 (file)
--- a/samples/widgets/spinbtn.cpp
+++ b/samples/widgets/spinbtn.cpp
@@ -42,7 +42,7 @@
 #include "wx/spinctrl.h"
 
 #include "wx/sizer.h"
-
+#include "wx/stattext.h"
 #include "widgets.h"
 
 #include "icons/spinbtn.xpm"
@@ -63,7 +63,8 @@ enum
     SpinBtnPage_MinText,
     SpinBtnPage_MaxText,
     SpinBtnPage_SpinBtn,
-    SpinBtnPage_SpinCtrl
+    SpinBtnPage_SpinCtrl,
+    SpinBtnPage_SpinCtrlDouble
 };
 
 // ----------------------------------------------------------------------------
@@ -78,6 +79,7 @@ public:
 
     virtual wxControl *GetWidget() const { return m_spinbtn; }
     virtual wxControl *GetWidget2() const { return m_spinctrl; }
+    virtual wxControl *GetWidget3() const { return m_spinctrldbl; }
     virtual void RecreateWidget() { CreateSpin(); }
 
     // lazy creation of the content
@@ -96,7 +98,9 @@ protected:
     void OnSpinBtnUp(wxSpinEvent& event);
     void OnSpinBtnDown(wxSpinEvent& event);
     void OnSpinCtrl(wxSpinEvent& event);
+    void OnSpinCtrlDouble(wxSpinDoubleEvent& event);
     void OnSpinText(wxCommandEvent& event);
+    void OnSpinTextEnter(wxCommandEvent& event);
 
     void OnUpdateUIValueButton(wxUpdateUIEvent& event);
     void OnUpdateUIMinMaxButton(wxUpdateUIEvent& event);
@@ -123,11 +127,13 @@ protected:
 
     // the check/radio boxes for styles
     wxCheckBox *m_chkVert,
-               *m_chkWrap;
+               *m_chkWrap,
+               *m_chkProcessEnter;
 
     // the spinbtn and the spinctrl and the sizer containing them
     wxSpinButton *m_spinbtn;
     wxSpinCtrl *m_spinctrl;
+    wxSpinCtrlDouble *m_spinctrldbl;
 
     wxSizer *m_sizerSpin;
 
@@ -161,7 +167,10 @@ BEGIN_EVENT_TABLE(SpinBtnWidgetsPage, WidgetsPage)
     EVT_SPIN_UP(SpinBtnPage_SpinBtn, SpinBtnWidgetsPage::OnSpinBtnUp)
     EVT_SPIN_DOWN(SpinBtnPage_SpinBtn, SpinBtnWidgetsPage::OnSpinBtnDown)
     EVT_SPINCTRL(SpinBtnPage_SpinCtrl, SpinBtnWidgetsPage::OnSpinCtrl)
+    EVT_SPINCTRLDOUBLE(SpinBtnPage_SpinCtrlDouble, SpinBtnWidgetsPage::OnSpinCtrlDouble)
     EVT_TEXT(SpinBtnPage_SpinCtrl, SpinBtnWidgetsPage::OnSpinText)
+    EVT_TEXT_ENTER(SpinBtnPage_SpinCtrl, SpinBtnWidgetsPage::OnSpinTextEnter)
+    EVT_TEXT(SpinBtnPage_SpinCtrlDouble, SpinBtnWidgetsPage::OnSpinText)
 
     EVT_CHECKBOX(wxID_ANY, SpinBtnWidgetsPage::OnCheckOrRadioBox)
     EVT_RADIOBOX(wxID_ANY, SpinBtnWidgetsPage::OnCheckOrRadioBox)
@@ -187,21 +196,18 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(WidgetsBookCtrl *book,
 {
     m_chkVert = NULL;
     m_chkWrap = NULL;
+    m_chkProcessEnter = NULL;
     m_spinbtn = NULL;
     m_spinctrl = NULL;
+    m_spinctrldbl = NULL;
     m_textValue = NULL;
     m_textMin = NULL;
     m_textMax = NULL;
 
-    // init everything
     m_min = 0;
     m_max = 10;
 
-    m_chkVert =
-    m_chkWrap = (wxCheckBox *)NULL;
-
-    m_spinbtn = (wxSpinButton *)NULL;
-    m_sizerSpin = (wxSizer *)NULL;
+    m_sizerSpin = NULL;
 }
 
 void SpinBtnWidgetsPage::CreateContent()
@@ -214,6 +220,8 @@ void SpinBtnWidgetsPage::CreateContent()
 
     m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical"));
     m_chkWrap = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Wrap"));
+    m_chkProcessEnter = CreateCheckBoxAndAddToSizer(sizerLeft,
+                                                    _T("Process &Enter"));
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 
@@ -278,6 +286,7 @@ void SpinBtnWidgetsPage::Reset()
 {
     m_chkVert->SetValue(true);
     m_chkWrap->SetValue(false);
+    m_chkProcessEnter->SetValue(false);
 }
 
 void SpinBtnWidgetsPage::CreateSpin()
@@ -293,6 +302,9 @@ void SpinBtnWidgetsPage::CreateSpin()
     if ( m_chkWrap->GetValue() )
         flags |= wxSP_WRAP;
 
+    if ( m_chkProcessEnter->GetValue() )
+        flags |= wxTE_PROCESS_ENTER;
+
     int val = m_min;
     if ( m_spinbtn )
     {
@@ -302,16 +314,7 @@ void SpinBtnWidgetsPage::CreateSpin()
             val = valOld;
         }
 
-        m_sizerSpin->Detach( m_spinbtn );
-        m_sizerSpin->Detach( m_spinctrl );
-
-        // there are 3 spacers left
-        m_sizerSpin->Remove( 0 );
-        m_sizerSpin->Remove( 0 );
-        m_sizerSpin->Remove( 0 );
-
-        delete m_spinbtn;
-        delete m_spinctrl;
+        m_sizerSpin->Clear(true /* delete windows */);
     }
 
     m_spinbtn = new wxSpinButton(this, SpinBtnPage_SpinBtn,
@@ -327,11 +330,26 @@ void SpinBtnWidgetsPage::CreateSpin()
                                 flags,
                                 m_min, m_max, val);
 
+    m_spinctrldbl = new wxSpinCtrlDouble(this, SpinBtnPage_SpinCtrlDouble,
+                                         wxString::Format(_T("%d"), val),
+                                         wxDefaultPosition, wxDefaultSize,
+                                         flags,
+                                         m_min, m_max, val, 0.1);
+
+    // Add spacers, labels and spin controls to the sizer.
     m_sizerSpin->Add(0, 0, 1);
+    m_sizerSpin->Add(new wxStaticText(this, wxID_ANY, wxT("wxSpinButton")),
+                     0, wxALIGN_CENTRE | wxALL, 5);
     m_sizerSpin->Add(m_spinbtn, 0, wxALIGN_CENTRE | wxALL, 5);
     m_sizerSpin->Add(0, 0, 1);
+    m_sizerSpin->Add(new wxStaticText(this, wxID_ANY, wxT("wxSpinCtrl")),
+                     0, wxALIGN_CENTRE | wxALL, 5);
     m_sizerSpin->Add(m_spinctrl, 0, wxALIGN_CENTRE | wxALL, 5);
     m_sizerSpin->Add(0, 0, 1);
+    m_sizerSpin->Add(new wxStaticText(this, wxID_ANY, wxT("wxSpinCtrlDouble")),
+                     0, wxALIGN_CENTRE | wxALL, 5);
+    m_sizerSpin->Add(m_spinctrldbl, 0, wxALIGN_CENTRE | wxALL, 5);
+    m_sizerSpin->Add(0, 0, 1);
 
     m_sizerSpin->Layout();
 }
@@ -365,6 +383,7 @@ void SpinBtnWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event))
 
     m_spinbtn->SetRange(minNew, maxNew);
     m_spinctrl->SetRange(minNew, maxNew);
+    m_spinctrldbl->SetRange(minNew, maxNew);
 }
 
 void SpinBtnWidgetsPage::OnButtonSetValue(wxCommandEvent& WXUNUSED(event))
@@ -379,6 +398,7 @@ void SpinBtnWidgetsPage::OnButtonSetValue(wxCommandEvent& WXUNUSED(event))
 
     m_spinbtn->SetValue(val);
     m_spinctrl->SetValue(val);
+    m_spinctrldbl->SetValue(val);
 }
 
 void SpinBtnWidgetsPage::OnUpdateUIValueButton(wxUpdateUIEvent& event)
@@ -397,7 +417,9 @@ void SpinBtnWidgetsPage::OnUpdateUIMinMaxButton(wxUpdateUIEvent& event)
 
 void SpinBtnWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
 {
-    event.Enable( !m_chkVert->GetValue() || m_chkWrap->GetValue() );
+    event.Enable( !m_chkVert->GetValue() ||
+                  m_chkWrap->GetValue() ||
+                  m_chkProcessEnter->GetValue() );
 }
 
 void SpinBtnWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
@@ -442,10 +464,23 @@ void SpinBtnWidgetsPage::OnSpinCtrl(wxSpinEvent& event)
     wxLogMessage(_T("Spin control value changed, now %d"), value);
 }
 
+void SpinBtnWidgetsPage::OnSpinCtrlDouble(wxSpinDoubleEvent& event)
+{
+    double value = event.GetValue();
+
+    wxLogMessage(_T("Spin control value changed, now %g"), value);
+}
+
 void SpinBtnWidgetsPage::OnSpinText(wxCommandEvent& event)
 {
     wxLogMessage(_T("Text changed in spin control, now \"%s\""),
                  event.GetString().c_str());
 }
 
+void SpinBtnWidgetsPage::OnSpinTextEnter(wxCommandEvent& event)
+{
+    wxLogMessage("\"Enter\" pressed in spin control, text is \"%s\"",
+                 event.GetString());
+}
+
 #endif // wxUSE_SPINBTN