X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33cf9a192231cb815d089a9e1d4188a324b762bb..6a1b3ead3fd406e870042014eb7bd117586f4fff:/samples/widgets/spinbtn.cpp?ds=sidebyside

diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp
index a1ea73f112..125d533bf3 100644
--- a/samples/widgets/spinbtn.cpp
+++ b/samples/widgets/spinbtn.cpp
@@ -54,7 +54,7 @@
 // control ids
 enum
 {
-    SpinBtnPage_Reset = 100,
+    SpinBtnPage_Reset = wxID_HIGHEST,
     SpinBtnPage_Clear,
     SpinBtnPage_SetValue,
     SpinBtnPage_SetMinAndMax,
@@ -73,7 +73,7 @@ enum
 class SpinBtnWidgetsPage : public WidgetsPage
 {
 public:
-    SpinBtnWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
+    SpinBtnWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
     virtual ~SpinBtnWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_spinbtn; }
@@ -166,11 +166,19 @@ END_EVENT_TABLE()
 // 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(wxBookCtrlBase *book,
+SpinBtnWidgetsPage::SpinBtnWidgetsPage(WidgetsBookCtrl *book,
                                        wxImageList *imaglist)
-                  : WidgetsPage(book)
+                  : WidgetsPage(book, imaglist, spinbtn_xpm)
 {
     m_chkVert = NULL;
     m_chkWrap = NULL;
@@ -179,7 +187,6 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxBookCtrlBase *book,
     m_textValue = NULL;
     m_textMin = NULL;
     m_textMax = NULL;
-    imaglist->Add(wxBitmap(spinbtn_xpm));
 
     // init everything
     m_min = 0;