X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83dc6964f0a5fce3be25bcf774981f6aae807915..069b2e594107028ef3ee0a03b8b9fd13b0fa4f32:/src/generic/datectlg.cpp

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 8a1c2bcf2e..5028bb79b0 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        generic/datectlg.cpp
+// Name:        src/generic/datectlg.cpp
 // Purpose:     generic wxDatePickerCtrlGeneric implementation
 // Author:      Andreas Pflug
 // Modified by:
@@ -29,10 +29,10 @@
 
 // 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)
+#if !defined(wxHAS_NATIVE_DATEPICKCTRL) || \
+        (defined(wxUSE_DATEPICKCTRL_GENERIC) && wxUSE_DATEPICKCTRL_GENERIC)
 
 #ifndef WX_PRECOMP
-    #include "wx/bmpbuttn.h"
     #include "wx/dialog.h"
     #include "wx/dcmemory.h"
     #include "wx/panel.h"
@@ -54,238 +54,323 @@
 #include "wx/dateevt.h"
 
 #include "wx/calctrl.h"
-#include "wx/renderer.h"
+#include "wx/combo.h"
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
-enum
-{
-    CTRLID_TXT = 101,
-    CTRLID_CAL,
-    CTRLID_BTN,
-    CTRLID_PAN
-};
-
-#ifndef DEFAULT_ITEM_WIDTH
-    #define DEFAULT_ITEM_WIDTH 100
-#endif
-
-#ifdef __WXMSW__
-    #undef wxUSE_POPUPWIN
-    #define wxUSE_POPUPWIN    0  // Popup not working
-    #define TXTCTRL_FLAGS     wxNO_BORDER
-    #define BTN_FLAGS         wxNO_BORDER
+#if defined(__WXMSW__)
     #define CALBORDER         0
-    #define RIGHTBUTTONBORDER 3
-    #define TOPBUTTONBORDER   0
-    #define BUTTONBORDER      3
-    #define TXTPOSY           1
 #else
-    #define TXTCTRL_FLAGS     0
-    #define BTN_FLAGS         wxBU_AUTODRAW
     #define CALBORDER         4
-    #define RIGHTBUTTONBORDER 0
-    #define TOPBUTTONBORDER   0
-    #define BUTTONBORDER      0
-    #define TXTPOSY           0
 #endif
 
+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
+
 
 // ----------------------------------------------------------------------------
 // local classes
 // ----------------------------------------------------------------------------
 
-
-class wxDropdownButton : public wxBitmapButton
+class wxCalendarComboPopup : public wxCalendarCtrl,
+                             public wxComboPopup
 {
 public:
-    wxDropdownButton() { Init(); }
-    wxDropdownButton(wxWindow *parent,
-                     wxWindowID id,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style=0,
-                     const wxValidator& validator = wxDefaultValidator);
-
-    void Init()
+
+    wxCalendarComboPopup() : wxCalendarCtrl(),
+                             wxComboPopup()
     {
-        m_borderX = -1;
-        m_borderY = -1;
     }
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator);
 
-    void DoMoveWindow(int x, int y, int w, int h);
+    virtual void Init()
+    {
+    }
 
-protected:
-    int m_borderX, m_borderY;
-};
+    // 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_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )
+            return false;
 
+        wxWindow *yearControl = wxCalendarCtrl::GetYearControl();
 
-wxDropdownButton::wxDropdownButton(wxWindow *parent,
-                                   wxWindowID id,
-                                   const wxPoint& pos,
-                                   const wxSize& size,
-                                   long style,
-                                   const wxValidator& validator)
-{
-    Init();
-    Create(parent, id, pos, size, style, validator);
-}
+        wxClientDC dc(yearControl);
+        dc.SetFont(yearControl->GetFont());
+        wxCoord width, dummy;
+        dc.GetTextExtent(wxT("2000"), &width, &dummy);
+        width += ConvertDialogToPixels(wxSize(20, 0)).x;
 
