/////////////////////////////////////////////////////////////////////////////
-// Name: generic/datectlg.cpp
+// Name: src/generic/datectlg.cpp
// Purpose: generic wxDatePickerCtrlGeneric implementation
// Author: Andreas Pflug
// Modified by:
#if wxUSE_DATEPICKCTRL
-#include "wx/datectrl.h"
-
-// use this version if we're explicitly requested to do it or if it's the only
-// one we have
-#if wxUSE_DATEPICKCTRL_GENERIC || !defined(wxHAS_NATIVE_DATEPICKCTRL)
-
#ifndef WX_PRECOMP
- #include "wx/bmpbuttn.h"
#include "wx/dialog.h"
#include "wx/dcmemory.h"
+ #include "wx/intl.h"
#include "wx/panel.h"
#include "wx/textctrl.h"
#include "wx/valtext.h"
#endif
-// otherwise it's defined in the native version implementation
-#ifndef wxHAS_NATIVE_DATEPICKCTRL
- #define _WX_DEFINE_DATE_EVENTS_
-#endif
+#include "wx/calctrl.h"
+#include "wx/combo.h"
-#include "wx/dateevt.h"
+#include "wx/datectrl.h"
#include "wx/generic/datectrl.h"
-#include "wx/arrstr.h"
-#include "wx/calctrl.h"
-#include "wx/popupwin.h"
-#include "wx/renderer.h"
-
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
-enum
+
+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
+
+
+// ----------------------------------------------------------------------------
+// local classes
+// ----------------------------------------------------------------------------
+
+class wxCalendarComboPopup : public wxCalendarCtrl,
+ public wxComboPopup
{
- CTRLID_TXT = 101,
- CTRLID_CAL,
- CTRLID_BTN,
- CTRLID_PAN
+public:
+
+ wxCalendarComboPopup() : wxCalendarCtrl(),
+ wxComboPopup()
+ {
+ }
+
+ virtual void Init()
+ {
+ }
+
+ // NB: Don't create lazily since it didn't work that way before
+ // wxComboCtrl was used, and changing behaviour would almost
+ // certainly introduce new bugs.
+ virtual bool Create(wxWindow* parent)
+ {
+ if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,
+ wxPoint(0, 0), wxDefaultSize,
+ wxCAL_SEQUENTIAL_MONTH_SELECTION
+ | wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )
+ return false;
+
+ SetFormat(GetLocaleDateFormat());
+
+ m_useSize = wxCalendarCtrl::GetBestSize();
+
+ wxWindow* tx = m_combo->GetTextCtrl();
+ if ( !tx )
+ tx = m_combo;
+
+ tx->Connect(wxEVT_KILL_FOCUS,
+ wxFocusEventHandler(wxCalendarComboPopup::OnKillTextFocus),
+ NULL, this);
+
+ return true;
+ }
+
+ virtual wxSize GetAdjustedSize(int WXUNUSED(minWidth),
+ int WXUNUSED(prefHeight),
+ int WXUNUSED(maxHeight))
+ {
+ return m_useSize;
+ }
+
+ virtual wxWindow *GetControl() { return this; }
+
+ void SetDateValue(const wxDateTime& date)
+ {
+ if ( date.IsValid() )
+ {
+ m_combo->SetText(date.Format(m_format));
+ SetDate(date);
+ }
+ else // invalid date
+ {
+ wxASSERT_MSG( HasDPFlag(wxDP_ALLOWNONE),
+ wxT("this control must have a valid date") );
+
+ m_combo->SetText(wxEmptyString);
+ }
+ }
+
+ bool IsTextEmpty() const
+ {
+ return m_combo->GetTextCtrl()->IsEmpty();
+ }
+
+ bool ParseDateTime(const wxString& s, wxDateTime* pDt)
+ {
+ wxASSERT(pDt);
+
+ if ( !s.empty() )
+ {
+ pDt->ParseFormat(s.c_str(), m_format);
+ if ( !pDt->IsValid() )
+ return false;
+ }
+
+ return true;
+ }
+
+ void SendDateEvent(const wxDateTime& dt)
+ {
+ // Sends both wxCalendarEvent and wxDateEvent
+ wxWindow* datePicker = m_combo->GetParent();
+
+ wxCalendarEvent cev(datePicker, dt, wxEVT_CALENDAR_SEL_CHANGED);
+ datePicker->GetEventHandler()->ProcessEvent(cev);
+
+ wxDateEvent event(datePicker, dt, wxEVT_DATE_CHANGED);
+ datePicker->GetEventHandler()->ProcessEvent(event);
+ }
+
+private:
+
+ void OnCalKey(wxKeyEvent & ev)
+ {
+ if (ev.GetKeyCode() == WXK_ESCAPE && !ev.HasModifiers())
+ Dismiss();
+ else
+ ev.Skip();
+ }
+
+ void OnSelChange(wxCalendarEvent &ev)
+ {
+ m_combo->SetText(GetDate().Format(m_format));
+
+ if ( ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED )
+ {
+ Dismiss();
+ }
+
+ SendDateEvent(GetDate());
+ }
+
+ void OnKillTextFocus(wxFocusEvent &ev)
+ {
+ ev.Skip();
+
+ const wxDateTime& dtOld = GetDate();
+
+ wxDateTime dt;
+ wxString value = m_combo->GetValue();
+ if ( !ParseDateTime(value, &dt) )
+ {
+ if ( !HasDPFlag(wxDP_ALLOWNONE) )
+ dt = dtOld;
+ }
+
+ m_combo->SetText(GetStringValueFor(dt));
+
+ if ( !dt.IsValid() && HasDPFlag(wxDP_ALLOWNONE) )
+ return;
+
+ // notify that we had to change the date after validation
+ if ( (dt.IsValid() && (!dtOld.IsValid() || dt != dtOld)) ||
+ (!dt.IsValid() && dtOld.IsValid()) )
+ {
+ SetDate(dt);
+ SendDateEvent(dt);
+ }
+ }
+
+ bool HasDPFlag(int flag) const
+ {
+ return m_combo->GetParent()->HasFlag(flag);
+ }
+
+ // Return the format to be used for the dates shown by the control. This
+ // functions honours wxDP_SHOWCENTURY flag.
+ wxString GetLocaleDateFormat() const
+ {
+#if wxUSE_INTL
+ wxString fmt = wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT);
+ if ( HasDPFlag(wxDP_SHOWCENTURY) )
+ fmt.Replace("%y", "%Y");
+
+ return fmt;
+#else // !wxUSE_INTL
+ return wxT("x");
+#endif // wxUSE_INTL/!wxUSE_INTL
+ }
+
+ bool SetFormat(const wxString& fmt)
+ {
+ m_format = fmt;
+
+ if ( m_combo )
+ {
+ wxArrayString allowedChars;
+ for ( wxChar c = wxT('0'); c <= wxT('9'); c++ )
+ allowedChars.Add(wxString(c, 1));
+
+ const wxChar *p2 = m_format.c_str();
+ while ( *p2 )
+ {
+ if ( *p2 == '%')
+ p2 += 2;
+ else
+ allowedChars.Add(wxString(*p2++, 1));
+ }
+
+ #if wxUSE_VALIDATORS
+ wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
+ tv.SetIncludes(allowedChars);
+ m_combo->SetValidator(tv);
+ #endif
+
+ if ( GetDate().IsValid() )
+ m_combo->SetText(GetDate().Format(m_format));
+ }
+
+ return true;
+ }
+
+ virtual void SetStringValue(const wxString& s)
+ {
+ wxDateTime dt;
+ if ( !s.empty() && ParseDateTime(s, &dt) )
+ SetDate(dt);
+ //else: keep the old value
+ }
+
+ virtual wxString GetStringValue() const
+ {
+ return GetStringValueFor(GetDate());
+ }
+
+private:
+ // returns either the given date representation using the current format or
+ // an empty string if it's invalid
+ wxString GetStringValueFor(const wxDateTime& dt) const
+ {
+ wxString val;
+ if ( dt.IsValid() )
+ val = dt.Format(m_format);
+
+ return val;
+ }
+
+ wxSize m_useSize;
+ wxString m_format;
+
+ DECLARE_EVENT_TABLE()
};
-#ifndef DEFAULT_ITEM_WIDTH
- #define DEFAULT_ITEM_WIDTH 100
-#endif
+
+BEGIN_EVENT_TABLE(wxCalendarComboPopup, wxCalendarCtrl)
+ EVT_KEY_DOWN(wxCalendarComboPopup::OnCalKey)
+ EVT_CALENDAR_SEL_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)
+ EVT_CALENDAR_PAGE_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)
+ EVT_CALENDAR(wxID_ANY, wxCalendarComboPopup::OnSelChange)
+END_EVENT_TABLE()
+
// ============================================================================
// wxDatePickerCtrlGeneric implementation
// ============================================================================
BEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase)
- EVT_BUTTON(CTRLID_BTN, wxDatePickerCtrlGeneric::OnClick)
- EVT_TEXT(CTRLID_TXT, wxDatePickerCtrlGeneric::OnText)
- EVT_CHILD_FOCUS(wxDatePickerCtrlGeneric::OnChildSetFocus)
+ EVT_TEXT(wxID_ANY, wxDatePickerCtrlGeneric::OnText)
+ EVT_SIZE(wxDatePickerCtrlGeneric::OnSize)
+ EVT_SET_FOCUS(wxDatePickerCtrlGeneric::OnFocus)
END_EVENT_TABLE()
#ifndef wxHAS_NATIVE_DATEPICKCTRL
- IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase)
+ IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)
#endif
// ----------------------------------------------------------------------------
const wxString& name)
{
wxASSERT_MSG( !(style & wxDP_SPIN),
- _T("wxDP_SPIN style not supported, use wxDP_DEFAULT") );
+ wxT("wxDP_SPIN style not supported, use wxDP_DEFAULT") );
if ( !wxControl::Create(parent, id, pos, size,
- style | wxCLIP_CHILDREN | wxWANTS_CHARS,
+ style | wxCLIP_CHILDREN | wxWANTS_CHARS | wxBORDER_NONE,
validator, name) )
-
{
return false;
}
InheritAttributes();
- m_txt = new wxTextCtrl(this, CTRLID_TXT);
- m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCharEventFunction)
- &wxDatePickerCtrlGeneric::OnEditKey,
- 0, this);
- m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KILL_FOCUS,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxFocusEventFunction)
- &wxDatePickerCtrlGeneric::OnKillFocus,
- 0, this);
-
- const int height = m_txt->GetBestSize().y - 4; // FIXME: fudge
- wxBitmap bmp(height, height);
- {
- wxMemoryDC dc;
- dc.SelectObject(bmp);
- wxRendererNative::Get().DrawComboBoxDropButton
- (
- this,
- dc,
- wxRect(0, 0, height, height)
- );
- }
+ m_combo = new wxComboCtrl(this, -1, wxEmptyString,
+ wxDefaultPosition, wxDefaultSize);
- wxBitmapButton *btn = new wxBitmapButton(this, CTRLID_BTN, bmp);
- btn->SetMargins(0, 0);
- m_btn = btn;
-
- m_popup = new wxPopupWindow(this);
- m_popup->SetFont(GetFont());
-
- wxPanel *panel=new wxPanel(m_popup, CTRLID_PAN,
- wxPoint(), wxDefaultSize,
- wxSUNKEN_BORDER);
- m_cal = new wxCalendarCtrl(panel, CTRLID_CAL, wxDefaultDateTime,
- wxPoint(), wxDefaultSize,
- wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCalendarEventFunction)
- &wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
- m_cal->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCharEventFunction)
- &wxDatePickerCtrlGeneric::OnCalKey,
- 0, this);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DOUBLECLICKED,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCalendarEventFunction)
- &wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DAY_CHANGED,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCalendarEventFunction)
- &wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_MONTH_CHANGED,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCalendarEventFunction)
- &wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_YEAR_CHANGED,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCalendarEventFunction)
- &wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
-
- wxWindow *yearControl = m_cal->GetYearControl();
-
- Connect(wxID_ANY, wxID_ANY, wxEVT_SET_FOCUS,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxFocusEventFunction)
- &wxDatePickerCtrlGeneric::OnSetFocus);
-
- wxClientDC dc(yearControl);
- dc.SetFont(m_font);
- wxCoord width, dummy;
- dc.GetTextExtent(wxT("2000"), &width, &dummy);
- width += ConvertDialogToPixels(wxSize(20,0)).x;
-
- wxSize calSize = m_cal->GetBestSize();
- wxSize yearSize = yearControl->GetSize();
- yearSize.x = width;
-
- wxPoint yearPosition = yearControl->GetPosition();
-
- SetFormat(wxT("%x"));
-
- if (date.IsValid())
- m_txt->SetValue(date.Format(m_format));
-
-
-#ifdef __WXMSW__
-#define CALBORDER 0
-#else
-#define CALBORDER 4
-#endif
+ m_combo->SetCtrlMainWnd(this);
- width = yearPosition.x + yearSize.x+2+CALBORDER/2;
- if (width < calSize.x-4)
- width = calSize.x-4;
-
- int calPos = (width-calSize.x)/2;
- if (calPos == -1)
- {
- calPos = 0;
- width += 2;
- }
- m_cal->SetSize(calPos, 0, calSize.x, calSize.y);
- yearControl->SetSize(width-yearSize.x-CALBORDER/2, yearPosition.y,
- yearSize.x, yearSize.y);
- m_cal->GetMonthControl()->Move(0, 0);
+ m_popup = new wxCalendarComboPopup();
+#if defined(__WXMSW__)
+ // without this keyboard navigation in month control doesn't work
+ m_combo->UseAltPopupWindow();
+#endif
+ m_combo->SetPopupControl(m_popup);
+ m_popup->SetDateValue(date.IsValid() ? date : wxDateTime::Today());
- panel->SetClientSize(width+CALBORDER/2, calSize.y-2+CALBORDER);
- m_popup->SetClientSize(panel->GetSize());
- m_popup->Hide();
+ SetInitialSize(size);
return true;
}
void wxDatePickerCtrlGeneric::Init()
{
+ m_combo = NULL;
m_popup = NULL;
- m_txt = NULL;
- m_cal = NULL;
- m_btn = NULL;
-
- m_dropped = false;
- m_ignoreDrop = false;
}
+wxDatePickerCtrlGeneric::~wxDatePickerCtrlGeneric()
+{
+}
bool wxDatePickerCtrlGeneric::Destroy()
{
- if (m_cal)
- m_cal->Destroy();
- if (m_popup)
- m_popup->Destroy();
- if (m_txt)
- m_txt->Destroy();
- if (m_btn)
- m_btn->Destroy();
+ if ( m_combo )
+ m_combo->Destroy();
+ m_combo = NULL;
m_popup = NULL;
- m_txt = NULL;
- m_cal = NULL;
- m_btn = NULL;
return wxControl::Destroy();
}
// overridden base class methods
// ----------------------------------------------------------------------------
-void wxDatePickerCtrlGeneric::DoMoveWindow(int x, int y, int w, int h)
-{
- wxControl::DoMoveWindow(x, y, w, h);
- wxSize bs=m_btn->GetBestSize();
- int eh=m_txt->GetBestSize().y;
-
- m_txt->SetSize(0, 0, w-bs.x-1, h > eh ? eh : h);
- m_btn->SetSize(w - bs.x, 0, bs.x, h > bs.y ? bs.y : h);
-
- if (m_dropped)
- DropDown();
-}
-
wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
{
- int bh=m_btn->GetBestSize().y;
- int eh=m_txt->GetBestSize().y;
- return wxSize(DEFAULT_ITEM_WIDTH, bh > eh ? bh : eh);
+ return m_combo->GetBestSize();
}
-
-bool wxDatePickerCtrlGeneric::Show(bool show)
+wxWindowList wxDatePickerCtrlGeneric::GetCompositeWindowParts() const
{
- if ( !wxControl::Show(show) )
- {
- return false;
- }
-
- if (!show)
- {
- if (m_popup)
- {
- m_popup->Hide();
- m_dropped = false;
- }
- }
-
- return true;
-}
-
-
-bool wxDatePickerCtrlGeneric::Enable(bool enable)
-{
- if ( !wxControl::Enable(enable) )
- {
- return false;
- }
-
- if (!enable)
- {
- if (m_cal)
- m_cal->Hide();
- }
- if (m_btn)
- m_btn->Enable(enable);
- return true;
+ wxWindowList parts;
+ if (m_combo)
+ parts.push_back(m_combo);
+ if (m_popup)
+ parts.push_back(m_popup);
+ return parts;
}
// ----------------------------------------------------------------------------
wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
const wxDateTime& upperdate)
{
- return m_cal->SetDateRange(lowerdate, upperdate);
-}
-
-bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
-{
- wxString currentText;
- wxDateTime currentDate;
- if (m_txt)
- {
- currentText = m_txt->GetValue();
- if (!currentText.empty())
- currentDate.ParseFormat(currentText, m_format);
- }
- wxDateTime dt;
- dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
- wxString str=dt.Format(fmt);
- wxChar *p=(wxChar*)str.c_str();
-
- m_format=wxEmptyString;
-
- while (*p)
- {
- int n=wxAtoi(p);
- if (n == dt.GetDay())
- {
- m_format.Append(wxT("%d"));
- p += 2;
- }
- else if (n == (int)dt.GetMonth()+1)
- {
- m_format.Append(wxT("%m"));
- p += 2;
- }
- else if (n == dt.GetYear())
- {
- m_format.Append(wxT("%Y"));
- p += 4;
- }
- else if (n == (dt.GetYear() % 100))
- {
- m_format.Append(wxT("%y"));
- p += 2;
- }
- else
- m_format.Append(*p++);
- }
-
- if (m_txt)
- {
- wxArrayString valList;
- wxChar c;
- for (c='0'; c <= '9'; c++)
- valList.Add(wxString(c, 1));
- wxChar *p=(wxChar*)m_format.c_str();
- while (*p)
- {
- if (*p == '%')
- p += 2;
- else
- valList.Add(wxString(*p++, 1));
- }
- wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
- tv.SetIncludes(valList);
-
- m_txt->SetValidator(tv);
-
- if (!currentText.empty())
- m_txt->SetValue(currentDate.Format(m_format));
- }
- return true;
+ return m_popup->SetDateRange(lowerdate, upperdate);
}
wxDateTime wxDatePickerCtrlGeneric::GetValue() const
{
- wxDateTime dt;
- wxString txt=m_txt->GetValue();
-
- if (!txt.empty())
- dt.ParseFormat(txt, m_format);
-
- return dt;
+ if ( HasFlag(wxDP_ALLOWNONE) && m_popup->IsTextEmpty() )
+ return wxInvalidDateTime;
+ return m_popup->GetDate();
}
void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date)
{
- if (m_cal)
- {
- if (date.IsValid())
- m_txt->SetValue(date.Format(m_format));
- else
- m_txt->SetValue(wxEmptyString);
- }
+ m_popup->SetDateValue(date);
}
bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
{
- if (dt1)
- *dt1 = m_cal->GetLowerDateLimit();
- if (dt1)
- *dt2 = m_cal->GetUpperDateLimit();
- return true;
+ return m_popup->GetDateRange(dt1, dt2);
}
void
wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2)
{
- m_cal->SetDateRange(dt1, dt2);
+ m_popup->SetDateRange(dt1, dt2);
}
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-void wxDatePickerCtrlGeneric::DropDown(bool down)
+wxCalendarCtrl *wxDatePickerCtrlGeneric::GetCalendar() const
{
- if (m_popup)
- {
- if (down)
- {
- wxDateTime dt;
- if (!m_txt->GetValue().empty())
- dt.ParseFormat(m_txt->GetValue(), m_format);
-
- if (dt.IsValid())
- m_cal->SetDate(dt);
- else
- m_cal->SetDate(wxDateTime::Today());
-
- wxPoint pos=GetParent()->ClientToScreen(GetPosition());
- m_popup->Move(pos.x, pos.y + GetSize().y);
- m_popup->Show();
- m_dropped = true;
- }
- else
- {
- if (m_dropped)
- m_popup->Hide();
- m_dropped = false;
- }
- }
+ return m_popup;
}
-
-void wxDatePickerCtrlGeneric::OnChildSetFocus(wxChildFocusEvent &ev)
-{
- ev.Skip();
- m_ignoreDrop = false;
-
- wxWindow *w=(wxWindow*)ev.GetEventObject();
- while (w)
- {
- if (w == m_popup)
- return;
- w = w->GetParent();
- }
-
- if (m_dropped)
- {
- DropDown(false);
- if (ev.GetEventObject() == m_btn)
- m_ignoreDrop = true;
- }
-}
-
-
-void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& WXUNUSED(event))
-{
- if (m_ignoreDrop)
- {
- m_ignoreDrop = false;
- m_txt->SetFocus();
- }
- else
- {
- DropDown();
- m_cal->SetFocus();
- }
-}
-
-
-void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent& WXUNUSED(ev))
-{
- if (m_txt)
- {
- m_txt->SetFocus();
- m_txt->SetSelection(0, 100);
- }
-}
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
-void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev)
+void wxDatePickerCtrlGeneric::OnSize(wxSizeEvent& event)
{
- ev.Skip();
-
- wxDateTime dt;
- dt.ParseFormat(m_txt->GetValue(), m_format);
- if (!dt.IsValid())
- m_txt->SetValue(wxEmptyString);
- else
- m_txt->SetValue(dt.Format(m_format));
-}
+ if ( m_combo )
+ m_combo->SetSize(GetClientSize());
-
-void wxDatePickerCtrlGeneric::OnSelChange(wxCalendarEvent &ev)
-{
- if (m_cal)
- {
- m_txt->SetValue(m_cal->GetDate().Format(m_format));
- if (ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED)
- {
- DropDown(false);
- m_txt->SetFocus();
- }
- }
- ev.SetEventObject(this);
- ev.SetId(GetId());
- GetParent()->ProcessEvent(ev);
+ event.Skip();
}
{
ev.SetEventObject(this);
ev.SetId(GetId());
- GetParent()->ProcessEvent(ev);
+ GetParent()->GetEventHandler()->ProcessEvent(ev);
// We'll create an additional event if the date is valid.
- // If the date isn't valid, the user's probable in the middle of typing
- wxString txt=m_txt->GetValue();
+ // If the date isn't valid, the user's probably in the middle of typing
wxDateTime dt;
- if (!txt.empty())
- {
- dt.ParseFormat(txt, m_format);
- if (!dt.IsValid())
- return;
- }
+ if ( !m_popup || !m_popup->ParseDateTime(m_combo->GetValue(), &dt) )
+ return;
- wxCalendarEvent cev(m_cal, wxEVT_CALENDAR_SEL_CHANGED);
- cev.SetEventObject(this);
- cev.SetId(GetId());
- cev.SetDate(dt);
-
- GetParent()->ProcessEvent(cev);
+ m_popup->SendDateEvent(dt);
}
-void wxDatePickerCtrlGeneric::OnEditKey(wxKeyEvent & ev)
+void wxDatePickerCtrlGeneric::OnFocus(wxFocusEvent& WXUNUSED(event))
{
- if (ev.GetKeyCode() == WXK_DOWN && !ev.HasModifiers())
- DropDown();
- else
- ev.Skip();
-}
-
-
-void wxDatePickerCtrlGeneric::OnCalKey(wxKeyEvent & ev)
-{
- if (ev.GetKeyCode() == WXK_ESCAPE && !ev.HasModifiers())
- DropDown(false);
- else
- ev.Skip();
+ m_combo->SetFocus();
}
-#endif // wxUSE_DATEPICKCTRL_GENERIC
#endif // wxUSE_DATEPICKCTRL
projects / wxWidgets.git / blobdiff