use native calendar control in wxDatePickerCtrl if available (#9548)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
index 7adfbf775e310a0a33afd0c46e3c681fada497bc..81f6c0d62eaac9b34070cc775726c0e8ec8217ec 100644 (file)
--- a/include/wx/datectrl.h
+++ b/include/wx/datectrl.h
@@ -16,13 +16,6 @@
 
 #if wxUSE_DATEPICKCTRL
 
 
 #if wxUSE_DATEPICKCTRL
 

-// this is currently defined in wx/msw/setup.h but not for MSW configure builds
-// and other ports which only have the generic version anyhow, so provide a
-// fallback definition here for them
-#ifndef wxUSE_DATEPICKCTRL_GENERIC
-    #define wxUSE_DATEPICKCTRL_GENERIC 0
-#endif
-

 #include "wx/control.h"         // the base class
 #include "wx/datetime.h"
 
 #include "wx/control.h"         // the base class
 #include "wx/datetime.h"
 

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index c84f551994626c1a98174a29885b214e80a107eb..75172a2d44612a4d4f67e40bbb5b50370e2e3ce5 100644 (file)
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -12,10 +12,9 @@
 #ifndef _WX_GENERIC_DATECTRL_H_
 #define _WX_GENERIC_DATECTRL_H_
 
 #ifndef _WX_GENERIC_DATECTRL_H_
 #define _WX_GENERIC_DATECTRL_H_
 

-class WXDLLIMPEXP_FWD_ADV wxCalendarDateAttr;
-class WXDLLIMPEXP_FWD_ADV wxGenericCalendarCtrl;
-class WXDLLIMPEXP_FWD_ADV wxCalendarEvent;
-class WXDLLIMPEXP_FWD_CORE wxComboCtrl;
+#include "wx/calctrl.h"
+#include "wx/combo.h"
+

 class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
 class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase


@@ -59,7 +58,7 @@ public:
 
     // extra methods available only in this (generic) implementation
     bool SetFormat(const wxString& fmt);
 
     // extra methods available only in this (generic) implementation
     bool SetFormat(const wxString& fmt);

-    wxGenericCalendarCtrl *GetCalendar() const;
+    wxCalendarCtrl *GetCalendar() const;

 
 
     // implementation only from now on
 
 
     // implementation only from now on


@@ -81,7 +80,6 @@ private:
     wxComboCtrl* m_combo;
     wxCalendarComboPopup* m_popup;
 
     wxComboCtrl* m_combo;
     wxCalendarComboPopup* m_popup;
 

-

     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric)
 };

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 8c6178d01d986171a76530f9ee6c4068bd3f5dce..fb04195e96ccfd07d3f333358f69c361fcf4851b 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -25,13 +25,6 @@
 
 #if wxUSE_DATEPICKCTRL
 
 
 #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 !defined(wxHAS_NATIVE_DATEPICKCTRL) || \
-        (defined(wxUSE_DATEPICKCTRL_GENERIC) && wxUSE_DATEPICKCTRL_GENERIC)
-

 #ifndef WX_PRECOMP
     #include "wx/dialog.h"
     #include "wx/dcmemory.h"
 #ifndef WX_PRECOMP
     #include "wx/dialog.h"
     #include "wx/dcmemory.h"


@@ -40,27 +33,14 @@
     #include "wx/valtext.h"
 #endif
 
     #include "wx/valtext.h"
 #endif
 

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

 
 

-#include "wx/calctrl.h"
-#include "wx/generic/calctrlg.h"
-#include "wx/combo.h"

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

-#if defined(__WXMSW__)
-    #define CALBORDER         0
-#else
-    #define CALBORDER         4
-#endif

 
 // ----------------------------------------------------------------------------
 // global variables
 
 // ----------------------------------------------------------------------------
 // global variables


@@ -71,12 +51,12 @@
 // local classes
 // ----------------------------------------------------------------------------
 
 // local classes
 // ----------------------------------------------------------------------------
 