+        wxSize calSize = wxCalendarCtrl::GetBestSize();
+        wxSize yearSize = yearControl->GetSize();
+        yearSize.x = width;
 
-bool wxDropdownButton::Create(wxWindow *parent,
-                              wxWindowID id,
-                              const wxPoint& pos,
-                              const wxSize& size,
-                              long WXUNUSED(style),
-                              const wxValidator& validator)
-{
-    m_marginX = 0;
-    m_marginY = 0;
+        wxPoint yearPosition = yearControl->GetPosition();
 
-    wxBitmap chkBmp(15,15);  // arbitrary
-    if ( !wxBitmapButton::Create(parent, id, chkBmp,
-                                 pos, wxDefaultSize, BTN_FLAGS, validator) )
-        return false;
+        SetFormat("%x");
 
-    const wxSize sz = GetSize();
-    int w = chkBmp.GetWidth(),
-        h = chkBmp.GetHeight();
-    m_borderX = sz.x - m_marginX - w;
-    m_borderY = sz.y - m_marginY - h;
+        width = yearPosition.x + yearSize.x+2+CALBORDER/2;
+        if (width < calSize.x-4)
+            width = calSize.x-4;
 
-    w = size.x > 0 ? size.x : sz.x;
-    h = size.y > 0 ? size.y : sz.y;
+        int calPos = (width-calSize.x)/2;
+        if (calPos == -1)
+        {
+            calPos = 0;
+            width += 2;
+        }
+        wxCalendarCtrl::SetSize(calPos, 0, calSize.x, calSize.y);
+        yearControl->SetSize(width-yearSize.x-CALBORDER/2, yearPosition.y,
+                             yearSize.x, yearSize.y);
+        wxCalendarCtrl::GetMonthControl()->Move(0, 0);
 
-    DoMoveWindow(pos.x, pos.y, w, h);
+        m_useSize.x = width+CALBORDER/2;
+        m_useSize.y = calSize.y-2+CALBORDER;
 
-    return true;
-}
+        wxWindow* tx = m_combo->GetTextCtrl();
+        if ( !tx )
+            tx = m_combo;
 
+        tx->Connect(wxEVT_KILL_FOCUS,
+                    wxFocusEventHandler(wxCalendarComboPopup::OnKillTextFocus),
+                    NULL, this);
 
-void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
-{
-    if (m_borderX >= 0 && m_borderY >= 0 && (w >= 0 || h >= 0))
+        return true;
+    }
+
+    virtual wxSize GetAdjustedSize(int WXUNUSED(minWidth),
+                                   int WXUNUSED(prefHeight),
+                                   int WXUNUSED(maxHeight))
     {
-        wxMemoryDC dc;
-        if (w < 0)
-              w = GetSize().x;
-#ifdef __WXGTK__
-        else
-            w = m_marginX + m_borderX + 15; // GTK magic size
-#endif
-        if (h < 0)
-            h = GetSize().y;
-
-        int bw = w - m_marginX - m_borderX;
-        int bh = h - m_marginY - m_borderY;
-        if (bh < 11) bh=11;
-        if (bw < 9)  bw=9;
-
-        wxBitmap bmp(bw, bh);
-        dc.SelectObject(bmp);
-
-        wxRect r(0,0,bw, bh);
-        wxRendererNative& renderer = wxRendererNative::Get();
-        
-#ifdef __WXGTK__
-        wxColour magic(255,0,255);
-        dc.SetBrush( wxBrush( magic ) );
-        dc.SetPen( *wxTRANSPARENT_PEN );
-        dc.DrawRectangle(0,0,bw,bh);
-        renderer.DrawComboBoxDropButton(this, dc, r);
-        wxMask *mask = new wxMask( bmp, magic );
-        bmp.SetMask( mask );
-#else
-        renderer.DrawComboBoxDropButton(this, dc, r);
-#endif
-        SetBitmapLabel(bmp);
-
-        wxBitmap bmpSel(bw, bh);
-        dc.SelectObject(bmpSel);
-        
-#ifdef __WXGTK__
-        dc.SetBrush( wxBrush( magic ) );
-        dc.SetPen( *wxTRANSPARENT_PEN );
-        dc.DrawRectangle(0,0,bw,bh);
-        renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED);
-        mask = new wxMask( bmpSel, magic );
-        bmpSel.SetMask( mask );
-#else
-        renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED);
-#endif        
-        SetBitmapSelected(bmpSel);
+        return m_useSize;
     }
 
