]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/datectlg.cpp
Compilation fix for old OS/2 compilers.
[wxWidgets.git] / src / generic / datectlg.cpp
index 42d4c09a3e13e85a7e9b35a7fd7728eecb069747..90258753aef87de659aa3ddb21e97a0989406a69 100644 (file)
 
 #if wxUSE_DATEPICKCTRL
 
 
 #if wxUSE_DATEPICKCTRL
 
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    #define HAS_NATIVE_VERSION
-#endif
+#include "wx/datectrl.h"
 
 // use this version if we're explicitly requested to do it or if it's the only
 // one we have
 
 // 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(HAS_NATIVE_VERSION)
+#if wxUSE_DATEPICKCTRL_GENERIC || !defined(wxHAS_NATIVE_DATEPICKCTRL)
 
 #ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"
 
 #ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"
     #include "wx/valtext.h"
 #endif
 
     #include "wx/valtext.h"
 #endif
 
-// otherwise it's defined in the native version implementation
-#ifndef HAS_NATIVE_VERSION
+#ifdef wxHAS_NATIVE_DATEPICKCTRL
+    // this header is not included from wx/datectrl.h if we have a native
+    // version, but we do need it here
+    #include "wx/generic/datectrl.h"
+#else
+    // we need to define _WX_DEFINE_DATE_EVENTS_ before including wx/dateevt.h to
+    // define the event types we use if we're the only date picker control version
+    // being compiled -- otherwise it's defined in the native version implementation
     #define _WX_DEFINE_DATE_EVENTS_
 #endif
 
 #include "wx/dateevt.h"
 
     #define _WX_DEFINE_DATE_EVENTS_
 #endif
 
 #include "wx/dateevt.h"
 
-#include "wx/datectrl.h"
 #include "wx/calctrl.h"
 #include "wx/calctrl.h"
-#include "wx/popupwin.h"
+#include "wx/renderer.h"
 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants
@@ -69,6 +72,215 @@ enum
     #define DEFAULT_ITEM_WIDTH 100
 #endif
 
     #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
+    #define CALBORDER         0
+    #define RIGHTBUTTONBORDER 4
+    #define TOPBUTTONBORDER   0
+    #define BUTTONBORDER      4
+    #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
+
+
+// ----------------------------------------------------------------------------
+// local classes
+// ----------------------------------------------------------------------------
+
+
+class wxDropdownButton : public wxBitmapButton
+{
+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()
+    {
+        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);
+
+protected:
+    int m_borderX, m_borderY;
+};
+
+
+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);
+}
+
+
+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;
+
+    wxBitmap chkBmp(15,15);  // arbitrary
+    if ( !wxBitmapButton::Create(parent, id, chkBmp,
+                                 pos, wxDefaultSize, BTN_FLAGS, validator) )
+        return false;
+
+    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;
+
+    w = size.x > 0 ? size.x : sz.x;
+    h = size.y > 0 ? size.y : sz.y;
+
+    DoMoveWindow(pos.x, pos.y, w, h);
+
+    return true;
+}
+
+
+void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
+{
+    if (m_borderX >= 0 && m_borderY >= 0 && (w >= 0 || h >= 0))
+    {
+        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 borderX = m_marginX + m_borderX; 
+        int borderY = m_marginY + m_borderY;
+        int bw = w - borderX;
+        int bh = h - borderY;
+        if (bh < 11) bh=11;
+        if (bw < 9)  bw=9;
+
+        wxBitmap bmp(bw, bh);
+        dc.SelectObject(bmp);
+
+        wxRendererNative& renderer = wxRendererNative::Get();
+
+#ifdef __WXGTK__
+        wxRect r(-(borderX/2),-(borderY/2),w,h);
+        wxColour magic(255,0,255);
+        dc.SetBrush( wxBrush( magic ) );
+        dc.SetPen( *wxTRANSPARENT_PEN );
+        dc.DrawRectangle(0,0,bw,bh);
+        renderer.DrawDropArrow(this, dc, r);
+        wxMask *mask = new wxMask( bmp, magic );
+        bmp.SetMask( mask );
+#else
+        wxRect r(0,0,bw,bh);
+        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.DrawDropArrow(this, dc, r, wxCONTROL_PRESSED);
+        mask = new wxMask( bmpSel, magic );
+        bmpSel.SetMask( mask );
+#else
+        renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED);
+#endif
+        SetBitmapSelected(bmpSel);
+    }
+
+    wxBitmapButton::DoMoveWindow(x, y, w, h);
+}
+
+
+#if wxUSE_POPUPWIN
+
+#include "wx/popupwin.h"
+
+class wxDatePopupInternal : public wxPopupTransientWindow
+{
+public:
+    wxDatePopupInternal(wxWindow *parent) : wxPopupTransientWindow(parent) { }
+
+    void ShowAt(int x, int y)
+    {
+        Position(wxPoint(x, y), wxSize(0, 0));
+        Popup();
+    }
+
+    void Hide()
+    {
+        Dismiss();
+    }
+};
+
+#else // !wxUSE_POPUPWIN
+
+class wxDatePopupInternal : public wxDialog
+{
+public:
+    wxDatePopupInternal(wxWindow *parent)
+        : wxDialog(parent,
+                   wxID_ANY,
+                   wxEmptyString,
+                   wxDefaultPosition,
+                   wxDefaultSize,
+                   wxSIMPLE_BORDER)
+    {
+    }
+
+    void ShowAt(int x, int y)
+    {
+        Show();
+        Move(x, y);
+    }
+
+    void Hide()
+    {
+        wxDialog::Hide();
+    }
+};
+
+#endif // wxUSE_POPUPWIN/!wxUSE_POPUPWIN
+
 // ============================================================================
 // wxDatePickerCtrlGeneric implementation
 // ============================================================================
 // ============================================================================
 // wxDatePickerCtrlGeneric implementation
 // ============================================================================
