Added SWIG patches to allow compiling the generated code with

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

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index 2e9e212b6ebcf4e5090a96792abcafcc14e8a739..580de98986129efad3b9102676a48d4a8aec5f2f 100644 (file)
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -39,13 +34,25 @@
     #include "wx/menu.h"
     #include "wx/layout.h"
     #include "wx/msgdlg.h"
     #include "wx/menu.h"
     #include "wx/layout.h"
     #include "wx/msgdlg.h"

+    #include "wx/icon.h"

 #endif
 
 #include "wx/sizer.h"
 #include "wx/textctrl.h"
 
 #include "wx/calctrl.h"
 #endif
 
 #include "wx/sizer.h"
 #include "wx/textctrl.h"
 
 #include "wx/calctrl.h"

-#include "wx/datectrl.h"
+#include "wx/settings.h"
+
+#if wxUSE_DATEPICKCTRL
+    #include "wx/datectrl.h"
+    #if wxUSE_DATEPICKCTRL_GENERIC
+        #include "wx/generic/datectrl.h"
+    #endif // wxUSE_DATEPICKCTRL_GENERIC
+#endif // wxUSE_DATEPICKCTRL
+
+#include "../sample.xpm"
+
+#define USE_SIZABLE_CALENDAR 0

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -84,7 +91,7 @@ public:
 
     void SetDate();
     void Today();
 
     void SetDate();
     void Today();

-    
+

 private:
     wxCalendarCtrl *m_calendar;
     wxStaticText   *m_date;
 private:
     wxCalendarCtrl *m_calendar;
     wxStaticText   *m_date;


@@ -97,7 +104,7 @@ class MyFrame : public wxFrame
 {
 public:
     // ctor(s)
 {
 public:
     // ctor(s)

-    MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+    MyFrame(const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize);

 
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
 
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);


@@ -135,7 +142,7 @@ private:
 class MyDialog : public wxDialog
 {
 public:
 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(); }
 
 
     wxDateTime GetDate() const { return m_datePicker->GetValue(); }
 


@@ -143,7 +150,7 @@ private:
     void OnDateChange(wxDateEvent& event);
 
 
     void OnDateChange(wxDateEvent& event);
 
 

-    wxDatePickerCtrl *m_datePicker;
+    wxDatePickerCtrlBase *m_datePicker;

     wxTextCtrl *m_text;
 
 
     wxTextCtrl *m_text;
 
 


@@ -162,9 +169,6 @@ enum
     // menu items
     Calendar_File_About = wxID_ABOUT,
     Calendar_File_Quit = wxID_EXIT,
     // menu items
     Calendar_File_About = wxID_ABOUT,
     Calendar_File_Quit = wxID_EXIT,

-#if wxUSE_DATEPICKCTRL
-    Calendar_File_AskDate = 100,
-#endif // wxUSE_DATEPICKCTRL

     Calendar_Cal_Monday = 200,
     Calendar_Cal_Holidays,
     Calendar_Cal_Special,
     Calendar_Cal_Monday = 200,
     Calendar_Cal_Holidays,
     Calendar_Cal_Special,


@@ -174,6 +178,15 @@ enum
     Calendar_Cal_SurroundWeeks,
     Calendar_Cal_SetDate,
     Calendar_Cal_Today,
     Calendar_Cal_SurroundWeeks,
     Calendar_Cal_SetDate,
     Calendar_Cal_Today,

+#if wxUSE_DATEPICKCTRL
+    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
 };
 
     Calendar_CalCtrl = 1000
 };
 


@@ -189,7 +202,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Calendar_File_About, MyFrame::OnAbout)
 
 #if wxUSE_DATEPICKCTRL
     EVT_MENU(Calendar_File_About, MyFrame::OnAbout)
 
 #if wxUSE_DATEPICKCTRL

-    EVT_MENU(Calendar_File_AskDate, MyFrame::OnAskDate)
+    EVT_MENU(Calendar_DatePicker_AskDate, MyFrame::OnAskDate)

 #endif // wxUSE_DATEPICKCTRL
 
     EVT_MENU(Calendar_Cal_Monday, MyFrame::OnCalMonday)
 #endif // wxUSE_DATEPICKCTRL
 
     EVT_MENU(Calendar_Cal_Monday, MyFrame::OnCalMonday)


@@ -244,8 +257,11 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main application window
 bool MyApp::OnInit()
 {
     // Create the main application window

-    MyFrame *frame = new MyFrame(_T("Calendar wxWidgets sample"),
-                                 wxPoint(50, 50), wxSize(450, 340));
+    MyFrame *frame = new MyFrame(_T("Calendar wxWidgets sample")
+#ifndef __WXWINCE__
+                                 ,wxPoint(50, 50), wxSize(450, 340)
+#endif
+                                                                );

 
     frame->Show(true);
 
 
     frame->Show(true);
 


@@ -263,14 +279,11 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
 {
 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_xpm));
