support wxDP_ALLOWNONE in generic wxDatePickerCtrl (#3164)

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

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 825b1626176b6780ce400311773561658dbd51d3..fc0e0ab72008305ed6b2ac6ed19ec883b8ceedf1 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -116,6 +116,11 @@ public:
         }
     }
 
         }
     }
 

+    bool IsTextEmpty() const
+    {
+        return m_combo->GetTextCtrl()->IsEmpty();
+    }
+

     bool ParseDateTime(const wxString& s, wxDateTime* pDt)
     {
         wxASSERT(pDt);
     bool ParseDateTime(const wxString& s, wxDateTime* pDt)
     {
         wxASSERT(pDt);


@@ -435,6 +440,8 @@ wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
 
 wxDateTime wxDatePickerCtrlGeneric::GetValue() const
 {
 
 wxDateTime wxDatePickerCtrlGeneric::GetValue() const
 {

+    if ( HasFlag(wxDP_ALLOWNONE) && m_popup->IsTextEmpty() )
+        return wxInvalidDateTime;

     return m_popup->GetDate();
 }
 
     return m_popup->GetDate();
 }