@@ -79,7 +291,9 @@ BEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase)
     EVT_CHILD_FOCUS(wxDatePickerCtrlGeneric::OnChildSetFocus)
 END_EVENT_TABLE()
 
     EVT_CHILD_FOCUS(wxDatePickerCtrlGeneric::OnChildSetFocus)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase)
+#ifndef wxHAS_NATIVE_DATEPICKCTRL
+    IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)
+#endif
 
 // ----------------------------------------------------------------------------
 // creation
 
 // ----------------------------------------------------------------------------
 // creation
@@ -91,6 +305,7 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
                                      const wxPoint& pos,
                                      const wxSize& size,
                                      long style,
                                      const wxPoint& pos,
                                      const wxSize& size,
                                      long style,
+                                     const wxValidator& validator,
                                      const wxString& name)
 {
     wxASSERT_MSG( !(style & wxDP_SPIN),
                                      const wxString& name)
 {
     wxASSERT_MSG( !(style & wxDP_SPIN),
@@ -98,79 +313,65 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
 
     if ( !wxControl::Create(parent, id, pos, size,
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS,
 
     if ( !wxControl::Create(parent, id, pos, size,
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS,
-                            wxDefaultValidator, name) )
+                            validator, name) )
 
     {
         return false;
     }
 
 
     {
         return false;
     }
 
-    SetWindowStyle(style | wxWANTS_CHARS);
     InheritAttributes();
 
     InheritAttributes();
 
-    wxBitmap bmp(8, 4);
-    {
-        wxMemoryDC dc;
+    m_txt = new wxTextCtrl(this, CTRLID_TXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, TXTCTRL_FLAGS);
 
 
-        dc.SelectObject(bmp);
-        dc.SetBrush(wxBrush(GetBackgroundColour()));
-        dc.SetPen(wxPen(GetBackgroundColour()));
-        dc.DrawRectangle(0,0, 8,4);
-
-        dc.SetBrush(wxBrush(GetForegroundColour()));
-        dc.SetPen(wxPen(GetForegroundColour()));
-        wxPoint pt[3] = { wxPoint(0,0), wxPoint(6,0), wxPoint(3,3) };
-        dc.DrawPolygon(3, pt);
-        dc.SelectObject(wxNullBitmap);
-    }
+    m_txt->Connect(wxEVT_KEY_DOWN,
+                   wxKeyEventHandler(wxDatePickerCtrlGeneric::OnEditKey),
+                   NULL, this);
+    m_txt->Connect(wxEVT_KILL_FOCUS,
+                   wxFocusEventHandler(wxDatePickerCtrlGeneric::OnKillFocus),
+                   NULL, this);
 
 
-    m_txt=new wxTextCtrl(this, CTRLID_TXT);
-    m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN,
-                   (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnEditKey,
-                   0, this);
-    m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KILL_FOCUS,
-                   (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnKillFocus,
-                   0, this);
+    const int height = m_txt->GetBestSize().y - BUTTONBORDER;
 
 
-    m_btn = new wxBitmapButton(this, CTRLID_BTN, bmp);
+    m_btn = new wxDropdownButton(this, CTRLID_BTN, wxDefaultPosition, wxSize(height, height));
 
 
-    m_popup = new wxPopupWindow(this);
+    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,
     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,
+                               wxPoint(0, 0), wxDefaultSize,
                                wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER);
                                wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER);
-    m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED,
-                   (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange,
-                   0, this);
-    m_cal->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN,
-                   (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnCalKey,
-                   0, this);
-    m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DOUBLECLICKED,
-                   (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange,
-                   0, this);
-    m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DAY_CHANGED,
-                   (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange,
-                   0, this);
-    m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_MONTH_CHANGED,
-                   (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange,
-                   0, this);
-    m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_YEAR_CHANGED,
-                   (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange,
-                   0, this);
+    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();
 
 
     wxWindow *yearControl = m_cal->GetYearControl();
 
-    Connect(wxID_ANY, wxID_ANY, wxEVT_SET_FOCUS,
-            (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSetFocus);
+    Connect(wxEVT_SET_FOCUS,
+            wxFocusEventHandler(wxDatePickerCtrlGeneric::OnSetFocus));
 
     wxClientDC dc(yearControl);
 
     wxClientDC dc(yearControl);
-    dc.SetFont(m_font);
+    dc.SetFont(yearControl->GetFont());
     wxCoord width, dummy;
     dc.GetTextExtent(wxT("2000"), &width, &dummy);
     wxCoord width, dummy;
     dc.GetTextExtent(wxT("2000"), &width, &dummy);
-    width += ConvertDialogToPixels(wxSize(20,0)).x;
+    width += ConvertDialogToPixels(wxSize(20, 0)).x;
 
     wxSize calSize = m_cal->GetBestSize();
     wxSize yearSize = yearControl->GetSize();
 
     wxSize calSize = m_cal->GetBestSize();
     wxSize yearSize = yearControl->GetSize();
@@ -180,16 +381,6 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
 
     SetFormat(wxT("%x"));
 
 
     SetFormat(wxT("%x"));
 
-    if (date.IsValid())
-        m_txt->SetValue(date.Format(m_format));
-
-
-#ifdef __WXMSW__
-#define CALBORDER   0
-#else
-#define CALBORDER   4
-#endif
-
     width = yearPosition.x + yearSize.x+2+CALBORDER/2;
     if (width < calSize.x-4)
         width = calSize.x-4;
     width = yearPosition.x + yearSize.x+2+CALBORDER/2;
     if (width < calSize.x-4)
         width = calSize.x-4;
@@ -211,7 +402,11 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
     m_popup->SetClientSize(panel->GetSize());
     m_popup->Hide();
 
     m_popup->SetClientSize(panel->GetSize());
     m_popup->Hide();
 
-    return TRUE;
+    SetValue(date.IsValid() ? date : wxDateTime::Today());
+
+    SetBestFittingSize(size);
+
+    return true;
 }
 
 
 }
 
 