-class wxCalendarComboPopup : public wxGenericCalendarCtrl,
+class wxCalendarComboPopup : public wxCalendarCtrl,

                              public wxComboPopup
 {
 public:
 
                              public wxComboPopup
 {
 public:
 

-    wxCalendarComboPopup() : wxGenericCalendarCtrl(),
+    wxCalendarComboPopup() : wxCalendarCtrl(),

                              wxComboPopup()
     {
     }
                              wxComboPopup()
     {
     }


@@ -90,44 +70,15 @@ public:
     //     certainly introduce new bugs.
     virtual bool Create(wxWindow* parent)
     {
     //     certainly introduce new bugs.
     virtual bool Create(wxWindow* parent)
     {

-        if ( !wxGenericCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,
+        if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,

                               wxPoint(0, 0), wxDefaultSize,
                               wxPoint(0, 0), wxDefaultSize,

-                              wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )
+                              wxCAL_SEQUENTIAL_MONTH_SELECTION 
+                              | wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) )

             return false;
 
             return false;
 

-        wxWindow *yearControl = wxGenericCalendarCtrl::GetYearControl();
-
-        wxClientDC dc(yearControl);
-        dc.SetFont(yearControl->GetFont());
-        wxCoord width, dummy;
-        dc.GetTextExtent(wxT("2000"), &width, &dummy);
-        width += ConvertDialogToPixels(wxSize(20, 0)).x;
-
-        wxSize calSize = wxGenericCalendarCtrl::GetBestSize();
-        wxSize yearSize = yearControl->GetSize();
-        yearSize.x = width;
-
-        wxPoint yearPosition = yearControl->GetPosition();
-

         SetFormat("%x");
 
         SetFormat("%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;
-        }
-        wxGenericCalendarCtrl::SetSize(calPos, 0, calSize.x, calSize.y);
-        yearControl->SetSize(width-yearSize.x-CALBORDER/2, yearPosition.y,
-                             yearSize.x, yearSize.y);
-        wxGenericCalendarCtrl::GetMonthControl()->Move(0, 0);
-
-        m_useSize.x = width+CALBORDER/2;
-        m_useSize.y = calSize.y-2+CALBORDER;
+        m_useSize  = wxCalendarCtrl::GetBestSize();

 
         wxWindow* tx = m_combo->GetTextCtrl();
         if ( !tx )
 
         wxWindow* tx = m_combo->GetTextCtrl();
         if ( !tx )


@@ -345,7 +296,7 @@ private:
 };
 
 
 };
 
 

-BEGIN_EVENT_TABLE(wxCalendarComboPopup, wxGenericCalendarCtrl)
+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_KEY_DOWN(wxCalendarComboPopup::OnCalKey)
     EVT_CALENDAR_SEL_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)
     EVT_CALENDAR_PAGE_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)


@@ -469,11 +420,7 @@ void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date)
 
 bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
 {
 
 bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
 {

-    if (dt1)
-        *dt1 = m_popup->GetLowerDateLimit();
-    if (dt2)
-        *dt2 = m_popup->GetUpperDateLimit();
-    return true;
+    return m_popup->GetDateRange(dt1, dt2);

 }
 
 
 }
 
 


@@ -483,7 +430,7 @@ wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2)
     m_popup->SetDateRange(dt1, dt2);
 }
 
     m_popup->SetDateRange(dt1, dt2);
 }
 

-wxGenericCalendarCtrl *wxDatePickerCtrlGeneric::GetCalendar() const
+wxCalendarCtrl *wxDatePickerCtrlGeneric::GetCalendar() const

 {
     return m_popup;
 }
 {
     return m_popup;
 }


@@ -524,7 +471,5 @@ void wxDatePickerCtrlGeneric::OnFocus(wxFocusEvent& WXUNUSED(event))
 }
 
 
 }
 
 

-#endif // wxUSE_DATEPICKCTRL_GENERIC
-

 #endif // wxUSE_DATEPICKCTRL
 
 #endif // wxUSE_DATEPICKCTRL