more wxFD_XXX renamings (patch 1488371)

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

diff --git a/samples/widgets/gauge.cpp b/samples/widgets/gauge.cpp
index 5c779721cbcbc7b1cd0c39e69e118fb09ad8f88e..f7cd1bb582c17749ff2f5ae9cc7469f7684b6456 100644 (file)
--- a/samples/widgets/gauge.cpp
+++ b/samples/widgets/gauge.cpp
@@ -52,7 +52,7 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    GaugePage_Reset = 100,
+    GaugePage_Reset = wxID_HIGHEST,

     GaugePage_Progress,
     GaugePage_Clear,
     GaugePage_SetValue,
     GaugePage_Progress,
     GaugePage_Clear,
     GaugePage_SetValue,


@@ -157,16 +157,18 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(GaugeWidgetsPage, _T("Gauge"),
-                       (int)wxPlatform(GENERIC_CTRLS).If(wxMSW,NATIVE_CTRLS)
-                       );
+#if defined(__WXUNIVERSAL__)
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#endif
+
+IMPLEMENT_WIDGETS_PAGE(GaugeWidgetsPage, _T("Gauge"), FAMILY_CTRLS );

 
 GaugeWidgetsPage::GaugeWidgetsPage(WidgetsBookCtrl *book,
                                    wxImageList *imaglist)
 
 GaugeWidgetsPage::GaugeWidgetsPage(WidgetsBookCtrl *book,
                                    wxImageList *imaglist)

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

 {
 {

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

     // init everything
     m_range = 100;
 
     // init everything
     m_range = 100;