@@ -256,11 +451,11 @@ void wxDatePickerCtrlGeneric::DoMoveWindow(int x, int y, int w, int h)
     wxSize bs=m_btn->GetBestSize();
     int eh=m_txt->GetBestSize().y;
 
     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);
+    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)
 
     if (m_dropped)
-        DropDown();
+        DropDown(true);
 }
 
 wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
 }
 
 wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
@@ -275,19 +470,19 @@ bool wxDatePickerCtrlGeneric::Show(bool show)
 {
     if ( !wxControl::Show(show) )
     {
 {
     if ( !wxControl::Show(show) )
     {
-        return FALSE;
+        return false;
     }
 
     }
 
-    if (!show)
+    if ( !show )
     {
     {
-        if (m_popup)
+        if ( m_popup )
         {
             m_popup->Hide();
             m_dropped = false;
         }
     }
 
         {
             m_popup->Hide();
             m_dropped = false;
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 
 }
 
 
@@ -295,17 +490,19 @@ bool wxDatePickerCtrlGeneric::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )
     {
 {
     if ( !wxControl::Enable(enable) )
     {
-        return FALSE;
+        return false;
     }
 
     }
 
-    if (!enable)
+    if ( !enable )
     {
     {
-        if (m_cal)
-            m_cal->Hide();
+        if ( m_popup )
+            m_popup->Hide();
     }
     }
-    if (m_btn)
+
+    if ( m_btn )
         m_btn->Enable(enable);
         m_btn->Enable(enable);
-    return TRUE;
+
+    return true;
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
@@ -321,14 +518,6 @@ wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
 
 bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
 {
 
 bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
 {
-    wxString currentText;
-    wxDateTime currentDate;
-    if (m_txt)
-    {
-        currentText = m_txt->GetValue();
-        if (!currentText.IsEmpty())
-            currentDate.ParseFormat(currentText, m_format);
-    }
     wxDateTime dt;
     dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
     wxString str=dt.Format(fmt);
     wxDateTime dt;
     dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
     wxString str=dt.Format(fmt);
@@ -356,7 +545,10 @@ bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
         }
         else if (n == (dt.GetYear() % 100))
         {
         }
         else if (n == (dt.GetYear() % 100))
         {
-            m_format.Append(wxT("%y"));
+            if (GetWindowStyle() & wxDP_SHOWCENTURY)
+                m_format.Append(wxT("%Y"));
+            else
+                m_format.Append(wxT("%y"));
             p += 2;
         }
         else
             p += 2;
         }
         else
@@ -365,39 +557,36 @@ bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
 
     if (m_txt)
     {
 
     if (m_txt)
     {
-        wxStringList valList;
-        wxChar c;
-        for (c='0'; c <= '9'; c++)
-            valList.Add(wxString(c, 1));
-        wxChar *p=(wxChar*)m_format.c_str();
+        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
         while (*p)
         {
             if (*p == '%')
                 p += 2;
             else
-                valList.Add(wxString(*p++, 1));
+                allowedChars.Add(wxString(*p++, 1));
         }
         }
-        wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
-        tv.SetIncludeList(valList);
 
 
+#if wxUSE_VALIDATORS
+        wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
+        tv.SetIncludes(allowedChars);
         m_txt->SetValidator(tv);
         m_txt->SetValidator(tv);
+#endif
 
 
-        if (!currentText.IsEmpty())
-            m_txt->SetValue(currentDate.Format(m_format));
+        if (m_currentDate.IsValid())
+            m_txt->SetValue(m_currentDate.Format(m_format));
     }
     }
+
     return true;
 }
 
 
 wxDateTime wxDatePickerCtrlGeneric::GetValue() const
 {
     return true;
 }
 
 
 wxDateTime wxDatePickerCtrlGeneric::GetValue() const
 {
-    wxDateTime dt;
-    wxString txt=m_txt->GetValue();
-
-    if (!txt.IsEmpty())
-        dt.ParseFormat(txt, m_format);
-
-    return dt;
+    return m_currentDate;
 }
 
 
 }
 
 