-    wxBitmapButton::DoMoveWindow(x, y, w, h);
-}
+    virtual wxWindow *GetControl() { return this; }
 
+    void SetDateValue(const wxDateTime& date)
+    {
+        if ( date.IsValid() )
+        {
+            m_combo->SetText(date.Format(m_format));
+        }
+        else // invalid date
+        {
+            wxASSERT_MSG( HasDPFlag(wxDP_ALLOWNONE),
+                            _T("this control must have a valid date") );
 
-#if wxUSE_POPUPWIN
+            m_combo->SetText(wxEmptyString);
+        }
 
-#include "wx/popupwin.h"
+        SetDate(date);
+    }
 
-class wxDatePopupInternal : public wxPopupTransientWindow
-{
-public:
-    wxDatePopupInternal(wxWindow *parent) : wxPopupTransientWindow(parent) { }
+    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 ShowAt(int x, int y)
+    void SendDateEvent(const wxDateTime& dt)
     {
-        Position(wxPoint(x, y), wxSize(0, 0));
-        Popup();
+        //
+        // Sends both wxCalendarEvent and wxDateEvent
+        wxWindow* datePicker = m_combo->GetParent();
+
+        wxCalendarEvent cev((wxCalendarCtrl*) this, wxEVT_CALENDAR_SEL_CHANGED);
+        cev.SetEventObject(datePicker);
+        cev.SetId(datePicker->GetId());
+        cev.SetDate(dt);
+        datePicker->GetEventHandler()->ProcessEvent(cev);
+
+        wxDateEvent event(datePicker, dt, wxEVT_DATE_CHANGED);
+        datePicker->GetEventHandler()->ProcessEvent(event);
     }
 
-    void Hide()
+private:
+
+    void OnCalKey(wxKeyEvent & ev)
     {
-        Dismiss();
+        if (ev.GetKeyCode() == WXK_ESCAPE && !ev.HasModifiers())
+            Dismiss();
+        else
+            ev.Skip();
     }
-};
 
-#else // !wxUSE_POPUPWIN
+    void OnSelChange(wxCalendarEvent &ev)
+    {
+        m_combo->SetText(GetDate().Format(m_format));
 
-class wxDatePopupInternal : public wxDialog
-{
-public:
-    wxDatePopupInternal(wxWindow *parent)
-        : wxDialog(parent,
-                   wxID_ANY,
-                   wxEmptyString,
-                   wxDefaultPosition,
-                   wxDefaultSize,
-                   wxSIMPLE_BORDER)
+        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));
+
+        // 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)
+    {
+        return m_combo->GetParent()->HasFlag(flag);
+    }
+
+    bool SetFormat(const wxString& fmt)
+    {
+        m_format.clear();
+
+        wxDateTime dt;
+        dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
+        wxString str(dt.Format(fmt));
+
+        const wxChar *p = str.c_str();
+        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))
+            {
+                if ( HasDPFlag(wxDP_SHOWCENTURY) )
+                    m_format.Append(wxT("%Y"));
+                else
+                    m_format.Append(wxT("%y"));
+                p += 2;
+            }
+            else
+                m_format.Append(*p++);
+        }
+
+        if ( m_combo )
+        {
+            wxArrayString allowedChars;
+            for ( wxChar c = _T('0'); c <= _T('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;
     }
 
-    void ShowAt(int x, int y)
+    virtual void SetStringValue(const wxString& s)
     {
-        Show();
-        Move(x, y);
+        wxDateTime dt;
+        if ( ParseDateTime(s, &dt) )
+            SetDate(dt);
+        else if ( HasDPFlag(wxDP_ALLOWNONE) )
+            SetDate(wxInvalidDateTime);
+        //else: !wxDP_ALLOWNONE, keep the old value
     }
 
-    void Hide()
+    virtual wxString GetStringValue() const
     {
-        wxDialog::Hide();
+        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()
 };
 
-#endif // wxUSE_POPUPWIN/!wxUSE_POPUPWIN
+
+BEGIN_EVENT_TABLE(wxCalendarComboPopup, wxCalendarCtrl)
+    EVT_KEY_DOWN(wxCalendarComboPopup::OnCalKey)
+    EVT_CALENDAR_SEL_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)
+    EVT_CALENDAR_DAY(wxID_ANY, wxCalendarComboPopup::OnSelChange)
+    EVT_CALENDAR_MONTH(wxID_ANY, wxCalendarComboPopup::OnSelChange)
+    EVT_CALENDAR_YEAR(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
@@ -309,99 +394,30 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
                   _T("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, wxEmptyString, wxDefaultPosition, wxDefaultSize, TXTCTRL_FLAGS);
-
-    m_txt->Connect(wxEVT_KEY_DOWN,
-                   wxKeyEventHandler(wxDatePickerCtrlGeneric::OnEditKey),
-                   NULL, this);
-    m_txt->Connect(wxEVT_KILL_FOCUS,
-                   wxFocusEventHandler(wxDatePickerCtrlGeneric::OnKillFocus),
-                   NULL, this);
-
-    const int height = m_txt->GetBestSize().y - BUTTONBORDER;
-
-    m_btn = new wxDropdownButton(this, CTRLID_BTN, wxDefaultPosition, wxSize(height, height));
-
-    m_popup = new wxDatePopupInternal(this);
-    m_popup->SetFont(GetFont());
-
-    wxPanel *panel=new wxPanel(m_popup, CTRLID_PAN,
-                               wxPoint(0, 0), wxDefaultSize,
-                               wxSUNKEN_BORDER);
-    m_cal = new wxCalendarCtrl(panel, CTRLID_CAL, wxDefaultDateTime,
-                               wxPoint(0, 0), wxDefaultSize,
-                               wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER);
-    m_cal->Connect(wxEVT_CALENDAR_SEL_CHANGED,
-                   wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
-                   NULL, this);
-    m_cal->Connect(wxEVT_KEY_DOWN,
-                   wxKeyEventHandler(wxDatePickerCtrlGeneric::OnCalKey),
-                   NULL, this);
-    m_cal->Connect(wxEVT_CALENDAR_DOUBLECLICKED,
-                   wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
-                   NULL, this);
-    m_cal->Connect(wxEVT_CALENDAR_DAY_CHANGED,
-                   wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
-                   NULL, this);
-    m_cal->Connect(wxEVT_CALENDAR_MONTH_CHANGED,
-                   wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
-                   NULL, this);
-    m_cal->Connect(wxEVT_CALENDAR_YEAR_CHANGED,
-                   wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
-                   NULL, this);
-
-    wxWindow *yearControl = m_cal->GetYearControl();
-
-    Connect(wxEVT_SET_FOCUS,
-            wxFocusEventHandler(wxDatePickerCtrlGeneric::OnSetFocus));
-
-    wxClientDC dc(yearControl);
-    dc.SetFont(yearControl->GetFont());
-    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"));
-
-    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_combo = new wxComboCtrl(this, -1, wxEmptyString,
+                              wxDefaultPosition, wxDefaultSize);
 
+    m_combo->SetCtrlMainWnd(this);
 
+    m_popup = new wxCalendarComboPopup();
 
-    panel->SetClientSize(width+CALBORDER/2, calSize.y-2+CALBORDER);
-    m_popup->SetClientSize(panel->GetSize());
-    m_popup->Hide();
+#if defined(__WXMSW__)
+    // without this keyboard navigation in month control doesn't work
+    m_combo->UseAltPopupWindow();
+#endif
+    m_combo->SetPopupControl(m_popup);
 
-    SetValue(date.IsValid() ? date : wxDateTime::Today());
+    m_popup->SetDateValue(date.IsValid() ? date : wxDateTime::Today());
 
-    SetBestFittingSize(size);
+    SetInitialSize(size);
 
     return true;
 }
@@ -409,31 +425,21 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
 
 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();
 }
@@ -442,64 +448,9 @@ bool wxDatePickerCtrlGeneric::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, TXTPOSY, w-bs.x-RIGHTBUTTONBORDER, h > eh ? eh-TXTPOSY : h-TXTPOSY);
-    m_btn->SetSize(w - bs.x-RIGHTBUTTONBORDER, TOPBUTTONBORDER, bs.x, h > bs.y ? bs.y : h);
-
-    if (m_dropped)
-        DropDown(true);
-}
-
 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);
