fixing infinite recursion for rotated text, introduced in cleanup r57915

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

diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp
index 0b886d7c88b17db0e490e70e684de396ff4aafe6..8f8980664604a48807d449fb3a3a001d09aa85d0 100644 (file)
--- a/samples/widgets/spinbtn.cpp
+++ b/samples/widgets/spinbtn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Name:        spinbtn.cpp
 // Purpose:     Part of the widgets sample showing wxSpinButton
 // Author:      Vadim Zeitlin
 // Name:        spinbtn.cpp
 // Purpose:     Part of the widgets sample showing wxSpinButton
 // Author:      Vadim Zeitlin


@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_SPINBTN
+

 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/log.h"


@@ -40,9 +42,9 @@
 #include "wx/spinctrl.h"
 
 #include "wx/sizer.h"
 #include "wx/spinctrl.h"
 
 #include "wx/sizer.h"

-
+#include "wx/stattext.h"

 #include "widgets.h"
 #include "widgets.h"

-#if wxUSE_SPINBTN
+

 #include "icons/spinbtn.xpm"
 
 // ----------------------------------------------------------------------------
 #include "icons/spinbtn.xpm"
 
 // ----------------------------------------------------------------------------


@@ -52,7 +54,7 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    SpinBtnPage_Reset = 100,
+    SpinBtnPage_Reset = wxID_HIGHEST,

     SpinBtnPage_Clear,
     SpinBtnPage_SetValue,
     SpinBtnPage_SetMinAndMax,
     SpinBtnPage_Clear,
     SpinBtnPage_SetValue,
     SpinBtnPage_SetMinAndMax,


@@ -61,7 +63,8 @@ enum
     SpinBtnPage_MinText,
     SpinBtnPage_MaxText,
     SpinBtnPage_SpinBtn,
     SpinBtnPage_MinText,
     SpinBtnPage_MaxText,
     SpinBtnPage_SpinBtn,

-    SpinBtnPage_SpinCtrl
+    SpinBtnPage_SpinCtrl,
+    SpinBtnPage_SpinCtrlDouble

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -71,8 +74,16 @@ enum
 class SpinBtnWidgetsPage : public WidgetsPage
 {
 public:
 class SpinBtnWidgetsPage : public WidgetsPage
 {
 public:

-    SpinBtnWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~SpinBtnWidgetsPage();
+    SpinBtnWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
+    virtual ~SpinBtnWidgetsPage(){};
+
+    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
+    virtual void CreateContent();

 
 protected:
     // event handlers
 
 protected:
     // event handlers


@@ -87,6 +98,9 @@ protected:
     void OnSpinBtnUp(wxSpinEvent& event);
     void OnSpinBtnDown(wxSpinEvent& event);
     void OnSpinCtrl(wxSpinEvent& event);
     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);
 
     void OnUpdateUIValueButton(wxUpdateUIEvent& event);
     void OnUpdateUIMinMaxButton(wxUpdateUIEvent& event);


@@ -113,11 +127,13 @@ protected:
 
     // the check/radio boxes for styles
     wxCheckBox *m_chkVert,
 
     // 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;
 
     // the spinbtn and the spinctrl and the sizer containing them
     wxSpinButton *m_spinbtn;
     wxSpinCtrl *m_spinctrl;

+    wxSpinCtrlDouble *m_spinctrldbl;

 
     wxSizer *m_sizerSpin;
 
 
     wxSizer *m_sizerSpin;
 


@@ -151,6 +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_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)
 
     EVT_CHECKBOX(wxID_ANY, SpinBtnWidgetsPage::OnCheckOrRadioBox)
     EVT_RADIOBOX(wxID_ANY, SpinBtnWidgetsPage::OnCheckOrRadioBox)


@@ -160,31 +180,38 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, _T("Spin"));
+#if defined(__WXUNIVERSAL__)
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#endif
+
+IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, _T("Spin"),
+                       FAMILY_CTRLS | EDITABLE_CTRLS
+                       );

 
 

-SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook,
+SpinBtnWidgetsPage::SpinBtnWidgetsPage(WidgetsBookCtrl *book,

                                        wxImageList *imaglist)
                                        wxImageList *imaglist)

-                  : WidgetsPage(notebook)
+                  : WidgetsPage(book, imaglist, spinbtn_xpm)

 {
     m_chkVert = NULL;
     m_chkWrap = NULL;
 {
     m_chkVert = NULL;
     m_chkWrap = NULL;

+    m_chkProcessEnter = NULL;

     m_spinbtn = NULL;
     m_spinctrl = NULL;
     m_spinbtn = NULL;
     m_spinctrl = NULL;

+    m_spinctrldbl = NULL;

     m_textValue = NULL;
     m_textMin = NULL;
     m_textMax = NULL;
     m_textValue = NULL;
     m_textMin = NULL;
     m_textMax = NULL;

-    imaglist->Add(wxBitmap(spinbtn_xpm));

 
 

-    // init everything

     m_min = 0;
     m_max = 10;
 
     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()
+{

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


@@ -193,6 +220,8 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook,
 
     m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical"));
     m_chkWrap = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Wrap"));
 
     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
 
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 


@@ -247,12 +276,6 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook,
 
     // final initializations
     SetSizer(sizerTop);
 
     // final initializations
     SetSizer(sizerTop);

-
-    sizerTop->Fit(this);
-}
-
-SpinBtnWidgetsPage::~SpinBtnWidgetsPage()
-{

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -263,11 +286,12 @@ void SpinBtnWidgetsPage::Reset()
 {
     m_chkVert->SetValue(true);
     m_chkWrap->SetValue(false);
 {
     m_chkVert->SetValue(true);
     m_chkWrap->SetValue(false);

+    m_chkProcessEnter->SetValue(false);

 }
 
 void SpinBtnWidgetsPage::CreateSpin()
 {
 }
 
 void SpinBtnWidgetsPage::CreateSpin()
 {

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

 
     bool isVert = m_chkVert->GetValue();
     if ( isVert )
 
     bool isVert = m_chkVert->GetValue();
     if ( isVert )


@@ -278,6 +302,9 @@ void SpinBtnWidgetsPage::CreateSpin()
     if ( m_chkWrap->GetValue() )
         flags |= wxSP_WRAP;
 
     if ( m_chkWrap->GetValue() )
         flags |= wxSP_WRAP;
 

+    if ( m_chkProcessEnter->GetValue() )
+        flags |= wxTE_PROCESS_ENTER;
+

     int val = m_min;
     if ( m_spinbtn )
     {
     int val = m_min;
     if ( m_spinbtn )
     {


@@ -287,16 +314,7 @@ void SpinBtnWidgetsPage::CreateSpin()
             val = valOld;
         }
 
             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,
     }
 
     m_spinbtn = new wxSpinButton(this, SpinBtnPage_SpinBtn,


@@ -312,11 +330,26 @@ void SpinBtnWidgetsPage::CreateSpin()
                                 flags,
                                 m_min, m_max, val);
 
                                 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(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(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(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();
 }
 
     m_sizerSpin->Layout();
 }


@@ -338,7 +371,7 @@ void SpinBtnWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event))
          maxNew = 0; // init to suppress compiler warning
     if ( !m_textMin->GetValue().ToLong(&minNew) ||
          !m_textMax->GetValue().ToLong(&maxNew) ||
          maxNew = 0; // init to suppress compiler warning
     if ( !m_textMin->GetValue().ToLong(&minNew) ||
          !m_textMax->GetValue().ToLong(&maxNew) ||

-         minNew >= maxNew )
+         minNew > maxNew )

     {
         wxLogWarning(_T("Invalid min/max values for the spinbtn."));
 
     {
         wxLogWarning(_T("Invalid min/max values for the spinbtn."));
 


@@ -350,6 +383,7 @@ void SpinBtnWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event))
 
     m_spinbtn->SetRange(minNew, maxNew);
     m_spinctrl->SetRange(minNew, maxNew);
 
     m_spinbtn->SetRange(minNew, maxNew);
     m_spinctrl->SetRange(minNew, maxNew);

+    m_spinctrldbl->SetRange(minNew, maxNew);

 }
 
 void SpinBtnWidgetsPage::OnButtonSetValue(wxCommandEvent& WXUNUSED(event))
 }
 
 void SpinBtnWidgetsPage::OnButtonSetValue(wxCommandEvent& WXUNUSED(event))


@@ -364,6 +398,7 @@ void SpinBtnWidgetsPage::OnButtonSetValue(wxCommandEvent& WXUNUSED(event))
 
     m_spinbtn->SetValue(val);
     m_spinctrl->SetValue(val);
 
     m_spinbtn->SetValue(val);
     m_spinctrl->SetValue(val);

+    m_spinctrldbl->SetValue(val);

 }
 
 void SpinBtnWidgetsPage::OnUpdateUIValueButton(wxUpdateUIEvent& event)
 }
 
 void SpinBtnWidgetsPage::OnUpdateUIValueButton(wxUpdateUIEvent& event)


