// 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"
#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"
+#include "wx/settings.h"
#if wxUSE_DATEPICKCTRL
#include "wx/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
+#include "../sample.xpm"
+
+#define USE_SIZABLE_CALENDAR 0
// ----------------------------------------------------------------------------
// private classes
void SetDate();
void Today();
-
+
private:
wxCalendarCtrl *m_calendar;
wxStaticText *m_date;
{
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);
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);
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
{
// set the frame icon
- SetIcon(wxICON(sample));
+ SetIcon(wxIcon(sample_xpm));
// create a menu bar
wxMenu *menuFile = new wxMenu;
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);
+#if USE_SIZABLE_CALENDAR
+ m_sizer->Add(sizableCalendar, 1, wxEXPAND);
+#endif
+
SetSizer( m_sizer );
m_sizer->SetSizeHints( this );
}
#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: ")),
+ sizerText->Add(new wxStaticText(this, wxID_ANY, _T("Date in ISO format: ")),
wxSizerFlags().Border().Align(wxALIGN_CENTRE_VERTICAL));
- m_text = new wxTextCtrl(this, -1);
+ 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());
#if wxUSE_DATEPICKCTRL_GENERIC
wxFrame *frame = (wxFrame *)wxGetTopLevelParent(parent);
if ( frame && frame->GetMenuBar()->IsChecked(Calendar_DatePicker_Generic) )
- m_datePicker = new wxDatePickerCtrlGeneric(this, -1, dt,
+ m_datePicker = new wxDatePickerCtrlGeneric(this, wxID_ANY, dt,
wxDefaultPosition,
wxDefaultSize,
dtpStyle);
else
#endif // wxUSE_DATEPICKCTRL_GENERIC
- m_datePicker = new wxDatePickerCtrl(this, -1, dt,
+ m_datePicker = new wxDatePickerCtrl(this, wxID_ANY, dt,
wxDefaultPosition, wxDefaultSize,
dtpStyle);
m_datePicker->SetRange(wxDateTime(1, wxDateTime::Jan, 1900),
void MyDialog::OnDateChange(wxDateEvent& event)
{
const wxDateTime dt = event.GetDate();
- m_text->SetValue(dt.IsValid()? dt.FormatISODate() : wxString());
+ if(dt.IsValid())
+ m_text->SetValue(dt.FormatISODate());
+ else
+ m_text->SetValue(wxEmptyString);
}
#endif // wxUSE_DATEPICKCTRL
-