-}
-
-
-bool wxDatePickerCtrlGeneric::Show(bool show)
-{
-    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_popup )
-            m_popup->Hide();
-    }
-
-    if ( m_btn )
-        m_btn->Enable(enable);
-
-    return true;
+    return m_combo->GetBestSize();
 }
 
 // ----------------------------------------------------------------------------
@@ -510,107 +461,28 @@ bool
 wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
                                       const wxDateTime& upperdate)
 {
-    return m_cal->SetDateRange(lowerdate, upperdate);
-}
-
-bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
-{
-    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))
-        {
-            if (GetWindowStyle() & wxDP_SHOWCENTURY)
-                m_format.Append(wxT("%Y"));
-            else
-                m_format.Append(wxT("%y"));
-            p += 2;
-        }
-        else
-            m_format.Append(*p++);
-    }
-
-    if (m_txt)
-    {
-        wxArrayString allowedChars;
-        for ( wxChar c = _T('0'); c <= _T('9'); c++ )
-            allowedChars.Add(wxString(c, 1));
-
-        const wxChar *p = m_format.c_str();
-        while (*p)
-        {
-            if (*p == '%')
-                p += 2;
-            else
-                allowedChars.Add(wxString(*p++, 1));
-        }
-
-        wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
-        tv.SetIncludes(allowedChars);
-
-        m_txt->SetValidator(tv);
-
-        if (m_currentDate.IsValid())
-            m_txt->SetValue(m_currentDate.Format(m_format));
-    }
-
-    return true;
+    return m_popup->SetDateRange(lowerdate, upperdate);
 }
 
 
 wxDateTime wxDatePickerCtrlGeneric::GetValue() const
 {
-    return m_currentDate;
+    return m_popup->GetDate();
 }
 
 
 void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date)
 {
-    if (m_cal)
-    {
-        if (date.IsValid())
-            m_txt->SetValue(date.Format(m_format));
-        else
-        {
-            wxASSERT_MSG( HasFlag(wxDP_ALLOWNONE),
-                            _T("this control must have a valid date") );
-
-            m_txt->SetValue(wxEmptyString);
-        }
-
-        m_currentDate = date;
-    }
+    m_popup->SetDateValue(date);
 }
 
 
 bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
 {
     if (dt1)
-        *dt1 = m_cal->GetLowerDateLimit();
-    if (dt1)
-        *dt2 = m_cal->GetUpperDateLimit();
+        *dt1 = m_popup->GetLowerDateLimit();
+    if (dt2)
+        *dt2 = m_popup->GetUpperDateLimit();
     return true;
 }
 
