Map between int page ids and page pointers using hashes so that it works when

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

diff --git a/samples/widgets/datepick.cpp b/samples/widgets/datepick.cpp
index 89e9173e2ef83c8d6dd37d91e9f15689bbdd0605..9babbf8c0226ceb76e94467407a3b158b1714abb 100644 (file)
--- a/samples/widgets/datepick.cpp
+++ b/samples/widgets/datepick.cpp
@@ -119,9 +119,14 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
+#if defined(__WXMSW__)
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#else
+    #define FAMILY_CTRLS GENERIC_CTRLS
+#endif
+
 IMPLEMENT_WIDGETS_PAGE(DatePickerWidgetsPage, wxT("DatePicker"),
-                       (int)wxPlatform(GENERIC_CTRLS).If(wxMSW,NATIVE_CTRLS)
-                       | PICKER_CTRLS
+                       FAMILY_CTRLS | PICKER_CTRLS
                        );
 
 DatePickerWidgetsPage::DatePickerWidgetsPage(WidgetsBookCtrl *book,
@@ -137,17 +142,17 @@ DatePickerWidgetsPage::DatePickerWidgetsPage(WidgetsBookCtrl *book,
 
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 
-    sizerLeft->Add( CreateSizerWithTextAndLabel( wxT("&Day"), DatePickerPage_Day , &m_day ),
-                    wxALL | wxALIGN_LEFT , 5 );
+    sizerLeft->Add( CreateSizerWithTextAndLabel( wxT("&Day:"), DatePickerPage_Day , &m_day ),
+                    0, wxALL | wxALIGN_RIGHT , 5 );
 
-    sizerLeft->Add( CreateSizerWithTextAndLabel( wxT("&Month"), DatePickerPage_Month , &m_month ),
-                    wxALL | wxALIGN_LEFT , 5 );
+    sizerLeft->Add( CreateSizerWithTextAndLabel( wxT("&Month:"), DatePickerPage_Month , &m_month ),
+                    0, wxALL | wxALIGN_RIGHT , 5 );
 
-    sizerLeft->Add( CreateSizerWithTextAndLabel( wxT("&Year"), DatePickerPage_Year , &m_year ),
-                    wxALL | wxALIGN_LEFT , 5 );
+    sizerLeft->Add( CreateSizerWithTextAndLabel( wxT("&Year:"), DatePickerPage_Year , &m_year ),
+                    0, wxALL | wxALIGN_RIGHT , 5 );
 
     sizerLeft->Add( new wxButton( this, wxID_ANY, wxT("&Set date") ),
-                    wxALL , 5 );
+                    0, wxALL , 5 );
 
     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL);