Add support for wxSL_INVERSE flag. Also uses new inverse logic to make Mac vertical...

[wxWidgets.git] / src / generic / datectlg.cpp

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 3b30d8ffec30b0bc844ecb8150b5d51bd84069d2..19c8a65e1a93f92691361b15cf647da6b7080bc4 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        generic/datectrl.cpp
-// Purpose:     generic wxDatePickerCtrl implementation
+// Name:        generic/datectlg.cpp
+// Purpose:     generic wxDatePickerCtrlGeneric implementation

 // Author:      Andreas Pflug
 // Modified by:
 // Created:     2005-01-19
 // Author:      Andreas Pflug
 // Modified by:
 // Created:     2005-01-19


@@ -23,8 +23,34 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_DATEPICKCTRL
+

 #include "wx/datectrl.h"
 #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/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/dateevt.h"
+#include "wx/generic/datectrl.h"
+

 #include "wx/calctrl.h"
 #include "wx/calctrl.h"

+#include "wx/popupwin.h"
+#include "wx/renderer.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -43,45 +69,33 @@ enum
 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================

-// wxDatePickerCtrl implementation
+// wxDatePickerCtrlGeneric implementation

 // ============================================================================
 
 // ============================================================================
 

-BEGIN_EVENT_TABLE(wxDatePickerCtrl, wxDatePickerCtrlBase)
-    EVT_BUTTON(CTRLID_BTN, wxDatePickerCtrl::OnClick)
-    EVT_TEXT(CTRLID_TXT, wxDatePickerCtrl::OnText)
-    EVT_CHILD_FOCUS(wxDatePickerCtrl::OnChildSetFocus)
+BEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase)
+    EVT_BUTTON(CTRLID_BTN, wxDatePickerCtrlGeneric::OnClick)
+    EVT_TEXT(CTRLID_TXT, wxDatePickerCtrlGeneric::OnText)
+    EVT_CHILD_FOCUS(wxDatePickerCtrlGeneric::OnChildSetFocus)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase)
+#ifndef wxHAS_NATIVE_DATEPICKCTRL
+    IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase)
+#endif

 
 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------
 

-wxDatePickerCtrl::wxDatePickerCtrl(wxWindow *parent,
-                            wxWindowID id,
-                            const wxDateTime& date,
-                            const wxPoint& pos,
-                            const wxSize& size,
-                            long style,
-                            const wxString& name)
-{
-    Init();
-    Create(parent, id, date, pos, size, style, name);
-}
-
-
-bool wxDatePickerCtrl::Create(wxWindow *parent,
-                            wxWindowID id,
-                            const wxDateTime& date,
-                            const wxPoint& pos,
-                            const wxSize& size,
-                            long style,
-                            const wxString& name)
+bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
+                                     wxWindowID id,
+                                     const wxDateTime& date,
+                                     const wxPoint& pos,
+                                     const wxSize& size,
+                                     long style,
+                                     const wxString& name)

 {
 {

-    wxString txt;
-    if (date.IsValid())
-        txt = date.FormatDate();
+    wxASSERT_MSG( !(style & wxDP_SPIN),
+                  _T("wxDP_SPIN style not supported, use wxDP_DEFAULT") );

 
     if ( !wxControl::Create(parent, id, pos, size,
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS,
 
     if ( !wxControl::Create(parent, id, pos, size,
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS,


@@ -91,70 +105,92 @@ bool wxDatePickerCtrl::Create(wxWindow *parent,
         return false;
     }
 
         return false;
     }
 

-    SetWindowStyle(style | wxWANTS_CHARS);

     InheritAttributes();
 
     InheritAttributes();
 

-    wxBitmap bmp(8, 4);
-    {
-        wxMemoryDC dc;
-
-        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=new wxTextCtrl(this, CTRLID_TXT, txt);
+    m_txt = new wxTextCtrl(this, CTRLID_TXT);

     m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN,
     m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN,

-                   (wxObjectEventFunction)&wxDatePickerCtrl::OnEditKey,
+                   (wxObjectEventFunction)
+                   (wxEventFunction)
+                   (wxCharEventFunction)
+                   &wxDatePickerCtrlGeneric::OnEditKey,

                    0, this);
     m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KILL_FOCUS,
                    0, this);
     m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KILL_FOCUS,

-                   (wxObjectEventFunction)&wxDatePickerCtrl::OnKillFocus,
+                   (wxObjectEventFunction)
+                   (wxEventFunction)
+                   (wxFocusEventFunction)
+                   &wxDatePickerCtrlGeneric::OnKillFocus,

                    0, this);
                    0, this);

-    SetFormat(wxT("%x"));

 
 

-    m_btn = new wxBitmapButton(this, CTRLID_BTN, bmp);
+    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)
+                                );
+    }
+
+    wxBitmapButton *btn = new wxBitmapButton(this, CTRLID_BTN, bmp);
+    btn->SetMargins(0, 0);
+    m_btn = btn;

 
 

-    m_dlg = new wxDialog(this, CTRLID_CAL, wxEmptyString,
-                         wxDefaultPosition, wxDefaultSize,
-                         wxSIMPLE_BORDER);
-    m_dlg->SetFont(GetFont());
+    m_popup = new wxPopupWindow(this);
+    m_popup->SetFont(GetFont());

 
 

-    wxPanel *panel=new wxPanel(m_dlg, CTRLID_PAN,
+    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(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED,
                                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(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED,

-                   (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange,
+                   (wxObjectEventFunction)
+                   (wxEventFunction)
+                   (wxCalendarEventFunction)
+                   &wxDatePickerCtrlGeneric::OnSelChange,

                    0, this);
     m_cal->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN,
                    0, this);
     m_cal->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN,

-                   (wxObjectEventFunction)&wxDatePickerCtrl::OnCalKey,
+                   (wxObjectEventFunction)
+                   (wxEventFunction)
+                   (wxCharEventFunction)
+                   &wxDatePickerCtrlGeneric::OnCalKey,

                    0, this);
     m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DOUBLECLICKED,
                    0, this);
     m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DOUBLECLICKED,

-                   (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange,
+                   (wxObjectEventFunction)
+                   (wxEventFunction)
+                   (wxCalendarEventFunction)
+                   &wxDatePickerCtrlGeneric::OnSelChange,

                    0, this);
     m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DAY_CHANGED,
                    0, this);
     m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DAY_CHANGED,

-                   (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange,
+                   (wxObjectEventFunction)
+                   (wxEventFunction)
+                   (wxCalendarEventFunction)
+                   &wxDatePickerCtrlGeneric::OnSelChange,

                    0, this);
     m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_MONTH_CHANGED,
                    0, this);
     m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_MONTH_CHANGED,

-                   (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange,
+                   (wxObjectEventFunction)
+                   (wxEventFunction)
+                   (wxCalendarEventFunction)
+                   &wxDatePickerCtrlGeneric::OnSelChange,

                    0, this);
     m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_YEAR_CHANGED,
                    0, this);
     m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_YEAR_CHANGED,

-                   (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange,
+                   (wxObjectEventFunction)
+                   (wxEventFunction)
+                   (wxCalendarEventFunction)
+                   &wxDatePickerCtrlGeneric::OnSelChange,

                    0, this);
 
     wxWindow *yearControl = m_cal->GetYearControl();
 
     Connect(wxID_ANY, wxID_ANY, wxEVT_SET_FOCUS,
                    0, this);
 
     wxWindow *yearControl = m_cal->GetYearControl();
 
     Connect(wxID_ANY, wxID_ANY, wxEVT_SET_FOCUS,

-            (wxObjectEventFunction)&wxDatePickerCtrl::OnSetFocus);
+                   (wxObjectEventFunction)
+                   (wxEventFunction)
+                   (wxFocusEventFunction)
+                   &wxDatePickerCtrlGeneric::OnSetFocus);

 
     wxClientDC dc(yearControl);
     dc.SetFont(m_font);
 
     wxClientDC dc(yearControl);
     dc.SetFont(m_font);


@@ -168,6 +204,12 @@ bool wxDatePickerCtrl::Create(wxWindow *parent,
 
     wxPoint yearPosition = yearControl->GetPosition();
 
 
     wxPoint yearPosition = yearControl->GetPosition();
 

+    SetFormat(wxT("%x"));
+
+    if (date.IsValid())
+        m_txt->SetValue(date.Format(m_format));
+
+

 #ifdef __WXMSW__
 #define CALBORDER   0
 #else
 #ifdef __WXMSW__
 #define CALBORDER   0
 #else


@@ -192,15 +234,16 @@ bool wxDatePickerCtrl::Create(wxWindow *parent,
 
 
     panel->SetClientSize(width+CALBORDER/2, calSize.y-2+CALBORDER);
 
 
     panel->SetClientSize(width+CALBORDER/2, calSize.y-2+CALBORDER);

-    m_dlg->SetClientSize(panel->GetSize());
+    m_popup->SetClientSize(panel->GetSize());
+    m_popup->Hide();

 
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 

-void wxDatePickerCtrl::Init()
+void wxDatePickerCtrlGeneric::Init()

 {
 {

-    m_dlg = NULL;
+    m_popup = NULL;

     m_txt = NULL;
     m_cal = NULL;
     m_btn = NULL;
     m_txt = NULL;
     m_cal = NULL;
     m_btn = NULL;


@@ -210,18 +253,18 @@ void wxDatePickerCtrl::Init()
 }
 
 
 }
 
 

-bool wxDatePickerCtrl::Destroy()
+bool wxDatePickerCtrlGeneric::Destroy()

 {
     if (m_cal)
         m_cal->Destroy();
 {
     if (m_cal)
         m_cal->Destroy();

-    if (m_dlg)
-        m_dlg->Destroy();
+    if (m_popup)
+        m_popup->Destroy();

     if (m_txt)
         m_txt->Destroy();
     if (m_btn)
         m_btn->Destroy();
 
     if (m_txt)
         m_txt->Destroy();
     if (m_btn)
         m_btn->Destroy();
 

-    m_dlg = NULL;
+    m_popup = NULL;

     m_txt = NULL;
     m_cal = NULL;
     m_btn = NULL;
     m_txt = NULL;
     m_cal = NULL;
     m_btn = NULL;


@@ -233,7 +276,7 @@ bool wxDatePickerCtrl::Destroy()
 // overridden base class methods
 // ----------------------------------------------------------------------------
 
 // overridden base class methods
 // ----------------------------------------------------------------------------
 

-void wxDatePickerCtrl::DoMoveWindow(int x, int y, int w, int h)
+void wxDatePickerCtrlGeneric::DoMoveWindow(int x, int y, int w, int h)

 {
     wxControl::DoMoveWindow(x, y, w, h);
     wxSize bs=m_btn->GetBestSize();
 {
     wxControl::DoMoveWindow(x, y, w, h);
     wxSize bs=m_btn->GetBestSize();


@@ -246,7 +289,7 @@ void wxDatePickerCtrl::DoMoveWindow(int x, int y, int w, int h)
         DropDown();
 }
 
         DropDown();
 }
 

-wxSize wxDatePickerCtrl::DoGetBestSize() const
+wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const

 {
     int bh=m_btn->GetBestSize().y;
     int eh=m_txt->GetBestSize().y;
 {
     int bh=m_btn->GetBestSize().y;
     int eh=m_txt->GetBestSize().y;


@@ -254,31 +297,31 @@ wxSize wxDatePickerCtrl::DoGetBestSize() const
 }
 
 
 }
 
 

-bool wxDatePickerCtrl::Show(bool show)
+bool wxDatePickerCtrlGeneric::Show(bool show)

 {
     if ( !wxControl::Show(show) )
     {
 {
     if ( !wxControl::Show(show) )
     {

-        return FALSE;
+        return false;

     }
 
     if (!show)
     {
     }
 
     if (!show)
     {

-        if (m_dlg)
+        if (m_popup)

         {
         {

-            m_dlg->Hide();
+            m_popup->Hide();

             m_dropped = false;
         }
     }
 
             m_dropped = false;
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 

-bool wxDatePickerCtrl::Enable(bool enable)
+bool wxDatePickerCtrlGeneric::Enable(bool enable)

 {
     if ( !wxControl::Enable(enable) )
     {
 {
     if ( !wxControl::Enable(enable) )
     {

-        return FALSE;
+        return false;

     }
 
     if (!enable)
     }
 
     if (!enable)


@@ -288,22 +331,30 @@ bool wxDatePickerCtrl::Enable(bool enable)
     }
     if (m_btn)
         m_btn->Enable(enable);
     }
     if (m_btn)
         m_btn->Enable(enable);

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxDatePickerCtrl API
+// wxDatePickerCtrlGeneric API

 // ----------------------------------------------------------------------------
 
 bool
 // ----------------------------------------------------------------------------
 
 bool

-wxDatePickerCtrl::SetDateRange(const wxDateTime& lowerdate,
-                               const wxDateTime& upperdate)
+wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
+                                      const wxDateTime& upperdate)

 {
     return m_cal->SetDateRange(lowerdate, upperdate);
 }
 
 {
     return m_cal->SetDateRange(lowerdate, upperdate);
 }
 

-bool wxDatePickerCtrl::SetFormat(const wxChar *fmt)
+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);
     wxDateTime dt;
     dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
     wxString str=dt.Format(fmt);


@@ -329,6 +380,11 @@ bool wxDatePickerCtrl::SetFormat(const wxChar *fmt)
             m_format.Append(wxT("%Y"));
             p += 4;
         }
             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++);
     }
         else
             m_format.Append(*p++);
     }


@@ -351,36 +407,39 @@ bool wxDatePickerCtrl::SetFormat(const wxChar *fmt)
         tv.SetIncludeList(valList);
 
         m_txt->SetValidator(tv);
         tv.SetIncludeList(valList);
 
         m_txt->SetValidator(tv);

+
+        if (!currentText.empty())
+            m_txt->SetValue(currentDate.Format(m_format));

     }
     return true;
 }
 
 
     }
     return true;
 }
 
 

-wxDateTime wxDatePickerCtrl::GetValue() const
+wxDateTime wxDatePickerCtrlGeneric::GetValue() const

 {
     wxDateTime dt;
     wxString txt=m_txt->GetValue();
 
 {
     wxDateTime dt;
     wxString txt=m_txt->GetValue();
 

-    if (!txt.IsEmpty())
+    if (!txt.empty())

         dt.ParseFormat(txt, m_format);
 
     return dt;
 }
 
 
         dt.ParseFormat(txt, m_format);
 
     return dt;
 }
 
 

-void wxDatePickerCtrl::SetValue(const wxDateTime& date)
+void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date)

 {
     if (m_cal)
     {
         if (date.IsValid())
 {
     if (m_cal)
     {
         if (date.IsValid())

-            m_txt->SetValue(date.FormatDate());
+            m_txt->SetValue(date.Format(m_format));

         else
             m_txt->SetValue(wxEmptyString);
     }
 }
 
 
         else
             m_txt->SetValue(wxEmptyString);
     }
 }
 
 

-bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
+bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const

 {
     if (dt1)
         *dt1 = m_cal->GetLowerDateLimit();
 {
     if (dt1)
         *dt1 = m_cal->GetLowerDateLimit();


@@ -390,7 +449,8 @@ bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
 }
 
 
 }
 
 

-void wxDatePickerCtrl::SetRange(const wxDateTime &dt1, const wxDateTime &dt2)
+void
+wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2)

 {
     m_cal->SetDateRange(dt1, dt2);
 }
 {
     m_cal->SetDateRange(dt1, dt2);
 }


@@ -399,37 +459,37 @@ void wxDatePickerCtrl::SetRange(const wxDateTime &dt1, const wxDateTime &dt2)
 // event handlers
 // ----------------------------------------------------------------------------
 
 // event handlers
 // ----------------------------------------------------------------------------
 

-void wxDatePickerCtrl::DropDown(bool down)
+void wxDatePickerCtrlGeneric::DropDown(bool down)

 {
 {

-    if (m_dlg)
+    if (m_popup)

     {
         if (down)
         {
     {
         if (down)
         {

-            if (m_txt->GetValue().IsEmpty())
-                m_cal->SetDate(wxDateTime::Today());
-            else
-            {
-                wxDateTime dt;
+            wxDateTime dt;
+            if (!m_txt->GetValue().empty())

                 dt.ParseFormat(m_txt->GetValue(), m_format);
                 dt.ParseFormat(m_txt->GetValue(), m_format);

+
+            if (dt.IsValid())

                 m_cal->SetDate(dt);
                 m_cal->SetDate(dt);

-            }
-            wxPoint pos=GetParent()->ClientToScreen(GetPosition());
+            else
+                m_cal->SetDate(wxDateTime::Today());

 
 

-            m_dlg->Move(pos.x, pos.y + GetSize().y);
-            m_dlg->Show();
+            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_dropped = true;
         }
         else
         {
             if (m_dropped)

-                m_dlg->Hide();
+                m_popup->Hide();

             m_dropped = false;
         }
     }
 }
 
 
             m_dropped = false;
         }
     }
 }
 
 

-void wxDatePickerCtrl::OnChildSetFocus(wxChildFocusEvent &ev)
+void wxDatePickerCtrlGeneric::OnChildSetFocus(wxChildFocusEvent &ev)

 {
     ev.Skip();
     m_ignoreDrop = false;
 {
     ev.Skip();
     m_ignoreDrop = false;


@@ -437,7 +497,7 @@ void wxDatePickerCtrl::OnChildSetFocus(wxChildFocusEvent &ev)
     wxWindow  *w=(wxWindow*)ev.GetEventObject();
     while (w)
     {
     wxWindow  *w=(wxWindow*)ev.GetEventObject();
     while (w)
     {

-        if (w == m_dlg)
+        if (w == m_popup)

             return;
         w = w->GetParent();
     }
             return;
         w = w->GetParent();
     }


@@ -451,7 +511,7 @@ void wxDatePickerCtrl::OnChildSetFocus(wxChildFocusEvent &ev)
 }
 
 
 }
 
 

