Patch [ 1114647 ] Mouse wheel support for wxVScrolledWindow

[wxWidgets.git] / samples / calendar / calendar.cpp

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index feca04fb439377420d6d5b9deb8449a86362ada3..737db453959837d1f9ba7e56eeaed7d5c8f5e0a7 100644 (file)
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -45,9 +45,13 @@
 #include "wx/textctrl.h"
 
 #include "wx/calctrl.h"
-#include "wx/datectrl.h"
 
-#define wxUSE_DATEPICKERCTRL 1
+#if wxUSE_DATEPICKCTRL
+    #include "wx/datectrl.h"
+    #if wxUSE_DATEPICKCTRL_GENERIC
+        #include "wx/generic/datectrl.h"
+    #endif // wxUSE_DATEPICKCTRL_GENERIC
+#endif // wxUSE_DATEPICKCTRL
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -105,9 +109,9 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
-#if wxUSE_DATEPICKERCTRL
+#if wxUSE_DATEPICKCTRL
     void OnAskDate(wxCommandEvent& event);
-#endif // wxUSE_DATEPICKERCTRL
+#endif // wxUSE_DATEPICKCTRL
 
     void OnCalMonday(wxCommandEvent& event);
     void OnCalHolidays(wxCommandEvent& event);
@@ -131,13 +135,13 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#if wxUSE_DATEPICKERCTRL
+#if wxUSE_DATEPICKCTRL
 
 // Define a simple modal dialog which asks the user for a date
 class MyDialog : public wxDialog
 {
 public:
-    MyDialog(wxWindow *parent, const wxDateTime& dt);
+    MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle);
 
     wxDateTime GetDate() const { return m_datePicker->GetValue(); }
 
@@ -145,14 +149,14 @@ private:
     void OnDateChange(wxDateEvent& event);
 
 
-    wxDatePickerCtrl *m_datePicker;
+    wxDatePickerCtrlBase *m_datePicker;
     wxTextCtrl *m_text;
 
 
     DECLARE_EVENT_TABLE()
 };
 
-#endif // wxUSE_DATEPICKERCTRL
+#endif // wxUSE_DATEPICKCTRL
 
 // ----------------------------------------------------------------------------
 // constants
@@ -164,9 +168,6 @@ enum
     // menu items
     Calendar_File_About = wxID_ABOUT,
     Calendar_File_Quit = wxID_EXIT,
-#if wxUSE_DATEPICKERCTRL
-    Calendar_File_AskDate = 100,
-#endif // wxUSE_DATEPICKERCTRL
     Calendar_Cal_Monday = 200,
     Calendar_Cal_Holidays,
     Calendar_Cal_Special,
@@ -176,6 +177,14 @@ enum
     Calendar_Cal_SurroundWeeks,
     Calendar_Cal_SetDate,
     Calendar_Cal_Today,
+#if wxUSE_DATEPICKCTRL
+    Calendar_DatePicker_AskDate = 300,
+    Calendar_DatePicker_ShowCentury,
+    Calendar_DatePicker_DropDown,
+#if wxUSE_DATEPICKCTRL_GENERIC
+    Calendar_DatePicker_Generic,
+#endif // wxUSE_DATEPICKCTRL_GENERIC
+#endif // wxUSE_DATEPICKCTRL
     Calendar_CalCtrl = 1000
 };
 
@@ -190,9 +199,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Calendar_File_Quit,  MyFrame::OnQuit)
     EVT_MENU(Calendar_File_About, MyFrame::OnAbout)
 
-#if wxUSE_DATEPICKERCTRL
-    EVT_MENU(Calendar_File_AskDate, MyFrame::OnAskDate)
-#endif // wxUSE_DATEPICKERCTRL
+#if wxUSE_DATEPICKCTRL
+    EVT_MENU(Calendar_DatePicker_AskDate, MyFrame::OnAskDate)
+#endif // wxUSE_DATEPICKCTRL
 
     EVT_MENU(Calendar_Cal_Monday, MyFrame::OnCalMonday)
     EVT_MENU(Calendar_Cal_Holidays, MyFrame::OnCalHolidays)
@@ -219,13 +228,13 @@ BEGIN_EVENT_TABLE(MyPanel, wxPanel)
     EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick)
 END_EVENT_TABLE()
 
-#if wxUSE_DATEPICKERCTRL
+#if wxUSE_DATEPICKCTRL
 
 BEGIN_EVENT_TABLE(MyDialog, wxDialog)
     EVT_DATE_CHANGED(wxID_ANY, MyDialog::OnDateChange)
 END_EVENT_TABLE()
 
-#endif // wxUSE_DATEPICKERCTRL
+#endif // wxUSE_DATEPICKCTRL
 
 // Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