@@ -618,136 +490,25 @@ bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
 void
 wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2)
 {
-    m_cal->SetDateRange(dt1, dt2);
-}
-
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-void wxDatePickerCtrlGeneric::DropDown(bool down)
-{
-    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->ShowAt(pos.x, pos.y + GetSize().y);
-            m_dropped = true;
-            m_cal->SetFocus();
-        }
-        else
-        {
-            if (m_dropped)
-                m_popup->Hide();
-            m_dropped = false;
-        }
-    }
-}
-
-
-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;
-    }
+    m_popup->SetDateRange(dt1, dt2);
 }
 
-
-void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& WXUNUSED(event))
+wxCalendarCtrl *wxDatePickerCtrlGeneric::GetCalendar() const
 {
-    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(-1, -1); // select everything
-    }
+    return m_popup;
 }
 
-
-void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev)
-{
-    ev.Skip();
-
-    wxDateTime dt;
-    dt.ParseFormat(m_txt->GetValue(), m_format);
-    if ( !dt.IsValid() )
-    {
-        if ( !HasFlag(wxDP_ALLOWNONE) )
-            dt = m_currentDate;
-    }
-
-    if(dt.IsValid())
-        m_txt->SetValue(dt.Format(m_format));
-    else
-        m_txt->SetValue(wxEmptyString);
-
-    // notify that we had to change the date after validation
-    if ( (dt.IsValid() && m_currentDate != dt) ||
-            (!dt.IsValid() && m_currentDate.IsValid()) )
-    {
-        m_currentDate = dt;
-        wxDateEvent event(this, dt, wxEVT_DATE_CHANGED);
-        GetEventHandler()->ProcessEvent(event);
-    }
-}
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
 
 
-void wxDatePickerCtrlGeneric::OnSelChange(wxCalendarEvent &ev)
+void wxDatePickerCtrlGeneric::OnSize(wxSizeEvent& event)
 {
-    if (m_cal)
-    {
-        m_currentDate = m_cal->GetDate();
-        m_txt->SetValue(m_currentDate.Format(m_format));
-        if (ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED)
-        {
-            DropDown(false);
-            m_txt->SetFocus();
-        }
-    }
-    ev.SetEventObject(this);
-    ev.SetId(GetId());
-    GetParent()->ProcessEvent(ev);
+    if ( m_combo )
+        m_combo->SetSize(GetClientSize());
 
-    wxDateEvent dev(this, ev.GetDate(), wxEVT_DATE_CHANGED);
-    GetParent()->ProcessEvent(dev);
+    event.Skip();
 }
 
 
@@ -755,48 +516,24 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)
 {
     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 probably in the middle of typing
-    wxString txt = m_txt->GetValue();
     wxDateTime dt;
-    if (!txt.empty())
-    {
-        dt.ParseFormat(txt, m_format);
-        if (!dt.IsValid())
-            return;
-    }
+    if ( !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);
-
-    wxDateEvent dev(this, dt, wxEVT_DATE_CHANGED);
-    GetParent()->ProcessEvent(dev);
+    m_popup->SendDateEvent(dt);
 }
 
 
-void wxDatePickerCtrlGeneric::OnEditKey(wxKeyEvent & ev)
+void wxDatePickerCtrlGeneric::OnFocus(wxFocusEvent& WXUNUSED(event))
 {
-    if (ev.GetKeyCode() == WXK_DOWN && !ev.HasModifiers())
-        DropDown(true);
-    else
-        ev.Skip();
+    m_combo->SetFocus();
 }
 
 
-void wxDatePickerCtrlGeneric::OnCalKey(wxKeyEvent & ev)
-{
-    if (ev.GetKeyCode() == WXK_ESCAPE && !ev.HasModifiers())
-        DropDown(false);
-    else
-        ev.Skip();
-}
-
 #endif // wxUSE_DATEPICKCTRL_GENERIC
 
 #endif // wxUSE_DATEPICKCTRL