@@ -408,7 +597,14 @@ void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date)
         if (date.IsValid())
             m_txt->SetValue(date.Format(m_format));
         else
         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_txt->SetValue(wxEmptyString);
+        }
+
+        m_currentDate = date;
     }
 }
 
     }
 }
 
@@ -440,7 +636,7 @@ void wxDatePickerCtrlGeneric::DropDown(bool down)
         if (down)
         {
             wxDateTime dt;
         if (down)
         {
             wxDateTime dt;
-            if (!m_txt->GetValue().IsEmpty())
+            if (!m_txt->GetValue().empty())
                 dt.ParseFormat(m_txt->GetValue(), m_format);
 
             if (dt.IsValid())
                 dt.ParseFormat(m_txt->GetValue(), m_format);
 
             if (dt.IsValid())
@@ -449,9 +645,9 @@ void wxDatePickerCtrlGeneric::DropDown(bool down)
                 m_cal->SetDate(wxDateTime::Today());
 
             wxPoint pos=GetParent()->ClientToScreen(GetPosition());
                 m_cal->SetDate(wxDateTime::Today());
 
             wxPoint pos=GetParent()->ClientToScreen(GetPosition());
-            m_popup->Move(pos.x, pos.y + GetSize().y);
-            m_popup->Show();
+            m_popup->ShowAt(pos.x, pos.y + GetSize().y);
             m_dropped = true;
             m_dropped = true;
+            m_cal->SetFocus();
         }
         else
         {
         }
         else
         {
@@ -485,7 +681,7 @@ void wxDatePickerCtrlGeneric::OnChildSetFocus(wxChildFocusEvent &ev)
 }
 
 
 }
 
 
