bakefile-generated makefiles for the sample

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

diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp
index 0b886d7c88b17db0e490e70e684de396ff4aafe6..a1ea73f112f079261e43266302c368d10bf28639 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
@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_SPINBTN
+
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/log.h"
@@ -42,7 +44,7 @@
 #include "wx/sizer.h"
 
 #include "widgets.h"
-#if wxUSE_SPINBTN
+
 #include "icons/spinbtn.xpm"
 
 // ----------------------------------------------------------------------------
@@ -71,8 +73,12 @@ enum
 class SpinBtnWidgetsPage : public WidgetsPage
 {
 public:
-    SpinBtnWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~SpinBtnWidgetsPage();
+    SpinBtnWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
+    virtual ~SpinBtnWidgetsPage(){};
+
+    virtual wxControl *GetWidget() const { return m_spinbtn; }
+    virtual wxControl *GetWidget2() const { return m_spinctrl; }
+    virtual void RecreateWidget() { CreateSpin(); }
 
 protected:
     // event handlers
@@ -162,9 +168,9 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, _T("Spin"));
 
-SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook,
+SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxBookCtrlBase *book,
                                        wxImageList *imaglist)
-                  : WidgetsPage(notebook)
+                  : WidgetsPage(book)
 {
     m_chkVert = NULL;
     m_chkWrap = NULL;
@@ -251,10 +257,6 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook,
     sizerTop->Fit(this);
 }
 
-SpinBtnWidgetsPage::~SpinBtnWidgetsPage()
-{
-}
-
 // ----------------------------------------------------------------------------
 // operations
 // ----------------------------------------------------------------------------
@@ -267,7 +269,7 @@ void SpinBtnWidgetsPage::Reset()
 
 void SpinBtnWidgetsPage::CreateSpin()
 {
-    int flags = 0;
+    int flags = ms_defaultFlags;
 
     bool isVert = m_chkVert->GetValue();
     if ( isVert )
@@ -407,13 +409,13 @@ void SpinBtnWidgetsPage::OnSpinBtn(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)
 {
-    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() );
 }