-void wxDatePickerCtrl::OnClick(wxCommandEvent& event)
+void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& WXUNUSED(event))

 {
     if (m_ignoreDrop)
     {
 {
     if (m_ignoreDrop)
     {


@@ -466,7 +526,7 @@ void wxDatePickerCtrl::OnClick(wxCommandEvent& event)
 }
 
 
 }
 
 

-void wxDatePickerCtrl::OnSetFocus(wxFocusEvent &ev)
+void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent& WXUNUSED(ev))

 {
     if (m_txt)
     {
 {
     if (m_txt)
     {


@@ -476,7 +536,7 @@ void wxDatePickerCtrl::OnSetFocus(wxFocusEvent &ev)
 }
 
 
 }
 
 

-void wxDatePickerCtrl::OnKillFocus(wxFocusEvent &ev)
+void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev)

 {
     ev.Skip();
 
 {
     ev.Skip();
 


@@ -489,11 +549,11 @@ void wxDatePickerCtrl::OnKillFocus(wxFocusEvent &ev)
 }
 
 
 }
 
 

-void wxDatePickerCtrl::OnSelChange(wxCalendarEvent &ev)
+void wxDatePickerCtrlGeneric::OnSelChange(wxCalendarEvent &ev)

 {
     if (m_cal)
     {
 {
     if (m_cal)
     {

-        m_txt->SetValue(m_cal->GetDate().FormatDate());
+        m_txt->SetValue(m_cal->GetDate().Format(m_format));

         if (ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED)
         {
             DropDown(false);
         if (ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED)
         {
             DropDown(false);


@@ -506,7 +566,7 @@ void wxDatePickerCtrl::OnSelChange(wxCalendarEvent &ev)
 }
 
 
 }
 
 

-void wxDatePickerCtrl::OnText(wxCommandEvent &ev)
+void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)

 {
     ev.SetEventObject(this);
     ev.SetId(GetId());
 {
     ev.SetEventObject(this);
     ev.SetId(GetId());


@@ -516,7 +576,7 @@ void wxDatePickerCtrl::OnText(wxCommandEvent &ev)
     // If the date isn't valid, the user's probable in the middle of typing
     wxString txt=m_txt->GetValue();
     wxDateTime dt;
     // If the date isn't valid, the user's probable in the middle of typing
     wxString txt=m_txt->GetValue();
     wxDateTime dt;

-    if (!txt.IsEmpty())
+    if (!txt.empty())

     {
         dt.ParseFormat(txt, m_format);
         if (!dt.IsValid())
     {
         dt.ParseFormat(txt, m_format);
         if (!dt.IsValid())


@@ -532,7 +592,7 @@ void wxDatePickerCtrl::OnText(wxCommandEvent &ev)
 }
 
 
 }
 
 

-void wxDatePickerCtrl::OnEditKey(wxKeyEvent & ev)
+void wxDatePickerCtrlGeneric::OnEditKey(wxKeyEvent & ev)

 {
     if (ev.GetKeyCode() == WXK_DOWN && !ev.HasModifiers())
         DropDown();
 {
     if (ev.GetKeyCode() == WXK_DOWN && !ev.HasModifiers())
         DropDown();


@@ -541,7 +601,7 @@ void wxDatePickerCtrl::OnEditKey(wxKeyEvent & ev)
 }
 
 
 }
 
 

-void wxDatePickerCtrl::OnCalKey(wxKeyEvent & ev)
+void wxDatePickerCtrlGeneric::OnCalKey(wxKeyEvent & ev)

 {
     if (ev.GetKeyCode() == WXK_ESCAPE && !ev.HasModifiers())
         DropDown(false);
 {
     if (ev.GetKeyCode() == WXK_ESCAPE && !ev.HasModifiers())
         DropDown(false);


@@ -549,3 +609,7 @@ void wxDatePickerCtrl::OnCalKey(wxKeyEvent & ev)
         ev.Skip();
 }
 
         ev.Skip();
 }
 

+#endif // wxUSE_DATEPICKCTRL_GENERIC
+
+#endif // wxUSE_DATEPICKCTRL
+