+

     // create a menu bar
     wxMenu *menuFile = new wxMenu;
     // create a menu bar
     wxMenu *menuFile = new wxMenu;

-
-#if wxUSE_DATEPICKCTRL
-    menuFile->Append(Calendar_File_AskDate, _T("&Choose date...\tCtrl-D"), _T("Show dialog with wxDatePickerCtrl"));
-    menuFile->AppendSeparator();
-#endif // wxUSE_DATEPICKCTRL
-

     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"));
     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"));


@@ -305,16 +318,39 @@ 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."));
 
     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"));
+    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
+

     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append(menuFile, _T("&File"));
     menuBar->Append(menuCal, _T("&Calendar"));
     // 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);
 
 
     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);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 


@@ -405,21 +441,36 @@ void MyFrame::OnToday(wxCommandEvent &WXUNUSED(event))
 
 void MyFrame::OnAskDate(wxCommandEvent& WXUNUSED(event))
 {
 
 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;
+    if ( GetMenuBar()->IsChecked(Calendar_DatePicker_AllowNone) )
+        style |= wxDP_ALLOWNONE;
+
+    MyDialog dlg(this, m_panel->GetCal()->GetDate(), style);

     if ( dlg.ShowModal() == wxID_OK )
     {
     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();

 
 

-        m_panel->GetCal()->SetDate(dt);
+            if ( dt.GetDay() == today.GetDay() &&
+                    dt.GetMonth() == today.GetMonth() )
+            {
+                wxMessageBox(_T("Happy birthday!"), _T("Calendar Sample"));
+            }

 
 

-        wxLogStatus(_T("Changed the date to your birthday"));
+            m_panel->GetCal()->SetDate(dt);
+
+            wxLogStatus(_T("Changed the date to your input"));
+        }
+        else
+        {
+            wxLogStatus(_T("No date entered"));
+        }

     }
 }
 
     }
 }
 


@@ -444,11 +495,21 @@ MyPanel::MyPanel(wxFrame *frame)
                                     wxCAL_SHOW_HOLIDAYS |
                                     wxRAISED_BORDER);
 
                                     wxCAL_SHOW_HOLIDAYS |
                                     wxRAISED_BORDER);
 

-    wxBoxSizer *m_sizer = new wxBoxSizer( wxHORIZONTAL );
+#if USE_SIZABLE_CALENDAR
+    wxCalendarCtrl *sizableCalendar = new wxCalendarCtrl(this, wxID_ANY);
+#endif
+
+    // adjust to vertical/horizontal display, check mostly dedicated to WinCE
+    bool horizontal = ( wxSystemSettings::GetMetric(wxSYS_SCREEN_X) > wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) );
+    wxBoxSizer *m_sizer = new wxBoxSizer( horizontal ? wxHORIZONTAL : wxVERTICAL );

 
     m_sizer->Add(m_date, 0, wxALIGN_CENTER | wxALL, 10 );
     m_sizer->Add(m_calendar, 0, wxALIGN_CENTER | wxALIGN_LEFT);
 
 
     m_sizer->Add(m_date, 0, wxALIGN_CENTER | wxALL, 10 );
     m_sizer->Add(m_calendar, 0, wxALIGN_CENTER | wxALIGN_LEFT);
 

+#if USE_SIZABLE_CALENDAR
+    m_sizer->Add(sizableCalendar, 1, wxEXPAND);
+#endif
+

     SetSizer( m_sizer );
     m_sizer->SetSizeHints( this );
 }
     SetSizer( m_sizer );
     m_sizer->SetSizeHints( this );
 }


@@ -536,29 +597,41 @@ void MyPanel::Today()
 
 #if wxUSE_DATEPICKCTRL
 
 
 #if wxUSE_DATEPICKCTRL
 

-MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt)
-        : wxDialog(parent, -1, wxString(_T("Calendar: Choose a date")))
+MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
+        : 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));
 {
     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);
 
     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
                       (
 
     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());
 
                         _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),
                             wxDefaultDateTime);
     sizerTop->Add(m_datePicker, wxSizerFlags().Expand().Border());
     m_datePicker->SetRange(wxDateTime(1, wxDateTime::Jan, 1900),
                             wxDefaultDateTime);
     sizerTop->Add(m_datePicker, wxSizerFlags().Expand().Border());


@@ -574,8 +647,11 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt)
 
 void MyDialog::OnDateChange(wxDateEvent& event)
 {
 
 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
 }
 
 #endif // wxUSE_DATEPICKCTRL

-