diff --git a/docs/changes.txt b/docs/changes.txt
index 2898dc4588..c7d995f499 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -100,6 +100,7 @@ All (GUI):
   help window.
 - Fixed wxHTML default font size for printing to be 12pt regardless of the
   platform, instead of depending on GUI toolkit's screen configuration.
+- Support wxDP_ALLOWNONE style in generic wxDatePickerCtrl version.
 
 All (Unix):
 
diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index a898b9eea3..48f98569ed 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -169,6 +169,11 @@ public:
         }
     }
 
+    bool IsTextEmpty() const
+    {
+        return m_combo->GetTextCtrl()->IsEmpty();
+    }
+
     bool ParseDateTime(const wxString& s, wxDateTime* pDt)
     {
         wxASSERT(pDt);
@@ -470,6 +475,8 @@ wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
 
 wxDateTime wxDatePickerCtrlGeneric::GetValue() const
 {
+    if ( HasFlag(wxDP_ALLOWNONE) && m_popup->IsTextEmpty() )
+        return wxInvalidDateTime;
     return m_popup->GetDate();
 }