-void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& event)
+void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& WXUNUSED(event))
 {
     if (m_ignoreDrop)
     {
 {
     if (m_ignoreDrop)
     {
@@ -500,12 +696,12 @@ void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& event)
 }
 
 
 }
 
 
-void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent &ev)
+void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent& WXUNUSED(ev))
 {
     if (m_txt)
     {
         m_txt->SetFocus();
 {
     if (m_txt)
     {
         m_txt->SetFocus();
-        m_txt->SetSelection(0, 100);
+        m_txt->SetSelection(-1, -1); // select everything
     }
 }
 
     }
 }
 
@@ -516,10 +712,25 @@ void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev)
 
     wxDateTime dt;
     dt.ParseFormat(m_txt->GetValue(), m_format);
 
     wxDateTime dt;
     dt.ParseFormat(m_txt->GetValue(), m_format);
-    if (!dt.IsValid())
-        m_txt->SetValue(wxEmptyString);
-    else
+    if ( !dt.IsValid() )
+    {
+        if ( !HasFlag(wxDP_ALLOWNONE) )
+            dt = m_currentDate;
+    }
+
+    if(dt.IsValid())
         m_txt->SetValue(dt.Format(m_format));
         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);
+    }
 }
 
 
 }
 
 
@@ -527,7 +738,8 @@ void wxDatePickerCtrlGeneric::OnSelChange(wxCalendarEvent &ev)
 {
     if (m_cal)
     {
 {
     if (m_cal)
     {
-        m_txt->SetValue(m_cal->GetDate().Format(m_format));
+        m_currentDate = m_cal->GetDate();
+        m_txt->SetValue(m_currentDate.Format(m_format));
         if (ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED)
         {
             DropDown(false);
         if (ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED)
         {
             DropDown(false);
@@ -537,6 +749,9 @@ void wxDatePickerCtrlGeneric::OnSelChange(wxCalendarEvent &ev)
     ev.SetEventObject(this);
     ev.SetId(GetId());
     GetParent()->ProcessEvent(ev);
     ev.SetEventObject(this);
     ev.SetId(GetId());
     GetParent()->ProcessEvent(ev);
+
+    wxDateEvent dev(this, ev.GetDate(), wxEVT_DATE_CHANGED);
+    GetParent()->ProcessEvent(dev);
 }
 
 
 }
 
 
@@ -547,10 +762,10 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)
     GetParent()->ProcessEvent(ev);
 
     // We'll create an additional event if the date is valid.
     GetParent()->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
+    wxString txt = m_txt->GetValue();
     wxDateTime dt;
     wxDateTime dt;
-    if (!txt.IsEmpty())
+    if (!txt.empty())
     {
         dt.ParseFormat(txt, m_format);
         if (!dt.IsValid())
     {
         dt.ParseFormat(txt, m_format);
         if (!dt.IsValid())
@@ -563,13 +778,16 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)
     cev.SetDate(dt);
 
     GetParent()->ProcessEvent(cev);
     cev.SetDate(dt);
 
     GetParent()->ProcessEvent(cev);
+
+    wxDateEvent dev(this, dt, wxEVT_DATE_CHANGED);
+    GetParent()->ProcessEvent(dev);
 }
 
 
 void wxDatePickerCtrlGeneric::OnEditKey(wxKeyEvent & ev)
 {
     if (ev.GetKeyCode() == WXK_DOWN && !ev.HasModifiers())
 }
 
 
 void wxDatePickerCtrlGeneric::OnEditKey(wxKeyEvent & ev)
 {
     if (ev.GetKeyCode() == WXK_DOWN && !ev.HasModifiers())
-        DropDown();
+        DropDown(true);
     else
         ev.Skip();
 }
     else
         ev.Skip();
 }