more wxFD_XXX renamings (patch 1488371)

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

diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index 499a0037b6e7e24b2670d878071fe450543ec9fd..05c13669092853523c59821707015315528d1710 100644 (file)
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -51,7 +51,7 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    StaticPage_Reset = 100,
+    StaticPage_Reset = wxID_HIGHEST,

     StaticPage_BoxText,
     StaticPage_LabelText
 };
     StaticPage_BoxText,
     StaticPage_LabelText
 };


@@ -139,7 +139,7 @@ END_EVENT_TABLE()
 class StaticWidgetsPage : public WidgetsPage
 {
 public:
 class StaticWidgetsPage : public WidgetsPage
 {
 public:

-    StaticWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
+    StaticWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);

     virtual ~StaticWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_statText; }
     virtual ~StaticWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_statText; }


@@ -204,14 +204,14 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(StaticWidgetsPage, _T("Static"));
+IMPLEMENT_WIDGETS_PAGE(StaticWidgetsPage, _T("Static"),
+                       (int)wxPlatform(GENERIC_CTRLS).If(wxMSW,NATIVE_CTRLS)
+                       );

 
 

-StaticWidgetsPage::StaticWidgetsPage(wxBookCtrlBase *book,
+StaticWidgetsPage::StaticWidgetsPage(WidgetsBookCtrl *book,

                                      wxImageList *imaglist)
                                      wxImageList *imaglist)

-                  : WidgetsPage(book)
+                  : WidgetsPage(book, imaglist, statbox_xpm)

 {
 {

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

     // init everything
     m_chkVert =
     m_chkAutoResize = (wxCheckBox *)NULL;
     // init everything
     m_chkVert =
     m_chkAutoResize = (wxCheckBox *)NULL;