@@ -377,12 +412,14 @@ void SpinBtnWidgetsPage::OnUpdateUIMinMaxButton(wxUpdateUIEvent& event)
     long mn, mx;
     event.Enable( m_textMin->GetValue().ToLong(&mn) &&
                   m_textMax->GetValue().ToLong(&mx) &&
     long mn, mx;
     event.Enable( m_textMin->GetValue().ToLong(&mn) &&
                   m_textMax->GetValue().ToLong(&mx) &&

-                  mn < mx);
+                  mn <= mx);

 }
 
 void SpinBtnWidgetsPage::OnUpdateUIResetButton(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))
 }
 
 void SpinBtnWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))


@@ -407,20 +444,18 @@ void SpinBtnWidgetsPage::OnSpinBtn(wxSpinEvent& event)
 
 void SpinBtnWidgetsPage::OnSpinBtnUp(wxSpinEvent& event)
 {
 
 void SpinBtnWidgetsPage::OnSpinBtnUp(wxSpinEvent& event)
 {

-    wxLogMessage( _T("Spin button value incremented, will be %ld (was %d)"),
+    wxLogMessage( _T("Spin button value incremented, will be %d (was %d)"),

                   event.GetInt(), m_spinbtn->GetValue() );
 }
 
 void SpinBtnWidgetsPage::OnSpinBtnDown(wxSpinEvent& event)
 {
                   event.GetInt(), m_spinbtn->GetValue() );
 }
 
 void SpinBtnWidgetsPage::OnSpinBtnDown(wxSpinEvent& event)
 {

-    wxLogMessage( _T("Spin button value decremented, will be %ld (was %d)"),
+    wxLogMessage( _T("Spin button value decremented, will be %d (was %d)"),

                   event.GetInt(), m_spinbtn->GetValue() );
 }
 
 void SpinBtnWidgetsPage::OnSpinCtrl(wxSpinEvent& event)
 {
                   event.GetInt(), m_spinbtn->GetValue() );
 }
 
 void SpinBtnWidgetsPage::OnSpinCtrl(wxSpinEvent& event)
 {

-    if (!m_spinctrl)
-        return;

     int value = event.GetInt();
 
     wxASSERT_MSG( value == m_spinctrl->GetValue(),
     int value = event.GetInt();
 
     wxASSERT_MSG( value == m_spinctrl->GetValue(),


@@ -428,5 +463,24 @@ void SpinBtnWidgetsPage::OnSpinCtrl(wxSpinEvent& event)
 
     wxLogMessage(_T("Spin control value changed, now %d"), value);
 }
 
     wxLogMessage(_T("Spin control value changed, now %d"), value);
 }

-#endif
-    // wxUSE_SPINBTN
+
+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