support wxDP_ALLOWNONE in generic wxDatePickerCtrl (#3164)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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):
|
||||
|
||||
|
@@ -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();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user