@@ -267,12 +276,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 {
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
-
-#if wxUSE_DATEPICKERCTRL
-    menuFile->Append(Calendar_File_AskDate, _T("&Choose date...\tCtrl-D"), _T("Show dialog with wxDatePickerCtrl"));
-    menuFile->AppendSeparator();
-#endif // wxUSE_DATEPICKERCTRL
-
     menuFile->Append(Calendar_File_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
     menuFile->AppendSeparator();
     menuFile->Append(Calendar_File_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
@@ -307,16 +310,37 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuCal->Append(Calendar_Cal_SetDate, _T("SetDate()"), _T("Set date to 2005-12-24."));
     menuCal->Append(Calendar_Cal_Today, _T("Today()"), _T("Set the current date."));
 
+#if wxUSE_DATEPICKCTRL
+    wxMenu *menuDate = new wxMenu;
+    menuDate->AppendCheckItem(Calendar_DatePicker_ShowCentury,
+                              _T("Al&ways show century"));
+    menuDate->AppendCheckItem(Calendar_DatePicker_DropDown,
+                              _T("Use &drop down control"));
+#if wxUSE_DATEPICKCTRL_GENERIC
+    menuDate->AppendCheckItem(Calendar_DatePicker_Generic,
+                              _T("Use &generic version of the control"));
+#endif // wxUSE_DATEPICKCTRL_GENERIC
+    menuDate->AppendSeparator();
+    menuDate->Append(Calendar_DatePicker_AskDate, _T("&Choose date...\tCtrl-D"), _T("Show dialog with wxDatePickerCtrl"));
+#endif // wxUSE_DATEPICKCTRL
+
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append(menuFile, _T("&File"));
     menuBar->Append(menuCal, _T("&Calendar"));
+#if wxUSE_DATEPICKCTRL
+    menuBar->Append(menuDate, _T("&Date picker"));
+#endif // wxUSE_DATEPICKCTRL
 
     menuBar->Check(Calendar_Cal_Monday, true);
     menuBar->Check(Calendar_Cal_Holidays, true);
     menuBar->Check(Calendar_Cal_Month, true);
     menuBar->Check(Calendar_Cal_Year, true);
 
+#if wxUSE_DATEPICKCTRL
+    menuBar->Check(Calendar_DatePicker_ShowCentury, true);
+#endif // wxUSE_DATEPICKCTRL
+
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
@@ -403,11 +427,17 @@ void MyFrame::OnToday(wxCommandEvent &WXUNUSED(event))
     m_panel->Today();
 }
 
-#if wxUSE_DATEPICKERCTRL
+#if wxUSE_DATEPICKCTRL
 
 void MyFrame::OnAskDate(wxCommandEvent& WXUNUSED(event))
 {
-    MyDialog dlg(this, m_panel->GetCal()->GetDate());
+    int style = wxDP_DEFAULT;
+    if ( GetMenuBar()->IsChecked(Calendar_DatePicker_ShowCentury) )
+        style |= wxDP_SHOWCENTURY;
+    if ( GetMenuBar()->IsChecked(Calendar_DatePicker_DropDown) )
+        style |= wxDP_DROPDOWN;
+
+    MyDialog dlg(this, m_panel->GetCal()->GetDate(), style);
     if ( dlg.ShowModal() == wxID_OK )
     {
         const wxDateTime dt = dlg.GetDate(),
@@ -425,7 +455,7 @@ void MyFrame::OnAskDate(wxCommandEvent& WXUNUSED(event))
     }
 }
 
-#endif // wxUSE_DATEPICKERCTRL
+#endif // wxUSE_DATEPICKCTRL
 
 // ----------------------------------------------------------------------------
 // MyPanel
@@ -536,9 +566,9 @@ void MyPanel::Today()
 // MyDialog
 // ----------------------------------------------------------------------------
 
-#if wxUSE_DATEPICKERCTRL
+#if wxUSE_DATEPICKCTRL
 
-MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt)
+MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
         : wxDialog(parent, -1, wxString(_T("Calendar: Choose a date")))
 {
     wxStdDialogButtonSizer *sizerBtns = new wxStdDialogButtonSizer;
@@ -560,7 +590,18 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt)
                       ),
                     wxSizerFlags().Border());
 
-    m_datePicker = new wxDatePickerCtrl(this, -1, dt);
+#if wxUSE_DATEPICKCTRL_GENERIC
+    wxFrame *frame = (wxFrame *)wxGetTopLevelParent(parent);
+    if ( frame && frame->GetMenuBar()->IsChecked(Calendar_DatePicker_Generic) )
+        m_datePicker = new wxDatePickerCtrlGeneric(this, -1, dt,
+                                                   wxDefaultPosition,
+                                                   wxDefaultSize,
+                                                   dtpStyle);
+    else
+#endif // wxUSE_DATEPICKCTRL_GENERIC
+    m_datePicker = new wxDatePickerCtrl(this, -1, dt,
+                                        wxDefaultPosition, wxDefaultSize,
+                                        dtpStyle);
     m_datePicker->SetRange(wxDateTime(1, wxDateTime::Jan, 1900),
                             wxDefaultDateTime);
     sizerTop->Add(m_datePicker, wxSizerFlags().Expand().Border());
@@ -579,5 +620,5 @@ void MyDialog::OnDateChange(wxDateEvent& event)
     m_text->SetValue(event.GetDate().FormatISODate());
 }
 
-#endif // wxUSE_DATEPICKERCTRL
+#endif // wxUSE_DATEPICKCTRL