Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t

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

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index 43056de2e39381cd440c3d5fa25614add076e954..af492450ce004c83e0e4be01308783a259c2fc25 100644 (file)
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation "calendar.cpp"
-    #pragma interface "calendar.cpp"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -45,7 +40,19 @@
 #include "wx/textctrl.h"
 
 #include "wx/calctrl.h"
-#include "wx/datectrl.h"
+
+#if wxUSE_DATEPICKCTRL
+    #include "wx/datectrl.h"
+    #if wxUSE_DATEPICKCTRL_GENERIC
+        #include "wx/generic/datectrl.h"
+    #endif // wxUSE_DATEPICKCTRL_GENERIC
+#endif // wxUSE_DATEPICKCTRL
+
+// the application icon (under Windows and OS/2 it is in resources and even
+// though we could still include the XPM here it would be unused)
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+#endif
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -84,7 +91,7 @@ public:
 
     void SetDate();
     void Today();
-    
+
 private:
     wxCalendarCtrl *m_calendar;
     wxStaticText   *m_date;
@@ -143,7 +150,7 @@ private:
     void OnDateChange(wxDateEvent& event);
 
 
-    wxDatePickerCtrl *m_datePicker;
+    wxDatePickerCtrlBase *m_datePicker;
     wxTextCtrl *m_text;
 
 
@@ -175,6 +182,10 @@ enum
     Calendar_DatePicker_AskDate = 300,
     Calendar_DatePicker_ShowCentury,
     Calendar_DatePicker_DropDown,
+    Calendar_DatePicker_AllowNone,
+#if wxUSE_DATEPICKCTRL_GENERIC
+    Calendar_DatePicker_Generic,
+#endif // wxUSE_DATEPICKCTRL_GENERIC
 #endif // wxUSE_DATEPICKCTRL
     Calendar_CalCtrl = 1000
 };
@@ -265,6 +276,9 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
 {
+    // set the frame icon
+    SetIcon(wxICON(sample));
+
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
     menuFile->Append(Calendar_File_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
@@ -307,6 +321,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
                               _T("Al&ways show century"));
     menuDate->AppendCheckItem(Calendar_DatePicker_DropDown,
                               _T("Use &drop down control"));
+    menuDate->AppendCheckItem(Calendar_DatePicker_AllowNone,
+                              _T("Allow &no date"));
+#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
@@ -423,22 +443,31 @@ void MyFrame::OnAskDate(wxCommandEvent& WXUNUSED(event))
         style |= wxDP_SHOWCENTURY;
     if ( GetMenuBar()->IsChecked(Calendar_DatePicker_DropDown) )
         style |= wxDP_DROPDOWN;
+    if ( GetMenuBar()->IsChecked(Calendar_DatePicker_AllowNone) )
+        style |= wxDP_ALLOWNONE;
 
     MyDialog dlg(this, m_panel->GetCal()->GetDate(), style);
     if ( dlg.ShowModal() == wxID_OK )
     {
-        const wxDateTime dt = dlg.GetDate(),
-                         today = wxDateTime::Today();
-
-        if ( dt.GetDay() == today.GetDay() &&
-                dt.GetMonth() == today.GetMonth() )
+        const wxDateTime dt = dlg.GetDate();
+        if ( dt.IsValid() )
         {
-            wxMessageBox(_T("Happy birthday!"), _T("Calendar Sample"));
-        }
+            const wxDateTime today = wxDateTime::Today();
+
+            if ( dt.GetDay() == today.GetDay() &&
+                    dt.GetMonth() == today.GetMonth() )
+            {
+                wxMessageBox(_T("Happy birthday!"), _T("Calendar Sample"));
+            }
 
-        m_panel->GetCal()->SetDate(dt);
+            m_panel->GetCal()->SetDate(dt);
 
-        wxLogStatus(_T("Changed the date to your birthday"));
+            wxLogStatus(_T("Changed the date to your input"));
+        }
+        else
+        {
+            wxLogStatus(_T("No date entered"));
+        }
     }
 }
 
@@ -556,28 +585,38 @@ void MyPanel::Today()
 #if wxUSE_DATEPICKCTRL
 
 MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
-        : wxDialog(parent, -1, wxString(_T("Calendar: Choose a date")))
+        : wxDialog(parent, wxID_ANY, wxString(_T("Calendar: Choose a date")))
 {
     wxStdDialogButtonSizer *sizerBtns = new wxStdDialogButtonSizer;
     sizerBtns->AddButton(new wxButton(this, wxID_OK));
     sizerBtns->AddButton(new wxButton(this, wxID_CANCEL));
-    sizerBtns->Finalise();
+    sizerBtns->Realize();
 
     wxSizer *sizerText = new wxBoxSizer(wxHORIZONTAL);
-    sizerText->Add(new wxStaticText(this, -1, _T("Date in ISO format: ")),
-                    wxSizerFlags().Border());
-    m_text = new wxTextCtrl(this, -1);
-    sizerText->Add(m_text, wxSizerFlags().Expand().Border());
+    sizerText->Add(new wxStaticText(this, wxID_ANY, _T("Date in ISO format: ")),
+                    wxSizerFlags().Border().Align(wxALIGN_CENTRE_VERTICAL));
+    m_text = new wxTextCtrl(this, wxID_ANY);
+    sizerText->Add(m_text, wxSizerFlags().
+                        Expand().Border().Align(wxALIGN_CENTRE_VERTICAL));
 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(new wxStaticText
                       (
-                        this, -1,
+                        this, wxID_ANY,
                         _T("Enter your birthday date (not before 20th century):")
                       ),
                     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, wxID_ANY, dt,
+                                                   wxDefaultPosition,
+                                                   wxDefaultSize,
+                                                   dtpStyle);
+    else
+#endif // wxUSE_DATEPICKCTRL_GENERIC
+    m_datePicker = new wxDatePickerCtrl(this, wxID_ANY, dt,
                                         wxDefaultPosition, wxDefaultSize,
                                         dtpStyle);
     m_datePicker->SetRange(wxDateTime(1, wxDateTime::Jan, 1900),
@@ -595,7 +634,11 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
 
 void MyDialog::OnDateChange(wxDateEvent& event)
 {
-    m_text->SetValue(event.GetDate().FormatISODate());
+    const wxDateTime dt = event.GetDate();
+    if(dt.IsValid())
+        m_text->SetValue(dt.FormatISODate());
+    else
+        m_text->SetValue(wxEmptyString);
 }
 
 #endif // wxUSE_DATEPICKCTRL